diff --git a/src/Controllers/Common/ContentController.cs b/src/Controllers/Common/ContentController.cs index 55e376a..2379e8f 100644 --- a/src/Controllers/Common/ContentController.cs +++ b/src/Controllers/Common/ContentController.cs @@ -56,13 +56,16 @@ public class ContentController : Controller { "Young", "Youthful", "Zealous", "Zealot" }; - - //Get Username - User? user = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.User; + + Session? session = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken); + if (session is null) + return Unauthorized(); + + User? user = session.User; + if (user is null) + user = session.Viking?.User; string uname = user.Username; - string name = uname; //Variable for name processing - List tnames = ctx.Vikings.Select(e => e.Name).ToList(); //Get a list of names from the table Random choice = new Random(); //Randomizer for selecting random adjectives List suggestions = new(); diff --git a/src/Services/AchievementService.cs b/src/Services/AchievementService.cs index a8198af..d5a619e 100644 --- a/src/Services/AchievementService.cs +++ b/src/Services/AchievementService.cs @@ -136,7 +136,6 @@ namespace sodoff.Services { var rewards = achivmentsRewardByID[achievementID]; return ApplyAchievementRewards(viking, rewards); } else { - Console.WriteLine(string.Format("Unknown rewards for achievementID={0}", achievementID)); return new AchievementReward[0]; } } @@ -146,7 +145,6 @@ namespace sodoff.Services { var rewards = achivmentsRewardByTask[task.TaskID]; return ApplyAchievementRewards(viking, rewards); } else { - Console.WriteLine(string.Format("Unknown rewards for taskID={0}", task.TaskID)); return new AchievementReward[0]; } }