Controllers/v1/AlbumController.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 
 using Microsoft.AspNetCore.Authorization;
@@ -10,18 +9,16 @@ using Microsoft.Extensions.Logging;
 
 using Icarus.Models;
 using Icarus.Database.Contexts;
-// using Icarus.Database.Repositories;
 
 namespace Icarus.Controllers.V1
 {
     [Route("api/v1/album")]
     [ApiController]
-    public class AlbumController : ControllerBase
+    public class AlbumController : BaseController
     {
         #region Fields
         private readonly ILogger<AlbumController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -41,9 +38,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        [Authorize("read:albums")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:albums"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             List<Album> albums = new List<Album>();
 
             var albumContext = new AlbumContext(_connectionString);
@@ -57,9 +58,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:albums")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:albums"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             Album album = new Album
             {
                 AlbumID = id

Controllers/v1/ArtistController.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 
 using Microsoft.AspNetCore.Authorization;
@@ -15,12 +13,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/artist")]
     [ApiController]
-    public class ArtistController : ControllerBase
+    public class ArtistController : BaseController
     {
         #region Fields
         private readonly ILogger<ArtistController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -40,9 +37,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        [Authorize("read:artists")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:artists"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var artistContext = new ArtistContext(_connectionString);
 
             var artists = artistContext.Artists.ToList();
@@ -54,9 +55,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:artists")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:artists"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             Artist artist = new Artist
             {
                 ArtistID = id

Controllers/v1/BaseController.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+
+using Icarus.Controllers.Managers;
+
+
+namespace Icarus.Controllers.V1
+{
+    public class BaseController : ControllerBase
+    {
+        #region Fiends
+        protected IConfiguration _config;
+        #endregion
+
+
+        #region Methods
+        protected string ParseBearerTokenFromHeader()
+        {
+            var token = string.Empty;
+            const string tokenType = "Bearer";
+            const string otherTokenType = "Jwt";
+
+            var req = Request;
+            var auth = req.Headers.Authorization; 
+            var val = auth.ToString();
+
+            if ((val.Contains(tokenType) || val.Contains(otherTokenType)) && val.Split(" ").Count() > 1)
+            {
+                var split = val.Split(" ");
+                token = split[1];
+            }
+
+
+            return token;
+        } 
+
+        protected bool IsTokenValid(string scope)
+        {
+            var token = ParseBearerTokenFromHeader();
+            var tokMgr = new TokenManager(_config);
+
+            return tokMgr.IsTokenValid(scope, token);
+        }
+        #endregion
+    }
+}

Controllers/v1/CoverArtController.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -17,12 +15,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/coverart")]
     [ApiController]
-    public class CoverArtController : ControllerBase
+    public class CoverArtController : BaseController
     {
         #region Fields
         private readonly ILogger<CoverArtController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -39,6 +36,11 @@ namespace Icarus.Controllers.V1
         #region HTTP Routes
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var coverArtContext = new CoverArtContext(_connectionString);
 
             var coverArtRecords = coverArtContext.CoverArtImages.ToList();
@@ -56,9 +58,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("download:cover_art")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("download:cover_art"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var coverArt = new CoverArt { CoverArtID = id };
 
             var coverArtContext = new CoverArtContext(_connectionString);

Controllers/v1/GenreController.cs

@@ -14,12 +14,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/genre")]
     [ApiController]
-    public class GenreController : ControllerBase
+    public class GenreController : BaseController
     {
         #region Fields
         private readonly ILogger<GenreController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -39,9 +38,13 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        [Authorize("read:genre")]
         public IActionResult Get()
         {
+            if (!IsTokenValid("read:genre"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var genres = new List<Genre>();
 
             var genreStore = new GenreContext(_connectionString);
@@ -55,9 +58,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:genre")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:genre"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var genre = new Genre
             {
                 GenreID = id

Controllers/v1/SongCompressedDataControllers.cs

@@ -19,11 +19,10 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song/compressed/data")]
     [ApiController]
-    public class SongCompressedDataController : ControllerBase
+    public class SongCompressedDataController : BaseController
     {
         #region Fields
         private string _connectionString;
-        private IConfiguration _config;
         private string _songTempDir;
         private string _archiveDir;
         #endregion
@@ -46,9 +45,13 @@ namespace Icarus.Controllers.V1
 
         #region API Routes
         [HttpGet("{id}")]
-        [Authorize("download:songs")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("download:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_connectionString);
 
             SongCompression cmp = new SongCompression(_archiveDir);

Controllers/v1/SongController.cs

@@ -18,12 +18,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song")]
     [ApiController]
-    public class SongController : ControllerBase
+    public class SongController : BaseController
     {
         #region Fields
         private readonly ILogger<SongController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         private SongManager _songMgr;
         #endregion
 
@@ -44,35 +43,13 @@ namespace Icarus.Controllers.V1
 
 
         #region Methods
-        private string ParseBearerTokenFromHeader()
-        {
-            var token = string.Empty;
-            const string tokenType = "Bearer";
-
-            var req = Request;
-            var auth = req.Headers.Authorization; 
-            var val = auth.ToString();
-
-            if (val.Contains(tokenType) && val.Split(" ").Count() > 1)
-            {
-                var split = val.Split(" ");
-                token = split[1];
-            }
-
-
-            return token;
-        }
         #region HTTP Endpoints
 
 
         [HttpGet]
-        // [Authorize("read:song_details")]
         public IActionResult Get()
         {
-            var token = ParseBearerTokenFromHeader();
-            var tokMgr = new TokenManager(_config);
-
-            if (!tokMgr.IsTokenValid("read:song_details", token))
+            if (!IsTokenValid("read:song_details"))
             {
                 return StatusCode(401, "Not allowed");
             }
@@ -92,9 +69,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        [Authorize("read:song_details")]
         public IActionResult Get(int id)
         {
+            if (!IsTokenValid("read:song_details"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_connectionString);
             
             Song song = new Song { SongID = id };
@@ -108,10 +89,14 @@ namespace Icarus.Controllers.V1
                 return NotFound();
         }
 
-        [Authorize("update:songs")]
         [HttpPut("{id}")]
         public IActionResult Put(int id, [FromBody] Song song)
         {
+            if (!IsTokenValid("update:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var context = new SongContext(_connectionString);
 
             song.SongID = id;

Controllers/v1/SongDataController.cs

@@ -20,11 +20,10 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song/data")]
     [ApiController]
-    public class SongDataController : ControllerBase
+    public class SongDataController : BaseController
     {
         #region Fields
         private string _connectionString;
-        private IConfiguration _config;
         private ILogger<SongDataController> _logger;
         private SongManager _songMgr;
         private string _songTempDir;
@@ -47,33 +46,15 @@ namespace Icarus.Controllers.V1
         #endregion
 
 
-        private string ParseBearerTokenFromHeader()
-        {
-            var token = string.Empty;
-            const string tokenType = "Bearer";
-            const string otherTokenType = "Jwt";
-
-            var req = Request;
-            var auth = req.Headers.Authorization; 
-            var val = auth.ToString();
-
-            if (val.Contains(tokenType) && val.Split(" ").Count() > 1 ||
-                val.Contains(otherTokenType) && val.Split(" ").Count() > 1)
-            {
-                var split = val.Split(" ");
-                token = split[1];
-            }
-
-
-            return token;
-        }
-
-
         [HttpGet("download/{id}")]
         [Route("private-scoped")]
-        [Authorize("download:songs")]
         public async Task<IActionResult> Get(int id)
         {
+            if (!IsTokenValid("download:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var songContext = new SongContext(_connectionString);
             var songMetaData = songContext.RetrieveRecord(new Song { SongID = id});
             
@@ -96,13 +77,9 @@ namespace Icarus.Controllers.V1
         //
         [HttpPost("upload"), DisableRequestSizeLimit]
         [Route("private-scoped")]
-        // [Authorize("upload:songs")]
         public IActionResult Post([FromForm(Name = "file")] List<IFormFile> songData)
         {
-            var token = ParseBearerTokenFromHeader();
-            var tokMgr = new TokenManager(_config);
-
-            if (!tokMgr.IsTokenValid("upload:songs", token))
+            if (!IsTokenValid("upload:songs"))
             {
                 return StatusCode(401, "Not allowed");
             }
@@ -142,13 +119,9 @@ namespace Icarus.Controllers.V1
         //
         [HttpPost("upload/with/data")]
         [Route("private-scoped")]
-        // [Authorize("upload:songs")]
         public IActionResult Post ([FromForm] UploadSongWithDataForm up)
         {
-            var token = ParseBearerTokenFromHeader();
-            var tokMgr = new TokenManager(_config);
-
-            if (!tokMgr.IsTokenValid("upload:songs", token))
+            if (!IsTokenValid("upload:songs"))
             {
                 return StatusCode(401, "Not allowed");
             }
@@ -172,9 +145,13 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpDelete("delete/{id}")]
-        [Authorize("delete:songs")]
         public IActionResult Delete(int id)
         {
+            if (!IsTokenValid("delete:songs"))
+            {
+                return StatusCode(401, "Not allowed");
+            }
+
             var songContext = new SongContext(_connectionString);
 
             var songMetaData = new Song{ SongID = id };

Controllers/v1/SongStreamController.cs

@@ -20,12 +20,11 @@ namespace Icarus.Controllers.V1
 {
     [Route("api/v1/song/stream")]
     [ApiController]
-    public class SongStreamController : ControllerBase
+    public class SongStreamController : BaseController
     {
         #region Fields
         private ILogger<SongStreamController> _logger;
         private string _connectionString;
-        private IConfiguration _config;
         #endregion
 
 
@@ -43,39 +42,14 @@ namespace Icarus.Controllers.V1
         #endregion
 
 
-        private string ParseBearerTokenFromHeader()
-        {
-            var token = string.Empty;
-            const string tokenType = "Bearer";
-
-            var req = Request;
-            var auth = req.Headers.Authorization; 
-            var val = auth.ToString();
-
-            if (val.Contains(tokenType) && val.Split(" ").Count() > 1)
-            {
-                var split = val.Split(" ");
-                token = split[1];
-            }
-
-
-            return token;
-        }
-
         #region HTTP endpoints
         [HttpGet("{id}")]
-        // [Authorize("stream:songs")]
         public async Task<IActionResult> Get(int id)
         {
-            var token = ParseBearerTokenFromHeader();
-            var tokMgr = new TokenManager(_config);
-
-            /**
-            if (!tokMgr.IsTokenValid("stream:songs", token))
+            if (!IsTokenValid("stream:songs"))
             {
                 return StatusCode(401, "Not allowed");
             }
-            */
 
             var context = new SongContext(_config.GetConnectionString("DefaultConnection"));