Swagger docs

Controllers/v1/AlbumController.cs

@@ -39,7 +39,7 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        public IActionResult Get()
+        public IActionResult GetAlbums()
         {
             List<Album> albums = new List<Album>();
 
@@ -54,7 +54,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        public IActionResult Get(int id)
+        public IActionResult GetAlbum(int id)
         {
             Album album = new Album
             {

Controllers/v1/ArtistController.cs

@@ -38,7 +38,7 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        public IActionResult Get()
+        public IActionResult GetArtists()
         {
             var artistContext = new ArtistContext(_connectionString);
 
@@ -51,7 +51,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        public IActionResult Get(int id)
+        public IActionResult GetArtist(int id)
         {
             if (!IsTokenValid("read:artists"))
             {

Controllers/v1/BaseController.cs

@@ -17,6 +17,7 @@ namespace Icarus.Controllers.V1
 
 
         #region Methods
+        [ApiExplorerSettings(IgnoreApi = true)]
         protected string ParseBearerTokenFromHeader()
         {
             var token = string.Empty;
@@ -37,6 +38,7 @@ namespace Icarus.Controllers.V1
             return token;
         } 
 
+        [ApiExplorerSettings(IgnoreApi = true)]
         protected bool IsTokenValid(string scope)
         {
             var token = ParseBearerTokenFromHeader();

Controllers/v1/CoverArtController.cs

@@ -35,7 +35,8 @@ namespace Icarus.Controllers.V1
 
 
         #region HTTP Routes
-        public IActionResult Get()
+        [HttpGet]
+        public IActionResult GetCoverArts()
         {
             var coverArtContext = new CoverArtContext(_connectionString);
 
@@ -54,7 +55,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        public async Task<IActionResult> Get(int id)
+        public IActionResult GetCoverArt(int id)
         {
             var coverArt = new CoverArt { CoverArtID = id };
 
@@ -65,7 +66,7 @@ namespace Icarus.Controllers.V1
             if (coverArt != null)
             {
                 _logger.LogInformation("Found cover art record");
-                var coverArtBytes = await System.IO.File.ReadAllBytesAsync(
+                var coverArtBytes = System.IO.File.ReadAllBytes(
                         coverArt.ImagePath);
 
                 return File(coverArtBytes, "application/x-msdownload", 

Controllers/v1/GenreController.cs

@@ -39,7 +39,7 @@ namespace Icarus.Controllers.V1
 
         #region HTTP Routes
         [HttpGet]
-        public IActionResult Get()
+        public IActionResult RetrieveGenres()
         {
             var genres = new List<Genre>();
 
@@ -54,7 +54,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        public IActionResult Get(int id)
+        public IActionResult RetrieveGenre(int id)
         {
             var genre = new Genre
             {

Controllers/v1/LoginController.cs

@@ -38,7 +38,8 @@ namespace Icarus.Controllers.V1
 
 
         #region HTTP endpoints
-        public IActionResult Post([FromBody] User user)
+        [HttpPost]
+        public IActionResult Login([FromBody] User user)
         {
             var context = new UserContext(_connectionString);
 

Controllers/v1/RegisterController.cs

@@ -37,7 +37,7 @@ namespace Icarus.Controllers.V1
         #endregion
 
         [HttpPost]
-        public IActionResult Post([FromBody] User user)
+        public IActionResult RegisterUser([FromBody] User user)
         {
             PasswordEncryption pe = new PasswordEncryption();
             user.Password = pe.HashPassword(user);

Controllers/v1/SongController.cs

@@ -48,7 +48,7 @@ namespace Icarus.Controllers.V1
 
 
         [HttpGet]
-        public IActionResult Get()
+        public IActionResult RetrieveSongs()
         {
             List<Song> songs = new List<Song>();
             Console.WriteLine("Attemtping to retrieve songs");
@@ -65,7 +65,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpGet("{id}")]
-        public IActionResult Get(int id)
+        public IActionResult RetrieveSong(int id)
         {
             var context = new SongContext(_connectionString);
             
@@ -81,7 +81,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpPut("{id}")]
-        public IActionResult Put(int id, [FromBody] Song song)
+        public IActionResult UpdateSong(int id, [FromBody] Song song)
         {
             var context = new SongContext(_connectionString);
 

Controllers/v1/SongDataController.cs

@@ -48,13 +48,13 @@ namespace Icarus.Controllers.V1
 
 
         [HttpGet("download/{id}")]
-        [Route("private-scoped")]
+        // [Route("private-scoped")]
-        public async Task<IActionResult> Get(int id)
+        public IActionResult Download(int id)
         {
             var songContext = new SongContext(_connectionString);
             var songMetaData = songContext.RetrieveRecord(new Song { SongID = id});
             
-            var song = await _songMgr.RetrieveSong(songMetaData);
+            var song = _songMgr.RetrieveSong(songMetaData).Result;
             
             return File(song.Data, "application/x-msdownload", songMetaData.Filename);
         }
@@ -72,8 +72,9 @@ namespace Icarus.Controllers.V1
         // Cover art
         //
         [HttpPost("upload"), DisableRequestSizeLimit]
-        [Route("private-scoped")]
+        // [ConflictingActionsResolver]
-        public IActionResult Post([FromForm(Name = "file")] List<IFormFile> songData)
+        // [Route("private-scoped")]
+        public IActionResult Upload([FromForm(Name = "file")] List<IFormFile> songData)
         {
             try
             {
@@ -109,8 +110,9 @@ namespace Icarus.Controllers.V1
         // as well as the cover art
         //
         [HttpPost("upload/with/data")]
-        [Route("private-scoped")]
+        // [ConflictingActionsResolver]
-        public IActionResult Post ([FromForm] UploadSongWithDataForm up)
+        // [Route("private-scoped")]
+        public IActionResult UploadWithData([FromForm] UploadSongWithDataForm up)
         {
             try
             {
@@ -131,7 +133,7 @@ namespace Icarus.Controllers.V1
         }
 
         [HttpDelete("delete/{id}")]
-        public IActionResult Delete(int id)
+        public IActionResult DeleteSong(int id)
         {
             var songContext = new SongContext(_connectionString);
 
@@ -156,15 +158,15 @@ namespace Icarus.Controllers.V1
 
         }
 
-            public class UploadSongWithDataForm
+        public class UploadSongWithDataForm
-            {
+        {
-                [FromForm(Name = "file")]
+            [FromForm(Name = "file")]
-                public IFormFile SongData { get; set; }
+            public IFormFile SongData { get; set; }
-                // TODO: Think about making this optional and if it is not provided, use the stock cover art
+            // TODO: Think about making this optional and if it is not provided, use the stock cover art
-                [FromForm(Name = "cover")]
+            [FromForm(Name = "cover")]
-                public IFormFile CoverArtData { get; set; }
+            public IFormFile CoverArtData { get; set; }
-                [FromForm(Name = "metadata")]
+            [FromForm(Name = "metadata")]
-                public string SongFile { get; set; }
+            public string SongFile { get; set; }
-            }
+        }
     }
 }

Controllers/v1/SongStreamController.cs

@@ -44,8 +44,9 @@ namespace Icarus.Controllers.V1
 
 
         #region HTTP endpoints
+        // [HttpGet]
         [HttpGet("{id}")]
-        public async Task<IActionResult> Get(int id)
+        public async Task<IActionResult> StreamSong(int id)
         {
             var context = new SongContext(_config.GetConnectionString("DefaultConnection"));
 

Icarus.csproj

@@ -25,6 +25,7 @@
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="RestSharp" Version="106.15.0" />
     <PackageReference Include="SevenZip" Version="19.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.15.0" />
     <PackageReference Include="taglib" Version="2.1.0" />
   </ItemGroup>

Properties/launchSettings.json

@@ -12,7 +12,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -20,7 +20,8 @@
     "Icarus": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "dotnetRuneMessage": true,
+      "launchUrl": "swagger",
       "applicationUrl": "http://localhost:5002",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

Startup.cs

@@ -1,15 +1,18 @@
 using System;
 using System.Text;
+using System.Linq;
 
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
+using Microsoft.OpenApi.Models;
 using Newtonsoft.Json;
 using NLog;
 using NLog.Web;
@@ -68,12 +71,48 @@ namespace Icarus
 
             services.AddControllers()
                 .AddNewtonsoftJson();
+            
+            services.AddEndpointsApiExplorer();
+            services.AddSwaggerGen(c =>
+            {
+                c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
+
+                c.SwaggerDoc("v1", new OpenApiInfo { Title = "Icarus", Version = "v1" });
+                c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme()
+                {
+                    Name = "Authorization",
+                    Scheme = "Bearer",
+                    BearerFormat = "JWT",
+                    Type = SecuritySchemeType.ApiKey,
+                    In = ParameterLocation.Header,
+                    Description = "Bearer *Auth Token*",
+                });
+                c.AddSecurityRequirement(new OpenApiSecurityRequirement
+                {
+                    {
+                        new OpenApiSecurityScheme
+                        {
+                            Reference = new OpenApiReference
+                            {
+                                Type = ReferenceType.SecurityScheme,
+                                Id = "Bearer"
+                            }
+                        },
+                        new string[] {}
+                    }
+                });
+            });
         }
 
         // Called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             // NOTE: Dev-related configuration can be done when env.IsDevelopment() evaluated to true
+            if (env.IsDevelopment())
+            {
+                app.UseSwagger();
+                app.UseSwaggerUI();
+            }
 
             app.UseRouting();
             app.UseAuthentication();