diff --git a/Icarus/Controllers/Managers/TokenManager.cs b/Icarus/Controllers/Managers/TokenManager.cs index 4eb02fa..8a48157 100644 --- a/Icarus/Controllers/Managers/TokenManager.cs +++ b/Icarus/Controllers/Managers/TokenManager.cs @@ -153,7 +153,7 @@ public class TokenManager : BaseManager public int? RetrieveUserIdFromToken(string token) { - var parsedToken = this.ContainsBearer(token) ? this.StripBearer(token) : token; + var parsedToken = this.ContainsBearer(token) ? this.StripBearer(token) : token; var tokenHandler = new JwtSecurityTokenHandler(); var readTok = tokenHandler.ReadJwtToken(parsedToken); diff --git a/Icarus/Controllers/v1/SongDataController.cs b/Icarus/Controllers/v1/SongDataController.cs index 0876ef7..15dff68 100644 --- a/Icarus/Controllers/v1/SongDataController.cs +++ b/Icarus/Controllers/v1/SongDataController.cs @@ -48,11 +48,13 @@ public class SongDataController : BaseController var songMetaData = songContext.RetrieveRecord(new Song { Id = id }); var accessLevel = accLvlContext.GetAccessLevel(songMetaData.Id); var token = tokenManager.GetBearerToken(HttpContext); - if (token == null || accessLevel == null) { + if (token == null || accessLevel == null) + { return BadRequest(); } - if (!tokenManager.CanAccessSong(token, songMetaData, accessLevel)) { + if (!tokenManager.CanAccessSong(token, songMetaData, accessLevel)) + { return BadRequest(); } diff --git a/Icarus/Database/Contexts/AccessLevelContext.cs b/Icarus/Database/Contexts/AccessLevelContext.cs index 78edbbc..ac8a5ea 100644 --- a/Icarus/Database/Contexts/AccessLevelContext.cs +++ b/Icarus/Database/Contexts/AccessLevelContext.cs @@ -20,7 +20,8 @@ public class AccessLevelContext : DbContext #endregion #region Methods - public Models.AccessLevel? GetAccessLevel(int songId) { + public Models.AccessLevel? GetAccessLevel(int songId) + { var accessLevel = this.AccessLevels!.FirstOrDefault(acc => acc.SongId == songId); return accessLevel; }