chore: Move common logic to shared package

API.IntegrationTests/API.IntegrationTests.csproj

@@ -21,7 +21,7 @@
   <!-- Git stuff -->
   <Target Name="SetHash" AfterTargets="InitializeSourceControlInformation">
     <ItemGroup>
-      <AssemblyAttribute Include="OpenShock.Common.Utils.GitHashAttribute">
+      <AssemblyAttribute Include="OpenShock.Internal.Common.Utils.GitHashAttribute">
         <_Parameter1>$(SourceRevisionId)</_Parameter1>
       </AssemblyAttribute>
     </ItemGroup>

API.IntegrationTests/Docker/InMemoryDatabase.cs

@@ -2,6 +2,8 @@
 using Testcontainers.PostgreSql;
 using TUnit.Core.Interfaces;
 
+using OpenShock.Internal.Common.Utils;
+
 namespace OpenShock.API.IntegrationTests.Docker;
 
 public sealed class InMemoryDatabase : IAsyncInitializer, IAsyncDisposable
@@ -19,7 +21,7 @@ public PostgreSqlContainer Container
                 .WithName($"tunit-postgresql-{Guid.CreateVersion7()}")
                 .WithDatabase("openshock")
                 .WithUsername("openshock")
-                .WithPassword(CryptoUtils.RandomAlphaNumericString(32))
+                .WithPassword(CryptoUtils.RandomString(32))
                 .Build();
 
             return _container;

API.IntegrationTests/Helpers/TestHelper.cs

@@ -8,6 +8,8 @@
 using OpenShock.Common.Services.Session;
 using OpenShock.Common.Utils;
 
+using OpenShock.Internal.Common.Utils;
+
 namespace OpenShock.API.IntegrationTests.Helpers;
 
 public static class TestHelper
@@ -126,7 +128,7 @@ public static async Task<Guid> CreateUserInDb(
         var db = scope.ServiceProvider.GetRequiredService<OpenShockContext>();
 
         var deviceId = Guid.CreateVersion7();
-        var token = CryptoUtils.RandomAlphaNumericString(256);
+        var token = CryptoUtils.RandomString(256);
         db.Devices.Add(new Device
         {
             Id = deviceId,
@@ -151,7 +153,7 @@ public static async Task<Guid> CreateUserInDb(
         await using var scope = factory.Services.CreateAsyncScope();
         var db = scope.ServiceProvider.GetRequiredService<OpenShockContext>();
 
-        var rawToken = CryptoUtils.RandomAlphaNumericString(AuthConstants.ApiTokenLength);
+        var rawToken = CryptoUtils.RandomString(AuthConstants.ApiTokenLength);
         var tokenId = Guid.CreateVersion7();
         db.ApiTokens.Add(new ApiToken
         {

API.IntegrationTests/Tests/LcgAssignmentTests.cs

@@ -10,6 +10,8 @@
 using OpenShock.Common.Utils;
 using Redis.OM.Contracts;
 
+using OpenShock.Internal.Common.Utils;
+
 namespace OpenShock.API.IntegrationTests.Tests;
 
 public sealed class LcgAssignmentTests
@@ -32,7 +34,7 @@ public async Task Setup()
         // Set up variables
         _userId = Guid.CreateVersion7();
         _hubId = Guid.CreateVersion7();
-        _hubToken = CryptoUtils.RandomAlphaNumericString(256);
+        _hubToken = CryptoUtils.RandomString(256);
 
         // Create mock data
         db.Users.Add(new User

API/API.csproj

@@ -36,7 +36,7 @@
   <!-- Git stuff -->
   <Target Name="SetHash" AfterTargets="InitializeSourceControlInformation">
     <ItemGroup>
-      <AssemblyAttribute Include="OpenShock.Common.Utils.GitHashAttribute">
+      <AssemblyAttribute Include="OpenShock.Internal.Common.Utils.GitHashAttribute">
         <_Parameter1>$(SourceRevisionId)</_Parameter1>
       </AssemblyAttribute>
     </ItemGroup>

API/Controller/Account/Activate.cs

@@ -4,6 +4,8 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/Authenticated/ChangeEmail.cs

@@ -6,6 +6,10 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
 
+using OpenShock.Internal.Common.Utils;
+
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account.Authenticated;
 
 public sealed partial class AuthenticatedAccountController

API/Controller/Account/Authenticated/ChangePassword.cs

@@ -6,6 +6,10 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
 
+using OpenShock.Internal.Common.Utils;
+
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account.Authenticated;
 
 public sealed partial class AuthenticatedAccountController

API/Controller/Account/Authenticated/ChangeUsername.cs

@@ -5,6 +5,8 @@
 using OpenShock.Common.Problems;
 using System.Net.Mime;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account.Authenticated;
 
 public sealed partial class AuthenticatedAccountController

API/Controller/Account/Authenticated/Deactivate.cs

@@ -3,6 +3,8 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account.Authenticated;
 
 public sealed partial class AuthenticatedAccountController

API/Controller/Account/Login.cs

@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.Common.Errors;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/LoginV2.cs

@@ -8,6 +8,8 @@
 using OpenShock.API.Models.Response;
 using OpenShock.API.Services.Turnstile;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/PasswordResetCheckValid.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/PasswordResetComplete.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/PasswordResetInitiateV2.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/Signup.cs

@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.Common.Errors;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/SignupV2.cs

@@ -8,6 +8,8 @@
 using OpenShock.Common.Options;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/VerifyEmail.cs

@@ -5,6 +5,8 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Account;
 
 public sealed partial class AccountController

API/Controller/Account/_Turnstile.cs

@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Errors;
 using OpenShock.API.Services.Turnstile;
-using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
+using OpenShock.Internal.Common.Problems;
 
 namespace OpenShock.API.Controller.Account;
 

API/Controller/Admin/Configuration.cs

@@ -6,6 +6,8 @@
 using OpenShock.Common.Services.Configuration;
 using System.Net.Mime;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Admin;
 
 public sealed partial class AdminController

API/Controller/Admin/GetUsers.cs

@@ -4,11 +4,13 @@
 using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
 using OpenShock.Common.OpenShockDb;
-using OpenShock.Common.Query;
+using OpenShock.Internal.DynamicLinq.Query;
 using System.ComponentModel.DataAnnotations;
 using System.Net.Mime;
 using Z.EntityFramework.Plus;
 
+using OpenShock.Internal.DynamicLinq.Extensions;
+
 namespace OpenShock.API.Controller.Admin;
 
 public sealed partial class AdminController
@@ -38,7 +40,7 @@ public async Task<IActionResult> GetUsers(
 
             if (!string.IsNullOrEmpty(orderbyQuery))
             {
-                query = query.ApplyOrderBy(orderbyQuery);
+                query = OpenShock.Internal.DynamicLinq.Extensions.IQueryableExtensions.ApplyOrderBy(query, orderbyQuery);
             }
             else
             {

API/Controller/Device/AssignLCG.cs

@@ -8,6 +8,8 @@
 using OpenShock.Common.Utils;
 using OpenShock.Common.Models;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Device;
 
 public sealed partial class DeviceController

API/Controller/Device/AssignLCGV2.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Device;
 
 public sealed partial class DeviceController

API/Controller/Device/Pair.cs

@@ -9,6 +9,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Device;
 
 public sealed partial class DeviceController

API/Controller/Devices/DeviceOtaController.cs

@@ -12,6 +12,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Services.Ota;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Devices;
 
 [ApiController]

API/Controller/Devices/DevicesController.cs

@@ -15,6 +15,12 @@
 using OpenShock.API.Services.DeviceUpdate;
 using Redis.OM;
 
+using OpenShock.Internal.Common.Utils;
+
+using OpenShock.Internal.Common.Constants;
+
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Devices;
 
 public sealed partial class DevicesController
@@ -112,7 +118,7 @@ public async Task<IActionResult> RegenerateDeviceToken([FromRoute] Guid deviceId
         var device = await _db.Devices.FirstOrDefaultAsync(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId);
         if (device is null) return Problem(HubError.HubNotFound);
 
-        device.Token = CryptoUtils.RandomAlphaNumericString(256);
+        device.Token = CryptoUtils.RandomString(256);
 
         var affected = await _db.SaveChangesAsync();
         if (affected <= 0) throw new Exception("Failed to save regenerated token");
@@ -179,7 +185,7 @@ public async Task<IActionResult> CreateDeviceV2([FromBody] HubCreateRequest body
             Id = Guid.CreateVersion7(),
             OwnerId = CurrentUser.Id,
             Name = body.Name,
-            Token = CryptoUtils.RandomAlphaNumericString(256)
+            Token = CryptoUtils.RandomString(256)
         };
         _db.Devices.Add(device);
         await _db.SaveChangesAsync();

API/Controller/Devices/GetShockers.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Devices;
 
 public sealed partial class DevicesController

API/Controller/Public/PublicShareController.cs

@@ -8,6 +8,8 @@
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Public;
 
 public sealed partial class PublicController

API/Controller/Sessions/DeleteSessions.cs

@@ -5,6 +5,8 @@
 using OpenShock.Common.Problems;
 using System.Net.Mime;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Sessions;
 
 public sealed partial class SessionsController

API/Controller/Shares/DeleteShareCode.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Models;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Shares;
 
 public sealed partial class SharesController

API/Controller/Shares/LinkShareCode.cs

@@ -8,6 +8,8 @@
 using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Shares;
 
 public sealed partial class SharesController

API/Controller/Shares/Links/AddShocker.cs

@@ -6,6 +6,8 @@
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Shares.Links;
 
 public sealed partial class ShareLinksController

API/Controller/Shares/Links/DeletePublicShare.cs

@@ -6,6 +6,8 @@
 using OpenShock.Common.Models;
 using OpenShock.Common.Extensions;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Shares.Links;
 
 public sealed partial class ShareLinksController

API/Controller/Shares/Links/EditShocker.cs

@@ -5,6 +5,8 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Shares.Links;
 
 public sealed partial class ShareLinksController

API/Controller/Shares/Links/PauseShocker.cs

@@ -7,6 +7,8 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 
+using OpenShock.Internal.Common.Problems;
+
 namespace OpenShock.API.Controller.Shares.Links;
 
 public sealed partial class ShareLinksController