cleanup and routing fixes

.gitignore

@@ -7,3 +7,4 @@ riderModule.iml
 /CannedNet.API/Migrations
 CannedNet.sln.DotSettings.user
 CannedNet/Data/PrivateKey.pem
+/CannedNet/.zed

CannedNet/JSON/eacchallenge.txt

@@ -1 +1 @@
-"AA=="
+":3"

CannedNet/JSON/endpoints.json

@@ -1,38 +1,38 @@
 {
-  "Accounts": "https://cannednet.lapis.codes",
+  "Accounts": "https://cannednet.lapis.codes/accounts",
-  "AI": "https://cannednet.lapis.codes",
+  "AI": "https://cannednet.lapis.codes/ai",
-  "API": "https://cannednet.lapis.codes",
+  "API": "https://cannednet.lapis.codes/api",
-  "Auth": "https://cannednet.lapis.codes",
+  "Auth": "https://cannednet.lapis.codes/auth",
-  "BugReporting": "https://cannednet.lapis.codes",
+  "BugReporting": "https://cannednet.lapis.codes/bugreporting",
-  "Cards": "https://cannednet.lapis.codes",
+  "Cards": "https://cannednet.lapis.codes/cards",
-  "CDN": "https://cannednet.lapis.codes",
+  "CDN": "https://cannednet.lapis.codes/cdn",
   "Chat": "https://cannednet.lapis.codes/chat",
-  "Clubs": "https://cannednet.lapis.codes",
+  "Clubs": "https://cannednet.lapis.codes/clubs",
-  "CMS": "https://cannednet.lapis.codes",
+  "CMS": "https://cannednet.lapis.codes/cms",
-  "Commerce": "https://cannednet.lapis.codes",
+  "Commerce": "https://cannednet.lapis.codes/commerce",
-  "Data": "https://cannednet.lapis.codes",
+  "Data": "https://cannednet.lapis.codes/data",
-  "DataCollection": "https://cannednet.lapis.codes",
+  "DataCollection": "https://cannednet.lapis.codes/datacollection",
-  "Discovery": "https://cannednet.lapis.codes",
+  "Discovery": "https://cannednet.lapis.codes/discovery",
-  "Econ": "https://cannednet.lapis.codes",
+  "Econ": "https://cannednet.lapis.codes/econ",
-  "GameLogs": "https://cannednet.lapis.codes",
+  "GameLogs": "https://cannednet.lapis.codes/gamelogs",
-  "Geo": "https://cannednet.lapis.codes",
+  "Geo": "https://cannednet.lapis.codes/geo",
   "Images": "https://cannednet.lapis.codes/img",
-  "Leaderboard": "https://cannednet.lapis.codes",
+  "Leaderboard": "https://cannednet.lapis.codes/leaderboard",
-  "Link": "https://cannednet.lapis.codes",
+  "Link": "https://cannednet.lapis.codes/link",
-  "Lists": "https://cannednet.lapis.codes",
+  "Lists": "https://cannednet.lapis.codes/lists",
-  "Matchmaking": "https://cannednet.lapis.codes",
+  "Matchmaking": "https://cannednet.lapis.codes/match",
-  "Moderation": "https://cannednet.lapis.codes",
+  "Moderation": "https://cannednet.lapis.codes/moderation",
   "Notifications": "https://cannednet.lapis.codes",
   "PlatformNotifications": "https://cannednet.lapis.codes",
   "PlayerSettings": "https://cannednet.lapis.codes/playersettings",
-  "RoomComments": "https://cannednet.lapis.codes",
+  "RoomComments": "https://cannednet.lapis.codes/roomcomments",
-  "RoomieIntegrations": "https://cannednet.lapis.codes",
+  "RoomieIntegrations": "https://cannednet.lapis.codes/roomieintegrations",
-  "Rooms": "https://cannednet.lapis.codes",
+  "Rooms": "https://cannednet.lapis.codes/rooms",
-  "Storage": "https://cannednet.lapis.codes",
+  "Storage": "https://cannednet.lapis.codes/storage",
-  "Strings": "https://cannednet.lapis.codes",
+  "Strings": "https://cannednet.lapis.codes/strings",
-  "StringsCDN": "https://cannednet.lapis.codes",
+  "StringsCDN": "https://cannednet.lapis.codes/stringscdn",
-  "Studio": "https://cannednet.lapis.codes",
+  "Studio": "https://cannednet.lapis.codes/studio",
-  "Thorn": "https://cannednet.lapis.codes",
+  "Thorn": "https://cannednet.lapis.codes/thorn",
-  "Videos": "https://cannednet.lapis.codes",
+  "Videos": "https://cannednet.lapis.codes/videos",
   "WWW": "https://cannednet.lapis.codes"
 }

CannedNet/Services/Controllers/APIController.cs

@@ -7,12 +7,14 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace CannedNet.Services.Controllers;
 
-[ApiController, Route("api")]
+[ApiController, Route("api/api")]
 public class APIController : ControllerBase
 {
     [HttpGet("config/v1/amplitude")]
-    public async Task<IResult> Amplitude() {
+    public async Task<IResult> Amplitude()
-        return Results.Ok(new {
+    {
+        return Results.Ok(new
+        {
             AmplitudeKey = "a",
             StatSigKey = "a",
             RudderStackKey = "a",
@@ -21,8 +23,10 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("config/v1/azurespeech")]
-    public async Task<IResult> AzureSpeech() {
+    public async Task<IResult> AzureSpeech()
-        return Results.Ok(new {
+    {
+        return Results.Ok(new
+        {
             Key = "dce8de5b297747d9b5bddcc7f19e8c5b",
             Region = "eastus",
             Enabled = false
@@ -36,7 +40,8 @@ public class APIController : ControllerBase
     public async Task<IResult> GameConfigsV1All() => Results.Content(await System.IO.File.ReadAllTextAsync("JSON/gameconfigs.json"), "application/json");
 
     [HttpGet("versioncheck/v4")]
-    public async Task<IResult> VersionCheckV4() => Results.Ok(new {
+    public async Task<IResult> VersionCheckV4() => Results.Ok(new
+    {
         VersionStatus = 0,
         UpdateNotificationStage = 0,
         IsVersionIslanded = false,
@@ -56,7 +61,8 @@ public class APIController : ControllerBase
     public async Task<IResult> GetPlayersV1Progression(string id) => Results.Content($"{{\"PlayerId\":{id},\"Level\":1,\"XP\":0}}", "application/json");
 
     [HttpPost("playerReputation/v2/bulk")]
-    public async Task<IResult> PostPlayerReputationV2Bulk(AppDbContext db) {
+    public async Task<IResult> PostPlayerReputationV2Bulk(AppDbContext db)
+    {
         /*var ids = await ParseFormIds(httpRequest);
 
             if (!ids.Any())
@@ -83,7 +89,8 @@ public class APIController : ControllerBase
     }
 
     [HttpPost("players/v2/progression/bulk")]
-    public async Task<IResult> PostProgressionBulkV2(AppDbContext db) {
+    public async Task<IResult> PostProgressionBulkV2(AppDbContext db)
+    {
         List<int> ids = await ParseFormIds(HttpContext.Request);
 
         if (!ids.Any())
@@ -98,7 +105,8 @@ public class APIController : ControllerBase
     }
 
     [HttpPost("v1/progression/bulk")]
-    public async Task<IResult> PostProgressionBulkV1(AppDbContext db) {
+    public async Task<IResult> PostProgressionBulkV1(AppDbContext db)
+    {
         List<int> ids = await ParseFormIds(HttpContext.Request);
 
         if (!ids.Any())
@@ -160,13 +168,16 @@ public class APIController : ControllerBase
     [Authorize]
     public async Task<IResult> GetSettings(AppDbContext db, JwtTokenService jwtService)
     {
+        if (User == null || User.Identity == null)
+            return Results.NotFound();
+
         int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
 
         var settings = await db.PlayerSettings
             .Where(s => s.PlayerId == id)
             .ToListAsync();
 
-        if (!settings.Any())
+        if (settings.Count == 0)
         {
             var defaults = new List<PlayerSetting>
             {
@@ -225,40 +236,47 @@ public class APIController : ControllerBase
 
 
     [HttpGet("communityboard/v2/current")]
-    public async Task<IResult> CommunityBoardCurrent() {
+    public async Task<IResult> CommunityBoardCurrent()
+    {
         var json = System.IO.File.ReadAllText("JSON/communityboard.json");
         return Results.Content(json, "application/json");
     }
 
     [HttpGet("playerevents/v1/all")]
-    public async Task<IResult> PlayerEventsAll() {
+    public async Task<IResult> PlayerEventsAll()
+    {
         return Results.Content("{\"Created\":[],\"Responses\":[]}", "application/json");
     }
 
     [HttpGet("storefronts/v1/p2p/betaEnabled")]
-    public IResult StorefrontsP2PBetaEnabled() {
+    public IResult StorefrontsP2PBetaEnabled()
+    {
         return Results.Content("false", "application/json");
     }
 
     [HttpGet("announcement/v1/get")]
-    public async Task<IResult> AnnouncementGet() {
+    public async Task<IResult> AnnouncementGet()
+    {
         var json = System.IO.File.ReadAllText("JSON/announcements.json");
         return Results.Content(json, "application/json");
     }
 
     [HttpGet("quickPlay/v1/getandclear")]
-    public async Task<IResult> QuickPlayGetAndClear() {
+    public async Task<IResult> QuickPlayGetAndClear()
+    {
         return Results.Content("{\"RoomName\":null,\"ActionCode\":null,\"TargetPlayerId\":null}", "application/json");
     }
 
     [HttpGet("roomkeys/v1/room")]
-    public async Task<IResult> RoomKeysRoom() {
+    public async Task<IResult> RoomKeysRoom()
+    {
         var roomid = Request.Query["roomId"];
         return Results.Content("[]", "application/json");
     }
 
     [HttpGet("/roomserver/rooms/bulk")]
-    public async Task<IResult> RoomserverRoomsBulk(AppDbContext db) {
+    public async Task<IResult> RoomserverRoomsBulk(AppDbContext db)
+    {
         var idParam = Request.Query["id"].FirstOrDefault();
         var nameParam = Request.Query["name"].FirstOrDefault();
 
@@ -360,7 +378,8 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("/roomserver/rooms/hot")]
-    public async Task<IResult> RoomserverRoomsHot(AppDbContext db) {
+    public async Task<IResult> RoomserverRoomsHot(AppDbContext db)
+    {
         var tagFilter = Request.Query["tag"].FirstOrDefault()?.ToLower();
         var allRooms = await db.Rooms.ToListAsync();
 
@@ -427,7 +446,8 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("/roomserver/roomsandplaylists/hot")]
-    public async Task<IResult> RoomserverRoomsAndPlaylistsHot(AppDbContext db) {
+    public async Task<IResult> RoomserverRoomsAndPlaylistsHot(AppDbContext db)
+    {
         var allRooms = await db.Rooms.Where(r => !r.IsDorm).OrderByDescending(r => r.Id).ToListAsync();
         var results = new List<object>();
 
@@ -481,7 +501,8 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("/roomserver/rooms/{id}")]
-    public async Task<IResult> RoomserverRoomsId(string id, AppDbContext db) {
+    public async Task<IResult> RoomserverRoomsId(string id, AppDbContext db)
+    {
         if (!int.TryParse(id, out var roomId))
             return Results.NotFound();
 
@@ -534,23 +555,27 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("images/v2/named")]
-    public async Task<IResult> NamedImages() {
+    public async Task<IResult> NamedImages()
+    {
         var json = System.IO.File.ReadAllText("JSON/namedimages.json");
         return Results.Content(json, "application/json");
     }
 
     [HttpPost("objectives/v1/updateobjective")]
-    public async Task<IResult> UpdateObjective() {
+    public async Task<IResult> UpdateObjective()
+    {
         return Results.Ok();
     }
 
     [HttpPost("PlayerReporting/v1/hile")]
-    public async Task<IResult> PlayerReportingHile() {
+    public async Task<IResult> PlayerReportingHile()
+    {
         return Results.Ok();
     }
 
     [HttpGet("storefronts/v3/giftdropstore/300")]
-    public async Task<IResult> GiftDropStore300(StorefrontFillService storefrontService) {
+    public async Task<IResult> GiftDropStore300(StorefrontFillService storefrontService)
+    {
         var storefronts = await storefrontService.GetStorefrontsAsync();
         var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 300 && s.Name == "rc_cafe_storefront");
         if (storefront == null)
@@ -568,11 +593,26 @@ public class APIController : ControllerBase
             item.NewUntil,
             GiftDrops = item.GiftDrops.Select(gd => new
             {
-                gd.Id, gd.StorefrontItemId, gd.GiftDropId, gd.FriendlyName, gd.Tooltip,
+                gd.Id,
-                gd.ConsumableItemDesc, gd.AvatarItemDesc, gd.AvatarItemType,
+                gd.StorefrontItemId,
-                gd.EquipmentPrefabName, gd.EquipmentModificationGuid, gd.IsQuery,
+                gd.GiftDropId,
-                gd.Unique, gd.SubscribersOnly, gd.Level, gd.Rarity, gd.CurrencyType,
+                gd.FriendlyName,
-                gd.Currency, gd.Context, gd.ItemSetId, gd.ItemSetFriendlyName
+                gd.Tooltip,
+                gd.ConsumableItemDesc,
+                gd.AvatarItemDesc,
+                gd.AvatarItemType,
+                gd.EquipmentPrefabName,
+                gd.EquipmentModificationGuid,
+                gd.IsQuery,
+                gd.Unique,
+                gd.SubscribersOnly,
+                gd.Level,
+                gd.Rarity,
+                gd.CurrencyType,
+                gd.Currency,
+                gd.Context,
+                gd.ItemSetId,
+                gd.ItemSetFriendlyName
             }).ToList(),
             Prices = item.Prices.Select(p => new { p.Id, p.StorefrontItemId, p.CurrencyType, p.Price }).ToList()
         }).ToList();
@@ -580,7 +620,8 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("storefronts/v3/giftdropstore/2")]
-    public async Task<IResult> GiftDropStore2(StorefrontFillService storefrontService) {
+    public async Task<IResult> GiftDropStore2(StorefrontFillService storefrontService)
+    {
         var storefronts = await storefrontService.GetStorefrontsAsync();
         var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 2 && s.Name == "rec_center_store");
         if (storefront == null)
@@ -598,11 +639,26 @@ public class APIController : ControllerBase
             item.NewUntil,
             GiftDrops = item.GiftDrops.Select(gd => new
             {
-                gd.Id, gd.StorefrontItemId, gd.GiftDropId, gd.FriendlyName, gd.Tooltip,
+                gd.Id,
-                gd.ConsumableItemDesc, gd.AvatarItemDesc, gd.AvatarItemType,
+                gd.StorefrontItemId,
-                gd.EquipmentPrefabName, gd.EquipmentModificationGuid, gd.IsQuery,
+                gd.GiftDropId,
-                gd.Unique, gd.SubscribersOnly, gd.Level, gd.Rarity, gd.CurrencyType,
+                gd.FriendlyName,
-                gd.Currency, gd.Context, gd.ItemSetId, gd.ItemSetFriendlyName
+                gd.Tooltip,
+                gd.ConsumableItemDesc,
+                gd.AvatarItemDesc,
+                gd.AvatarItemType,
+                gd.EquipmentPrefabName,
+                gd.EquipmentModificationGuid,
+                gd.IsQuery,
+                gd.Unique,
+                gd.SubscribersOnly,
+                gd.Level,
+                gd.Rarity,
+                gd.CurrencyType,
+                gd.Currency,
+                gd.Context,
+                gd.ItemSetId,
+                gd.ItemSetFriendlyName
             }).ToList(),
             Prices = item.Prices.Select(p => new { p.Id, p.StorefrontItemId, p.CurrencyType, p.Price }).ToList()
         }).ToList();
@@ -611,7 +667,8 @@ public class APIController : ControllerBase
 
     [HttpPost("storefronts/v2/buyItem")]
     [Authorize]
-    public async Task<IResult> BuyItem(BuyItemRequest buyRequest, AppDbContext db, NotificationService notificationService) {
+    public async Task<IResult> BuyItem(BuyItemRequest buyRequest, AppDbContext db, NotificationService notificationService)
+    {
         try
         {
             int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
@@ -679,21 +736,34 @@ public class APIController : ControllerBase
 
             var giftData = storedGifts.Select(rg => new GiftData
             {
-                Id = rg.Id, FromPlayerId = null,
+                Id = rg.Id,
-                ConsumableItemDesc = rg.ConsumableItemDesc, AvatarItemDesc = rg.AvatarItemDesc,
+                FromPlayerId = null,
-                FriendlyName = rg.FriendlyName, AvatarItemType = rg.AvatarItemType,
+                ConsumableItemDesc = rg.ConsumableItemDesc,
-                EquipmentPrefabName = rg.EquipmentPrefabName, EquipmentModificationGuid = rg.EquipmentModificationGuid,
+                AvatarItemDesc = rg.AvatarItemDesc,
-                CurrencyType = rg.CurrencyType, Currency = rg.Currency, Xp = rg.Xp, Level = rg.Level,
+                FriendlyName = rg.FriendlyName,
-                Platform = rg.Platform, PlatformsToSpawnOn = rg.PlatformsToSpawnOn, BalanceType = rg.BalanceType,
+                AvatarItemType = rg.AvatarItemType,
-                GiftContext = rg.GiftContext, GiftRarity = rg.GiftRarity, Message = rg.Message
+                EquipmentPrefabName = rg.EquipmentPrefabName,
+                EquipmentModificationGuid = rg.EquipmentModificationGuid,
+                CurrencyType = rg.CurrencyType,
+                Currency = rg.Currency,
+                Xp = rg.Xp,
+                Level = rg.Level,
+                Platform = rg.Platform,
+                PlatformsToSpawnOn = rg.PlatformsToSpawnOn,
+                BalanceType = rg.BalanceType,
+                GiftContext = rg.GiftContext,
+                GiftRarity = rg.GiftRarity,
+                Message = rg.Message
             }).ToList();
 
             var balanceUpdate = new BalanceUpdate { UpdateResponse = 0, Data = giftData };
             var response = new BuyItemResponse
             {
                 BalanceUpdates = new List<BalanceUpdate> { balanceUpdate },
-                Balance = tokenBalance.Balance, CurrencyType = buyRequest.CurrencyType,
+                Balance = tokenBalance.Balance,
-                BalanceType = -1, Platform = -1
+                CurrencyType = buyRequest.CurrencyType,
+                BalanceType = -1,
+                Platform = -1
             };
 
             try
@@ -722,7 +792,8 @@ public class APIController : ControllerBase
 
     [HttpPost("avatar/v2/gifts/generate")]
     [Authorize]
-    public async Task<IResult> AvatarGiftsGenerate(AppDbContext db) {
+    public async Task<IResult> AvatarGiftsGenerate(AppDbContext db)
+    {
         try
         {
             int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
@@ -808,14 +879,26 @@ public class APIController : ControllerBase
 
             var receivedGift = new ReceivedGift
             {
-                ReceiverAccountId = id, FromPlayerId = 1, Message = message,
+                ReceiverAccountId = id,
-                ConsumableItemDesc = consumableItemDesc, AvatarItemDesc = avatarItemDesc,
+                FromPlayerId = 1,
-                FriendlyName = friendlyName, AvatarItemType = avatarItemType,
+                Message = message,
-                EquipmentPrefabName = "", EquipmentModificationGuid = "",
+                ConsumableItemDesc = consumableItemDesc,
-                CurrencyType = currencyType, Currency = currency, Xp = xp, Level = 0,
+                AvatarItemDesc = avatarItemDesc,
-                Platform = -1, PlatformsToSpawnOn = -1, BalanceType = 0,
+                FriendlyName = friendlyName,
-                GiftContext = giftContext, GiftRarity = giftRarity,
+                AvatarItemType = avatarItemType,
-                ReceivedAt = DateTime.UtcNow, IsConsumed = false
+                EquipmentPrefabName = "",
+                EquipmentModificationGuid = "",
+                CurrencyType = currencyType,
+                Currency = currency,
+                Xp = xp,
+                Level = 0,
+                Platform = -1,
+                PlatformsToSpawnOn = -1,
+                BalanceType = 0,
+                GiftContext = giftContext,
+                GiftRarity = giftRarity,
+                ReceivedAt = DateTime.UtcNow,
+                IsConsumed = false
             };
 
             db.ReceivedGifts.Add(receivedGift);
@@ -823,13 +906,24 @@ public class APIController : ControllerBase
 
             return Results.Ok(new
             {
-                Id = receivedGift.Id, FromPlayerId = 1,
+                Id = receivedGift.Id,
-                ConsumableItemDesc = consumableItemDesc, AvatarItemDesc = avatarItemDesc,
+                FromPlayerId = 1,
-                FriendlyName = friendlyName, AvatarItemType = avatarItemType,
+                ConsumableItemDesc = consumableItemDesc,
-                EquipmentPrefabName = "", EquipmentModificationGuid = "",
+                AvatarItemDesc = avatarItemDesc,
-                CurrencyType = currencyType, Currency = currency, Xp = xp, Level = 0,
+                FriendlyName = friendlyName,
-                Platform = -1, PlatformsToSpawnOn = -1, BalanceType = 0,
+                AvatarItemType = avatarItemType,
-                GiftContext = giftContext, GiftRarity = giftRarity, Message = message
+                EquipmentPrefabName = "",
+                EquipmentModificationGuid = "",
+                CurrencyType = currencyType,
+                Currency = currency,
+                Xp = xp,
+                Level = 0,
+                Platform = -1,
+                PlatformsToSpawnOn = -1,
+                BalanceType = 0,
+                GiftContext = giftContext,
+                GiftRarity = giftRarity,
+                Message = message
             });
         }
         catch (Exception ex)
@@ -840,7 +934,8 @@ public class APIController : ControllerBase
 
     [HttpPost("avatar/v2/gifts/consume/")]
     [Authorize]
-    public async Task<IResult> AvatarGiftsConsume(AppDbContext db) {
+    public async Task<IResult> AvatarGiftsConsume(AppDbContext db)
+    {
         try
         {
             int id = User.Identity.Name != null && int.TryParse(User.Identity.Name, out var parsedId) ? parsedId : -1;
@@ -889,8 +984,11 @@ public class APIController : ControllerBase
                         Ids = new List<int> { giftId },
                         CreatedAts = new List<DateTime> { DateTime.UtcNow },
                         ConsumableItemDesc = receivedGift.ConsumableItemDesc,
-                        Count = 1, InitialCount = 1, IsActive = false,
+                        Count = 1,
-                        ActiveDurationMinutes = 0, IsTransferable = false
+                        InitialCount = 1,
+                        IsActive = false,
+                        ActiveDurationMinutes = 0,
+                        IsTransferable = false
                     });
                 }
                 else
@@ -921,8 +1019,10 @@ public class APIController : ControllerBase
                 {
                     db.TokenBalances.Add(new TokenBalance
                     {
-                        Id = id, CurrencyType = receivedGift.CurrencyType,
+                        Id = id,
-                        BalanceType = -1, Balance = receivedGift.Currency
+                        CurrencyType = receivedGift.CurrencyType,
+                        BalanceType = -1,
+                        Balance = receivedGift.Currency
                     });
                 }
                 else
@@ -946,18 +1046,21 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("rooms/v1/filters")]
-    public async Task<IResult> RoomsFilters() {
+    public async Task<IResult> RoomsFilters()
+    {
         var json = System.IO.File.ReadAllText("JSON/roomfilters.json");
         return Results.Content(json, "application/json");
     }
 
     [HttpGet("/roomserver/rooms/{id}/interactionby/me")]
-    public async Task<IResult> RoomInteractionByMe(string id) {
+    public async Task<IResult> RoomInteractionByMe(string id)
+    {
         return Results.Content("{\"Cheered\":false,\"Favorited\":false}", "application/json");
     }
 
     [HttpPost("images/v4/uploadsaved")]
-    public async Task<IResult> ImageUploadSaved() {
+    public async Task<IResult> ImageUploadSaved()
+    {
         try
         {
             var form = await HttpContext.Request.ReadFormAsync();
@@ -986,7 +1089,8 @@ public class APIController : ControllerBase
     }
 
     [HttpGet("config/v1/backtrace")]
-    public IResult BacktraceConfig() {
+    public IResult BacktraceConfig()
+    {
         return Results.Ok(new
         {
             ReportBudget = 125,
@@ -1001,6 +1105,205 @@ public class APIController : ControllerBase
         });
     }
 
+    [HttpPost("settings/v2/set")]
+    [Authorize]
+    public async Task<IResult> SetSettings(AppDbContext db)
+    {
+        if (!int.TryParse(User.Identity?.Name, out var id))
+            return Results.Unauthorized();
+
+        HttpContext.Request.EnableBuffering();
+        HttpContext.Request.Body.Position = 0;
+        using var reader = new StreamReader(HttpContext.Request.Body);
+        var body = await reader.ReadToEndAsync();
+
+        Console.WriteLine($"Settings request body: {body}");
+
+        var settings = new List<PlayerSetting>();
+
+        if (body.TrimStart().StartsWith("["))
+        {
+            settings = System.Text.Json.JsonSerializer.Deserialize<List<PlayerSetting>>(body) ?? [];
+        }
+        else
+        {
+            var single = System.Text.Json.JsonSerializer.Deserialize<PlayerSetting>(body);
+            if (single != null) settings.Add(single);
+        }
+
+        settings = settings.Where(s => !string.IsNullOrEmpty(s.Key)).ToList();
+
+        if (settings.Count == 0)
+            return Results.Ok();
+
+        db.PlayerSettings.RemoveRange(db.PlayerSettings.Where(s => s.PlayerId == id));
+
+        foreach (var setting in settings)
+        {
+            setting.PlayerId = id;
+            setting.Key = setting.Key ?? "";
+            setting.Value = setting.Value ?? "";
+            db.PlayerSettings.Add(setting);
+        }
+
+        await db.SaveChangesAsync();
+        return Results.Ok();
+    }
+
+
+    [HttpGet("equipment/v2/getUnlocked")]
+    public async Task<IResult> GetEquipmentUnlocked()
+    {
+        return Results.Content("[]", "application/json");
+    }
+
+    [HttpGet("consumables/v2/getUnlocked")]
+    [Authorize]
+    public async Task<IResult> GetConsumablesUnlocked(AppDbContext db)
+    {
+        if (!int.TryParse(User.Identity?.Name, out var id))
+            return Results.Unauthorized();
+
+        var consumables = await db.ConsumableItems
+            .Where(c => c.OwnerAccountId == id)
+            .ToListAsync();
+
+        return Results.Json(consumables);
+    }
+
+    [HttpGet("storefronts/v4/balance/2")]
+    [Authorize]
+    public async Task<IResult> GetStorefrontBalance(AppDbContext db)
+    {
+        if (!int.TryParse(User.Identity?.Name, out var id))
+            return Results.Unauthorized();
+
+        var balance = await db.TokenBalances
+            .Where(s => s.Id == id)
+            .ToListAsync();
+
+        return Results.Json(balance);
+    }
+
+    [HttpGet("storefronts/v3/giftdropstore/3")]
+    public async Task<IResult> GetGiftDropStore3(AppDbContext db, StorefrontFillService storefrontService)
+    {
+        var storefronts = await storefrontService.GetStorefrontsAsync();
+        var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 2 && s.Name == "watch_store");
+        if (storefront == null)
+        {
+            var json = System.IO.File.ReadAllText("JSON/storefront3.json");
+            return Results.Content(json, "application/json");
+        }
+        var storeItems = storefront.Items.Select(item => new
+        {
+            item.Id,
+            item.StorefrontId,
+            item.PurchasableItemId,
+            item.Type,
+            item.IsFeatured,
+            item.NewUntil,
+            GiftDrops = item.GiftDrops.Select(gd => new
+            {
+                gd.Id,
+                gd.StorefrontItemId,
+                gd.GiftDropId,
+                gd.FriendlyName,
+                gd.Tooltip,
+                gd.ConsumableItemDesc,
+                gd.AvatarItemDesc,
+                gd.AvatarItemType,
+                gd.EquipmentPrefabName,
+                gd.EquipmentModificationGuid,
+                gd.IsQuery,
+                gd.Unique,
+                gd.SubscribersOnly,
+                gd.Level,
+                gd.Rarity,
+                gd.CurrencyType,
+                gd.Currency,
+                gd.Context,
+                gd.ItemSetId,
+                gd.ItemSetFriendlyName
+            }).ToList(),
+            Prices = item.Prices.Select(p => new
+            {
+                p.Id,
+                p.StorefrontItemId,
+                p.CurrencyType,
+                p.Price
+            }).ToList()
+        }).ToList();
+        var response = new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems };
+        return Results.Ok(response);
+    }
+
+    [HttpGet("challenge/v2/getCurrent")]
+    public async Task<IResult> GetCurrentChallenge()
+    {
+        var json = System.IO.File.ReadAllText("JSON/weeklychallenge.json");
+        return Results.Content(json, "application/json");
+    }
+
+    [HttpGet("avatar/v3/saved")]
+    [Authorize]
+    public async Task<IResult> GetSavedAvatars(AppDbContext db)
+    {
+        if (!int.TryParse(User.Identity?.Name, out var id))
+            return Results.Unauthorized();
+
+        var items = await db.SavedOutfits
+            .Where(i => i.OwnerAccountId == id)
+            .ToListAsync();
+
+        return Results.Json(items);
+    }
+
+    [HttpGet("avatar/v2/gifts")]
+    [Authorize]
+    public async Task<IResult> GetGifts(AppDbContext db)
+    {
+        try
+        {
+            if (!int.TryParse(User.Identity?.Name, out var id))
+                return Results.Unauthorized();
+
+            var pendingGifts = await db.ReceivedGifts
+                .Where(rg => rg.ReceiverAccountId == id && !rg.IsConsumed)
+                .ToListAsync();
+
+            return Results.Json(pendingGifts);
+        }
+        catch (Exception ex)
+        {
+            return Results.Problem($"Error retrieving gifts: {ex.Message}");
+        }
+    }
+
+    [HttpGet("gamerewards/v1/pending")]
+    public async Task<IResult> GetGameRewardsPending()
+    {
+        return Results.Content("[]", "application/json");
+    }
+
+    [HttpGet("roomkeys/v1/mine")]
+    public async Task<IResult> GetRoomKeysMine()
+    {
+        return Results.Content("[]", "application/json");
+    }
+
+    [HttpPost("CampusCard/v1/UpdateAndGetSubscription")]
+    public async Task<IResult> UpdateAndGetSubscription()
+    {
+        return Results.Json(new { subscription = (object?)null, platformAccountSubscribedPlayerId = (object?)null });
+    }
+
+    [Authorize]
+    [HttpGet("customAvatarItems/v1/isCreationAllowedForAccount")]
+    public async Task<IResult> IsCustomAvatarItemsCreationAllowedForAccount()
+    {
+        return Results.Json(new { isAllowed = true });
+    }
 
     private static object[]? TryDeserializeTags(string json)
     {

CannedNet/Services/Controllers/AccountsController.cs

@@ -6,10 +6,10 @@ using Microsoft.Extensions.Primitives;
 
 namespace CannedNet.Services.Controllers;
 
-[ApiController, Route("account")]
+[ApiController, Route("accounts")]
 public class AccountsController : ControllerBase
 {
-    [HttpGet("me")]
+    [HttpGet("account/me")]
     [Authorize]
     public async Task<IResult> Me(AppDbContext db)
     {
@@ -18,9 +18,10 @@ public class AccountsController : ControllerBase
 
         Account? account = await db.Accounts.FindAsync(id);
         if (account == null)
-            return Results.NotFound();
+            return Results.Unauthorized();
 
-        SelfAccount selfAccount = new SelfAccount {
+        SelfAccount selfAccount = new SelfAccount
+        {
             AccountId = id,
             ProfileImage = account.ProfileImage ?? "hdqeamlcmatc6qzoi2ybgf0ddijjcf.jpg",
             IsJunior = account.IsJunior,
@@ -41,7 +42,7 @@ public class AccountsController : ControllerBase
         return Results.Ok(selfAccount);
     }
 
-    [HttpGet("bulk")]
+    [HttpGet("account/bulk")]
     public async Task<IResult> Bulk(AppDbContext db)
     {
         StringValues ids = HttpContext.Request.Query["id"];
@@ -73,7 +74,7 @@ public class AccountsController : ControllerBase
         return Results.Json(result);
     }
 
-    [HttpGet("{id}")]
+    [HttpGet("account/{id}")]
     public async Task<IResult> Id(string id, AppDbContext db)
     {
         if (!int.TryParse(id, out int accountId))
@@ -99,7 +100,7 @@ public class AccountsController : ControllerBase
         return Results.Json(result);
     }
 
-    [HttpPost("create")]
+    [HttpPost("account/create")]
     public async Task<IResult> Create(AppDbContext db)
     {
         var request = HttpContext.Request;

CannedNet/Services/Controllers/AuthController.cs

@@ -4,17 +4,19 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace CannedNet.Services.Controllers;
 
-[ApiController]
+[ApiController, Route("auth")]
 public class AuthController : ControllerBase
 {
     [HttpGet("eac/challenge")]
-    public async Task<IResult> EacChallenge() {
+    public async Task<IResult> EacChallenge()
+    {
         string file = await System.IO.File.ReadAllTextAsync("JSON/eacchallenge.txt");
         return Results.Content(file, "text/plain");
     }
 
     [HttpGet("cachedlogin/forplatformid/{platform}/{id}")]
-    public async Task<IResult> CachedLoginForPlatformId(string platform, string id, AppDbContext db) {
+    public async Task<IResult> CachedLoginForPlatformId(string platform, string id, AppDbContext db)
+    {
         int platformType = int.Parse(platform);
         List<CachedLogin> logins = await db.CachedLogins
             .Where(c => c.Platform == (PlatformType)platformType && c.PlatformID == id)
@@ -24,7 +26,8 @@ public class AuthController : ControllerBase
     }
 
     [HttpPost("connect/token")]
-    public async Task<IResult> ConnectToken(AppDbContext db, JwtTokenService jwtService) {
+    public async Task<IResult> ConnectToken(AppDbContext db, JwtTokenService jwtService)
+    {
         string accountId = "";
         string platformId = "";
         string platform = "";
@@ -34,7 +37,7 @@ public class AuthController : ControllerBase
             try
             {
                 HttpContext.Request.EnableBuffering();
-                    using StreamReader reader = new (HttpContext.Request.Body, leaveOpen: true);
+                using StreamReader reader = new(HttpContext.Request.Body, leaveOpen: true);
                 string body = await reader.ReadToEndAsync();
 
                 if (!string.IsNullOrWhiteSpace(body))
@@ -46,7 +49,8 @@ public class AuthController : ControllerBase
                         string key = Uri.UnescapeDataString(keyValue[0]);
                         string value = Uri.UnescapeDataString(keyValue[1]);
 
-                            switch (key) {
+                        switch (key)
+                        {
                             case "account_id":
                                 accountId = value;
                                 break;
@@ -85,7 +89,8 @@ public class AuthController : ControllerBase
     }
 
     [HttpPost("api/accounts/v1/forplatformids")]
-    public async Task<IResult> AccountsForPlatformIds(AppDbContext db) {
+    public async Task<IResult> AccountsForPlatformIds(AppDbContext db)
+    {
 
         HttpContext.Request.EnableBuffering();
         HttpContext.Request.Body.Position = 0;
@@ -121,7 +126,8 @@ public class AuthController : ControllerBase
     }
 
     [HttpGet("role/developer/{id}")]
-    public async Task<IResult> GetDeveloperRole(string id) {
+    public async Task<IResult> GetDeveloperRole(string id)
+    {
         return Results.Ok(RecNetResult.Ok());
     }
 }

CannedNet/Services/Controllers/EconController.cs

@@ -9,21 +9,60 @@ namespace CannedNet.Services.Controllers;
 [ApiController, Route("econ")]
 public class EconController : ControllerBase
 {
-    [HttpGet("/api/avatar/v1/defaultunlocked")]
+    [HttpGet("customAvatarItems/v1/owned")]
+    public async Task<IResult> CustomAvatarItemsOwned()
+    {
+        return Results.Json(new { items = new List<object>() });
+    }
+
+    [HttpGet("api/avatar/v1/defaultunlocked")]
     public async Task<IResult> DefaultUnlocked()
     {
         var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json");
         return Results.Content(json, "application/json");
     }
 
-    [HttpGet("/api/avatar/v1/defaultbaseavataritems")]
+    [HttpGet("api/objectives/v1/myprogress")]
-    public async Task<IResult> DefaultBaseAvatarItems()
+    public async Task<IResult> ObjectivesMyProgress()
     {
-        var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json");
+        var json = System.IO.File.ReadAllText("JSON/tempmyprogress.json");
         return Results.Content(json, "application/json");
     }
 
-    [HttpGet("/api/avatar/v4/items")]
+    [HttpGet("api/avatar/v2")]
+    [Authorize]
+    public async Task<IResult> GetAvatarV2(AppDbContext db)
+    {
+        if (!int.TryParse(User.Identity?.Name, out var id))
+            return Results.Unauthorized();
+
+        var avatar = await db.PlayerAvatars
+            .FirstOrDefaultAsync(a => a.OwnerAccountId == id);
+
+        if (avatar == null)
+        {
+            avatar = new PlayerAvatar
+            {
+                OwnerAccountId = id,
+                OutfitSelections = "",
+                FaceFeatures = "{}",
+                SkinColor = "",
+                HairColor = ""
+            };
+            db.PlayerAvatars.Add(avatar);
+            await db.SaveChangesAsync();
+        }
+
+        return Results.Json(new
+        {
+            OutfitSelections = avatar.OutfitSelections,
+            FaceFeatures = avatar.FaceFeatures,
+            SkinColor = avatar.SkinColor,
+            HairColor = avatar.HairColor
+        });
+    }
+
+    [HttpGet("api/avatar/v4/items")]
     [Authorize]
     public async Task<IResult> GetAvatarItemsV4(AppDbContext db)
     {
@@ -196,241 +235,10 @@ public class EconController : ControllerBase
         return Results.Json(allItems);
     }
 
-    [HttpGet("api/objectives/v1/myprogress")]
+    [HttpGet("api/avatar/v1/defaultbaseavataritems")]
-    public async Task<IResult> ObjectivesMyProgress()
+    public async Task<IResult> DefaultBaseAvatarItems()
     {
-        var json = System.IO.File.ReadAllText("JSON/tempmyprogress.json");
+        var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json");
         return Results.Content(json, "application/json");
     }
-
-    [HttpGet("api/avatar/v2")]
-    [Authorize]
-    public async Task<IResult> GetAvatarV2(AppDbContext db)
-    {
-        if (!int.TryParse(User.Identity?.Name, out var id))
-            return Results.Unauthorized();
-
-        var avatar = await db.PlayerAvatars
-            .FirstOrDefaultAsync(a => a.OwnerAccountId == id);
-
-        if (avatar == null)
-        {
-            avatar = new PlayerAvatar
-            {
-                OwnerAccountId = id,
-                OutfitSelections = "",
-                FaceFeatures = "{}",
-                SkinColor = "",
-                HairColor = ""
-            };
-            db.PlayerAvatars.Add(avatar);
-            await db.SaveChangesAsync();
-        }
-
-        return Results.Json(new
-        {
-            OutfitSelections = avatar.OutfitSelections,
-            FaceFeatures = avatar.FaceFeatures,
-            SkinColor = avatar.SkinColor,
-            HairColor = avatar.HairColor
-        });
-    }
-
-    [HttpPost("api/settings/v2/set")]
-    [Authorize]
-    public async Task<IResult> SetSettings(AppDbContext db)
-    {
-        if (!int.TryParse(User.Identity?.Name, out var id))
-            return Results.Unauthorized();
-
-        HttpContext.Request.EnableBuffering();
-        HttpContext.Request.Body.Position = 0;
-        using var reader = new StreamReader(HttpContext.Request.Body);
-        var body = await reader.ReadToEndAsync();
-
-        Console.WriteLine($"Settings request body: {body}");
-
-        var settings = new List<PlayerSetting>();
-
-        if (body.TrimStart().StartsWith("["))
-        {
-            settings = System.Text.Json.JsonSerializer.Deserialize<List<PlayerSetting>>(body) ?? [];
-        }
-        else
-        {
-            var single = System.Text.Json.JsonSerializer.Deserialize<PlayerSetting>(body);
-            if (single != null) settings.Add(single);
-        }
-
-        settings = settings.Where(s => !string.IsNullOrEmpty(s.Key)).ToList();
-
-        if (!settings.Any())
-            return Results.Ok();
-
-        db.PlayerSettings.RemoveRange(db.PlayerSettings.Where(s => s.PlayerId == id));
-
-        foreach (var setting in settings)
-        {
-            setting.PlayerId = id;
-            setting.Key = setting.Key ?? "";
-            setting.Value = setting.Value ?? "";
-            db.PlayerSettings.Add(setting);
-        }
-
-        await db.SaveChangesAsync();
-        return Results.Ok();
-    }
-
-    [HttpGet("econ/customAvatarItems/v1/owned")]
-    public async Task<IResult> CustomAvatarItemsOwned()
-    {
-        return Results.Json(new { items = new List<object>() });
-    }
-
-    [HttpGet("api/equipment/v2/getUnlocked")]
-    public async Task<IResult> GetEquipmentUnlocked()
-    {
-        return Results.Content("[]", "application/json");
-    }
-
-    [HttpGet("api/consumables/v2/getUnlocked")]
-    [Authorize]
-    public async Task<IResult> GetConsumablesUnlocked(AppDbContext db)
-    {
-        if (!int.TryParse(User.Identity?.Name, out var id))
-            return Results.Unauthorized();
-
-        var consumables = await db.ConsumableItems
-            .Where(c => c.OwnerAccountId == id)
-            .ToListAsync();
-
-        return Results.Json(consumables);
-    }
-
-    [HttpGet("api/storefronts/v4/balance/2")]
-    [Authorize]
-    public async Task<IResult> GetStorefrontBalance(AppDbContext db)
-    {
-        if (!int.TryParse(User.Identity?.Name, out var id))
-            return Results.Unauthorized();
-
-        var balance = await db.TokenBalances
-            .Where(s => s.Id == id)
-            .ToListAsync();
-
-        return Results.Json(balance);
-    }
-
-    [HttpGet("api/storefronts/v3/giftdropstore/3")]
-    public async Task<IResult> GetGiftDropStore3(AppDbContext db, StorefrontFillService storefrontService)
-    {
-        var storefronts = await storefrontService.GetStorefrontsAsync();
-        var storefront = storefronts.FirstOrDefault(s => s.StorefrontType == 2 && s.Name == "watch_store");
-        if (storefront == null)
-        {
-            var json = System.IO.File.ReadAllText("JSON/storefront3.json");
-            return Results.Content(json, "application/json");
-        }
-        var storeItems = storefront.Items.Select(item => new
-        {
-            item.Id,
-            item.StorefrontId,
-            item.PurchasableItemId,
-            item.Type,
-            item.IsFeatured,
-            item.NewUntil,
-            GiftDrops = item.GiftDrops.Select(gd => new
-            {
-                gd.Id,
-                gd.StorefrontItemId,
-                gd.GiftDropId,
-                gd.FriendlyName,
-                gd.Tooltip,
-                gd.ConsumableItemDesc,
-                gd.AvatarItemDesc,
-                gd.AvatarItemType,
-                gd.EquipmentPrefabName,
-                gd.EquipmentModificationGuid,
-                gd.IsQuery,
-                gd.Unique,
-                gd.SubscribersOnly,
-                gd.Level,
-                gd.Rarity,
-                gd.CurrencyType,
-                gd.Currency,
-                gd.Context,
-                gd.ItemSetId,
-                gd.ItemSetFriendlyName
-            }).ToList(),
-            Prices = item.Prices.Select(p => new
-            {
-                p.Id,
-                p.StorefrontItemId,
-                p.CurrencyType,
-                p.Price
-            }).ToList()
-        }).ToList();
-        var response = new { storefront.Id, storefront.Name, storefront.StorefrontType, storefront.NextUpdate, StoreItems = storeItems };
-        return Results.Ok(response);
-    }
-
-    [HttpGet("api/challenge/v2/getCurrent")]
-    public async Task<IResult> GetCurrentChallenge()
-    {
-        var json = System.IO.File.ReadAllText("JSON/weeklychallenge.json");
-        return Results.Content(json, "application/json");
-    }
-
-    [HttpGet("api/avatar/v3/saved")]
-    [Authorize]
-    public async Task<IResult> GetSavedAvatars(AppDbContext db)
-    {
-        if (!int.TryParse(User.Identity?.Name, out var id))
-            return Results.Unauthorized();
-
-        var items = await db.SavedOutfits
-            .Where(i => i.OwnerAccountId == id)
-            .ToListAsync();
-
-        return Results.Json(items);
-    }
-
-    [HttpGet("api/avatar/v2/gifts")]
-    [Authorize]
-    public async Task<IResult> GetGifts(AppDbContext db)
-    {
-        try
-        {
-            if (!int.TryParse(User.Identity?.Name, out var id))
-                return Results.Unauthorized();
-
-            var pendingGifts = await db.ReceivedGifts
-                .Where(rg => rg.ReceiverAccountId == id && !rg.IsConsumed)
-                .ToListAsync();
-
-            return Results.Json(pendingGifts);
-        }
-        catch (Exception ex)
-        {
-            return Results.Problem($"Error retrieving gifts: {ex.Message}");
-        }
-    }
-
-    [HttpGet("api/gamerewards/v1/pending")]
-    public async Task<IResult> GetGameRewardsPending()
-    {
-        return Results.Content("[]", "application/json");
-    }
-
-    [HttpGet("api/roomkeys/v1/mine")]
-    public async Task<IResult> GetRoomKeysMine()
-    {
-        return Results.Content("[]", "application/json");
-    }
-
-    [HttpPost("api/CampusCard/v1/UpdateAndGetSubscription")]
-    public async Task<IResult> UpdateAndGetSubscription()
-    {
-        return Results.Json(new { subscription = (object?)null, platformAccountSubscribedPlayerId = (object?)null });
-    }
 }