Code cleanup

API/ApiConfig.cs

@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations;
-using OpenShock.API.Services.Email.Mailjet.Mail;
+using OpenShock.API.Services.Email.Mailjet.Mail;
 using OpenShock.ServicesCommon.Config;
+using System.ComponentModel.DataAnnotations;
 
 namespace OpenShock.API;
 
@@ -9,7 +9,7 @@ public sealed class ApiConfig : BaseConfig
     [Required] public required FrontendConfig Frontend { get; init; }
     [Required] public required MailConfig Mail { get; init; }
     [Required] public required TurnstileConfig Turnstile { get; init; }
-    
+
     public sealed class TurnstileConfig
     {
         [Required] public required bool Enabled { get; init; }
@@ -58,5 +58,5 @@ public sealed class TemplateConfig
     }
 
 
-    
+
 }

API/Controller/Account/Login.cs

@@ -1,10 +1,10 @@
-using Microsoft.AspNetCore.Mvc;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
-using System.Net;
-using Asp.Versioning;
 using OpenShock.API.Services.Account;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Account;
 
@@ -28,15 +28,15 @@ public async Task<IActionResult> Login(
     {
         var cookieDomainToUse = apiConfig.Frontend.CookieDomain.Split(',').FirstOrDefault(domain => Request.Headers.Host.ToString().EndsWith(domain, StringComparison.OrdinalIgnoreCase));
         if (cookieDomainToUse == null) return Problem(LoginError.InvalidDomain);
-        
+
         var loginAction = await accountService.Login(body.Email, body.Password, new LoginContext
         {
             Ip = HttpContext.Connection.RemoteIpAddress?.MapToIPv4().ToString() ?? string.Empty,
             UserAgent = HttpContext.Request.Headers.UserAgent.ToString()
         }, cancellationToken);
 
         if (loginAction.IsT1) return Problem(LoginError.InvalidCredentials);
-        
+
 
         HttpContext.Response.Cookies.Append("openShockSession", loginAction.AsT0.Value, new CookieOptions
         {

API/Controller/Account/LoginV2.cs

@@ -1,11 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
-using System.Net;
-using Asp.Versioning;
 using OpenShock.API.Services.Account;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Services.Turnstile;
+using System.Net;
 
 namespace OpenShock.API.Controller.Account;
 
@@ -33,16 +33,16 @@ public async Task<IActionResult> LoginV2(
 
         var turnStile = await turnstileService.VerifyUserResponseToken(body.TurnstileResponse, HttpContext.Connection.RemoteIpAddress, cancellationToken);
         if (!turnStile.IsT0) return Problem(TurnstileError.InvalidTurnstile);
-            
+
         var loginAction = await accountService.Login(body.Email, body.Password, new LoginContext
         {
             Ip = HttpContext.Connection.RemoteIpAddress?.MapToIPv4().ToString() ?? string.Empty,
             UserAgent = HttpContext.Request.Headers.UserAgent.ToString()
         }, cancellationToken);
 
         if (loginAction.IsT1) return Problem(LoginError.InvalidCredentials);
-        
-        
+
+
         HttpContext.Response.Cookies.Append("openShockSession", loginAction.AsT0.Value, new CookieOptions
         {
             Expires = new DateTimeOffset(DateTime.UtcNow.Add(accountService.SessionLifetime)),

API/Controller/Account/PasswordResetCheckValid.cs

@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Net;
-using Asp.Versioning;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Services.Account;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Account;
 

API/Controller/Account/PasswordResetComplete.cs

@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Net;
-using Asp.Versioning;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Services.Account;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Account;
 
@@ -33,7 +33,7 @@ public async Task<IActionResult> PasswordResetComplete([FromRoute] Guid password
             notFound => Problem(PasswordResetError.PasswordResetNotFound),
             invalid => Problem(PasswordResetError.PasswordResetNotFound));
     }
-    
+
 
     public sealed class PasswordResetProcessData
     {

API/Controller/Account/PasswordResetInitiate.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
-using OpenShock.Common.Models;
-using Asp.Versioning;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Services.Account;
+using OpenShock.Common.Models;
 using OpenShock.ServicesCommon.Problems;
 
 namespace OpenShock.API.Controller.Account;

API/Controller/Account/Signup.cs

@@ -1,10 +1,10 @@
-using Microsoft.AspNetCore.Mvc;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
-using System.Net;
-using Asp.Versioning;
 using OpenShock.API.Services.Account;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Account;
 

API/Controller/Account/SignupV2.cs

@@ -1,11 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
-using System.Net;
-using Asp.Versioning;
 using OpenShock.API.Services.Account;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Services.Turnstile;
+using System.Net;
 
 namespace OpenShock.API.Controller.Account;
 

API/Controller/Admin/OnlineDevicesController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using OpenShock.Common.JsonSerialization;
 using OpenShock.Common.Models;
 using OpenShock.Common.Redis;
+using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Utils;
 using Semver;
 using System.Text.Json.Serialization;
-using OpenShock.Common.JsonSerialization;
-using OpenShock.ServicesCommon.Problems;
 
 namespace OpenShock.API.Controller.Admin;
 

API/Controller/Device/AssignLCG.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Utils;
+using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Geo;
+using OpenShock.ServicesCommon.Problems;
 using System.Net;
 using System.Text;
-using OpenShock.ServicesCommon.Errors;
-using OpenShock.ServicesCommon.Problems;
 
 namespace OpenShock.API.Controller.Device;
 
@@ -23,12 +23,12 @@ public async Task<IActionResult> GetLiveControlGateway([FromServices] IGeoLocati
         [FromServices] IWebHostEnvironment env)
     {
         var messageBuilder = new StringBuilder();
-        var countryCode = CountryCodeMapper.CountryInfo.Alpha2CountryCode.DefaultAlphaCode;
+        var countryCode = CountryCodeMapper.Alpha2CountryCode.DefaultAlphaCode;
         if (HttpContext.Request.Headers.TryGetValue("CF-IPCountry", out var countryHeader) &&
             !string.IsNullOrEmpty(countryHeader))
         {
             var countryHeaderString = countryHeader.ToString();
-            if (CountryCodeMapper.CountryInfo.Alpha2CountryCode.TryParseAndValidate(countryHeaderString, out var code))
+            if (CountryCodeMapper.Alpha2CountryCode.TryParseAndValidate(countryHeaderString, out var code))
             {
                 countryCode = code;
             }
@@ -44,19 +44,7 @@ public async Task<IActionResult> GetLiveControlGateway([FromServices] IGeoLocati
             messageBuilder.AppendLine("No CF-IPCountry header found, default country used.");
         }
 
-        if (CountryCodeMapper.CountryCodeToCountryInfo.TryGetValue(countryCode, out var country))
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("Client country identified as [{@CountryInfo}]", country);
-        }
-        else
-        {
-            country = CountryCodeMapper.DefaultCountry;
-            _logger.LogWarning("Country not found in mapping [{Alpha2Code}]", countryCode);
-            messageBuilder.AppendLine("Country not found in mapping, default country used.");
-        }
-
-        var closestNode = await geoLocation.GetClosestNode(country, env.EnvironmentName);
+        var closestNode = await geoLocation.GetClosestNode(countryCode, env.EnvironmentName);
 
         if (closestNode == null) return Problem(AssignLcgError.NoLcgNodesAvailable);
 

API/Controller/Device/Pair.cs

@@ -2,10 +2,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.Common.Redis;
-using Redis.OM;
-using System.Net;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using Redis.OM;
+using System.Net;
 
 namespace OpenShock.API.Controller.Device;
 

API/Controller/Devices/DeviceOtaController.cs

@@ -1,11 +1,11 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.Common.Models.Services.Ota;
 using OpenShock.ServicesCommon.Authentication.Attributes;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Services.Ota;
+using System.Net;
 
 namespace OpenShock.API.Controller.Devices;
 
@@ -31,5 +31,5 @@ public async Task<IActionResult> GetOtaUpdateHistory([FromRoute] Guid deviceId,
 
         return RespondSuccess(await otaService.GetUpdates(deviceId));
     }
-    
+
 }

API/Controller/Devices/DevicesController.cs

@@ -1,5 +1,4 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Requests;
 using OpenShock.API.Services;
@@ -9,6 +8,7 @@
 using OpenShock.ServicesCommon.Authentication.Attributes;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Devices;
 
@@ -46,8 +46,8 @@ public sealed partial class DevicesController
     public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
     {
         var hasAuthPerms = IsAllowed(PermissionType.Devices_Auth);
-        
-        
+
+
         var device = await _db.Devices.Where(x => x.Owner == CurrentUser.DbUser.Id && x.Id == deviceId)
             .Select(x => new Models.Response.ResponseDeviceWithToken
             {
@@ -128,9 +128,9 @@ public async Task<IActionResult> RemoveDevice([FromRoute] Guid deviceId, [FromSe
         var affected = await _db.Devices.Where(x => x.Owner == CurrentUser.DbUser.Id && x.Id == deviceId)
             .ExecuteDeleteAsync();
         if (affected <= 0) return Problem(DeviceError.DeviceNotFound);
-        
+
         await updateService.UpdateDeviceForAllShared(CurrentUser.DbUser.Id, deviceId, DeviceUpdateType.Deleted);
-        
+
         return RespondSuccessSimple("Successfully deleted device");
     }
 
@@ -152,9 +152,9 @@ public async Task<BaseResponse<Guid>> CreateDevice([FromServices] IDeviceUpdateS
         };
         _db.Devices.Add(device);
         await _db.SaveChangesAsync();
-        
+
         await updateService.UpdateDevice(CurrentUser.DbUser.Id, device.Id, DeviceUpdateType.Created);
-        
+
         Response.StatusCode = (int)HttpStatusCode.Created;
         return new BaseResponse<Guid>
         {

API/Controller/Devices/ShockersController.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Response;
-using System.Net;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Devices;
 

API/Controller/Public/GetStats.cs

@@ -29,7 +29,7 @@ public async Task<BaseResponse<StatsResponse>> GetOnlineDevicesStatistics(
     }
 }
 
-public class StatsResponse
+public sealed class StatsResponse
 {
     public required int DevicesOnline { get; set; }
 }

API/Controller/Public/PublicShareController.cs

@@ -1,12 +1,12 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Response;
 using OpenShock.API.Utils;
 using OpenShock.Common.Models;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Utils;
+using System.Net;
 
 namespace OpenShock.API.Controller.Public;
 
@@ -61,8 +61,8 @@ public async Task<IActionResult> GetShareLink([FromRoute] Guid shareLinkId)
         }).SingleOrDefaultAsync();
 
         if (shareLink == null) return RespondSuccess(ShareLinkError.ShareLinkNotFound);
-        
-        
+
+
         var final = new PublicShareLinkResponse
         {
             Id = shareLink.Id,

API/Controller/Shares/DeleteShareCode.cs

@@ -1,8 +1,8 @@
-using System.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using System.Net;
 
 namespace OpenShock.API.Controller.Shares;