OpenShock · hhvrc · Jul 1, 2026 · Jun 12, 2026 · Jun 30, 2026 · Jun 30, 2026
diff --git a/API.IntegrationTests/Helpers/TestHelper.cs b/API.IntegrationTests/Helpers/TestHelper.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Text;
 using System.Text.Json;
+using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using OpenShock.Common.Constants;
 using OpenShock.Common.OpenShockDb;
@@ -50,7 +51,7 @@ public static async Task<AuthenticatedUser> CreateAndLoginUser(
     /// </summary>
     public static HttpClient CreateAuthenticatedClient(WebApplicationFactory factory, string sessionToken)
     {
-        var client = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions
+        var client = factory.CreateClient(new WebApplicationFactoryClientOptions
         {
             AllowAutoRedirect = false,
             HandleCookies = false
@@ -64,7 +65,7 @@ public static HttpClient CreateAuthenticatedClient(WebApplicationFactory factory
     /// </summary>
     public static HttpClient CreateApiTokenClient(WebApplicationFactory factory, string apiToken)
     {
-        var client = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions
+        var client = factory.CreateClient(new WebApplicationFactoryClientOptions
         {
             AllowAutoRedirect = false,
             HandleCookies = false
@@ -78,7 +79,7 @@ public static HttpClient CreateApiTokenClient(WebApplicationFactory factory, str
     /// </summary>
     public static HttpClient CreateHubTokenClient(WebApplicationFactory factory, string hubToken)
     {
-        var client = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions
+        var client = factory.CreateClient(new WebApplicationFactoryClientOptions
         {
             AllowAutoRedirect = false,
             HandleCookies = false
@@ -146,7 +147,7 @@ public static async Task<Guid> CreateUserInDb(
         WebApplicationFactory factory,
         Guid userId,
         string name = "TestToken",
-        List<Common.Models.PermissionType>? permissions = null)
+        List<PermissionType>? permissions = null)
     {
         await using var scope = factory.Services.CreateAsyncScope();
         var db = scope.ServiceProvider.GetRequiredService<OpenShockContext>();
@@ -160,7 +161,7 @@ public static async Task<Guid> CreateUserInDb(
             Name = name,
             TokenHash = HashingUtils.HashToken(rawToken),
             CreatedByIp = IPAddress.Loopback,
-            Permissions = permissions ?? [Common.Models.PermissionType.Shockers_Use]
+            Permissions = permissions ?? [PermissionType.Shockers_Use]
         });
         await db.SaveChangesAsync();
         return (tokenId, rawToken);

diff --git a/API.IntegrationTests/Tests/TokensTests.cs b/API.IntegrationTests/Tests/TokensTests.cs
@@ -1,6 +1,7 @@
 using System.Net;
 using System.Text.Json;
 using OpenShock.API.IntegrationTests.Helpers;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.IntegrationTests.Tests;
 
@@ -348,7 +349,7 @@ public async Task ApiTokenAuth_CanAccessDevices()
     {
         var userId = await TestHelper.CreateUserInDb(WebApplicationFactory, "tokauth", "tokauth@test.org", "SecurePassword123#");
         var (_, rawToken) = await TestHelper.CreateApiTokenInDb(WebApplicationFactory, userId, "AuthToken",
-            [Common.Models.PermissionType.Shockers_Use, Common.Models.PermissionType.Devices_Edit]);
+            [PermissionType.Shockers_Use, PermissionType.Devices_Edit]);
         using var client = TestHelper.CreateApiTokenClient(WebApplicationFactory, rawToken);
 
         var response = await client.GetAsync("/1/devices");

diff --git a/API/Controller/Account/Authenticated/ChangeUsername.cs b/API/Controller/Account/Authenticated/ChangeUsername.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Net.Mime;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
 using OpenShock.Common.Errors;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
-using System.Net.Mime;
 
 namespace OpenShock.API.Controller.Account.Authenticated;
 

diff --git a/API/Controller/Devices/DevicesController.cs b/API/Controller/Devices/DevicesController.cs
@@ -1,18 +1,20 @@
-using Asp.Versioning;
+using System.Net.Mime;
+using System.Security.Cryptography;
+using Asp.Versioning;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Requests;
+using OpenShock.API.Models.Response;
+using OpenShock.API.Services.DeviceUpdate;
 using OpenShock.Common.Authentication.Attributes;
 using OpenShock.Common.Constants;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Redis;
 using OpenShock.Common.Utils;
-using System.Net.Mime;
-using System.Security.Cryptography;
-using OpenShock.API.Services.DeviceUpdate;
 using Redis.OM;
 
 namespace OpenShock.API.Controller.Devices;
@@ -25,12 +27,12 @@ public sealed partial class DevicesController
     /// <response code="200">All devices for the current user</response>
     [HttpGet]
     [MapToApiVersion("1")]
-    [ProducesResponseType<LegacyDataResponse<Models.Response.DeviceResponse[]>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
+    [ProducesResponseType<LegacyDataResponse<DeviceResponse[]>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     public IActionResult ListDevices()
     {
         var devices = _db.Devices
             .Where(x => x.OwnerId == CurrentUser.Id)
-            .Select(x => new Models.Response.DeviceResponse
+            .Select(x => new DeviceResponse
             {
                 Id = x.Id,
                 Name = x.Name,
@@ -47,7 +49,7 @@ public IActionResult ListDevices()
     /// <param name="deviceId"></param>
     /// <response code="200">The device</response>
     [HttpGet("{deviceId}")]
-    [ProducesResponseType<LegacyDataResponse<Models.Response.DeviceWithTokenResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
+    [ProducesResponseType<LegacyDataResponse<DeviceWithTokenResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // DeviceNotFound
     [MapToApiVersion("1")]
     public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
@@ -56,7 +58,7 @@ public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
 
 
         var device = await _db.Devices.Where(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId)
-            .Select(x => new Models.Response.DeviceWithTokenResponse
+            .Select(x => new DeviceWithTokenResponse
             {
                 Id = x.Id,
                 Name = x.Name,

diff --git a/API/Controller/Sessions/DeleteSessions.cs b/API/Controller/Sessions/DeleteSessions.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Net.Mime;
+using Microsoft.AspNetCore.Mvc;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Extensions;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
-using System.Net.Mime;
 
 namespace OpenShock.API.Controller.Sessions;
 

diff --git a/API/Controller/Shares/UserShares/UpdateShockerShares.cs b/API/Controller/Shares/UserShares/UpdateShockerShares.cs
@@ -7,6 +7,7 @@
 using OpenShock.Common.Authentication.Attributes;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 
 namespace OpenShock.API.Controller.Shares.UserShares;

diff --git a/API/Controller/Shockers/EditShocker.cs b/API/Controller/Shockers/EditShocker.cs
@@ -7,6 +7,7 @@
 using OpenShock.Common.Authentication.Attributes;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 
 namespace OpenShock.API.Controller.Shockers;

diff --git a/API/Controller/Shockers/PauseShocker.cs b/API/Controller/Shockers/PauseShocker.cs
@@ -7,6 +7,7 @@
 using OpenShock.Common.Authentication.Attributes;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 
 namespace OpenShock.API.Controller.Shockers;

diff --git a/API/Controller/Shockers/RemoveShocker.cs b/API/Controller/Shockers/RemoveShocker.cs
@@ -7,6 +7,7 @@
 using OpenShock.Common.Errors;
 using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 
 namespace OpenShock.API.Controller.Shockers;

diff --git a/API/Controller/Users/GetSelf.cs b/API/Controller/Users/GetSelf.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.Common.Extensions;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Controller.Users;
 

diff --git a/API/Models/Requests/EditTokenRequest.cs b/API/Models/Requests/EditTokenRequest.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using OpenShock.Common.Constants;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Requests;
 

diff --git a/API/Models/Requests/EditTokenRequestV2.cs b/API/Models/Requests/EditTokenRequestV2.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using OpenShock.Common.Constants;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Requests;
 

diff --git a/API/Models/Requests/NewShocker.cs b/API/Models/Requests/NewShocker.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using OpenShock.Common.Constants;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Requests;
 

diff --git a/API/Models/Response/LogEntry.cs b/API/Models/Response/LogEntry.cs
@@ -1,4 +1,5 @@
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/API/Models/Response/LogEntryWithHub.cs b/API/Models/Response/LogEntryWithHub.cs
@@ -1,4 +1,5 @@
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/API/Models/Response/ShockerResponse.cs b/API/Models/Response/ShockerResponse.cs
@@ -1,4 +1,4 @@
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/API/Models/Response/TokenCreatedResponse.cs b/API/Models/Response/TokenCreatedResponse.cs
@@ -1,4 +1,4 @@
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/API/Models/Response/TokenCreatedResponseV2.cs b/API/Models/Response/TokenCreatedResponseV2.cs
@@ -1,5 +1,4 @@
-using OpenShock.API.Models;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/API/Models/Response/TokenResponse.cs b/API/Models/Response/TokenResponse.cs
@@ -1,4 +1,4 @@
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/API/Models/Response/TokenResponseV2.cs b/API/Models/Response/TokenResponseV2.cs
@@ -1,5 +1,4 @@
-using OpenShock.API.Models;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.API.Models.Response;
 

diff --git a/Common.Tests/Models/ApiTokenControlLimitsTests.cs b/Common.Tests/Models/ApiTokenControlLimitsTests.cs
@@ -1,4 +1,5 @@
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.Common.Tests.Models;
 

diff --git a/Common.Tests/Utils/HashingUtilsTests.cs b/Common.Tests/Utils/HashingUtilsTests.cs
@@ -1,4 +1,4 @@
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Utils;
 
 namespace OpenShock.Common.Tests.Utils;

diff --git a/Common.Tests/Utils/PermissionUtilsTests.cs b/Common.Tests/Utils/PermissionUtilsTests.cs
@@ -1,4 +1,5 @@
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Utils;
 
 namespace OpenShock.Common.Tests.Utils;

diff --git a/Common/Authentication/Requirements/ApiTokenPermissionRequirement.cs b/Common/Authentication/Requirements/ApiTokenPermissionRequirement.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.Common.Authentication.Requirements;
 

diff --git a/Common/DeviceControl/ControlShockerObj.cs b/Common/DeviceControl/ControlShockerObj.cs
@@ -1,4 +1,5 @@
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.Common.DeviceControl;
 

diff --git a/Common/Errors/AuthorizationError.cs b/Common/Errors/AuthorizationError.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Problems.CustomProblems;
 

diff --git a/Common/Extensions/ClaimsPrincipalExtensions.cs b/Common/Extensions/ClaimsPrincipalExtensions.cs
@@ -1,6 +1,6 @@
 using System.Security.Claims;
 using OpenShock.Common.Authentication;
-using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.Common.Extensions;
 

diff --git a/Common/JsonSerialization/PermissionTypeConverter.cs b/Common/JsonSerialization/PermissionTypeConverter.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 namespace OpenShock.Common.JsonSerialization;
 

diff --git a/Common/Migrations/20260603134636_AddApiTokenShockerControl.cs b/Common/Migrations/20260603134636_AddApiTokenShockerControl.cs
@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 #nullable disable
 

diff --git a/Common/Migrations/20260630210423_AddEmailOutbox.cs b/Common/Migrations/20260630210423_AddEmailOutbox.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Migrations;
 using OpenShock.Common.Models;
+using OpenShock.Common.OpenShockDb;
 
 #nullable disable