feat: .NET 11

.dockerignore

@@ -9,4 +9,4 @@ API/SmtpTemplates/dist/
 **/appsettings.Development.json
 Dockerfile*
 **/*.md
-dev/
+Dev/

.github/workflows/ci-build.yml

@@ -32,7 +32,7 @@ name: ci-build
 
 env:
   REGISTRY: ghcr.io
-  DOTNET_VERSION: 10.0.x
+  DOTNET_VERSION: 11.0.x
 
 jobs:
 

.github/workflows/ci-tag.yml

@@ -7,7 +7,7 @@ on:
 name: ci-tag
 
 env:
-  DOTNET_VERSION: 10.0.x
+  DOTNET_VERSION: 11.0.x
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository_owner }}/api
 

.github/workflows/codeql.yml

@@ -9,7 +9,7 @@ on:
     - cron: '0 6 * * 1'
 
 env:
-  DOTNET_VERSION: 10.x.x
+  DOTNET_VERSION: 11.0.x
 
 jobs:
   analyze:

API/Controller/Account/Authenticated/ChangeEmail.cs

@@ -2,9 +2,11 @@
 using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Utils;
 
@@ -42,13 +44,16 @@ public async Task<IActionResult> ChangeEmail([FromBody] ChangeEmailRequest body)
 
         var result = await _accountService.CreateEmailChangeFlowAsync(CurrentUser.Id, body.Email, actorId: CurrentUser.Id);
 
-        return result.Match<IActionResult>(
-            success => Ok(),
-            alreadyInUse => Problem(AccountError.EmailChangeAlreadyInUse),
-            unchanged => Problem(AccountError.EmailChangeUnchanged),
-            tooMany => Problem(AccountError.EmailChangeTooMany),
-            notActivated => throw new UnreachableException("Authenticated user is not activated"),
-            deactivated => throw new UnreachableException("Authenticated user is deactivated"),
-            notFound => throw new UnreachableException("Authenticated user not found in database"));
+        return result switch
+        {
+            Results.Success => Ok(),
+            EmailAlreadyInUse => Problem(AccountError.EmailChangeAlreadyInUse),
+            EmailUnchanged => Problem(AccountError.EmailChangeUnchanged),
+            TooManyEmailChanges => Problem(AccountError.EmailChangeTooMany),
+            AccountNotActivated => throw new UnreachableException("Authenticated user is not activated"),
+            AccountDeactivated => throw new UnreachableException("Authenticated user is deactivated"),
+            Results.NotFound => throw new UnreachableException("Authenticated user not found in database"),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/Authenticated/ChangePassword.cs

@@ -2,9 +2,11 @@
 using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Utils;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Utils;
 
@@ -42,10 +44,13 @@ public async Task<IActionResult> ChangePassword([FromBody] ChangePasswordRequest
 
         var result = await _accountService.ChangePasswordAsync(CurrentUser.Id, body.NewPassword, actorId: CurrentUser.Id);
 
-        return result.Match<IActionResult>(
-            success => Ok(),
-            notActivated => throw new UnreachableException("Authenticated user is not activated"),
-            deactivated => throw new UnreachableException("Authenticated user is deactivated"),
-            notFound => throw new UnreachableException("Authenticated user not found in database"));
+        return result switch
+        {
+            Results.Success => Ok(),
+            AccountNotActivated => throw new UnreachableException("Authenticated user is not activated"),
+            AccountDeactivated => throw new UnreachableException("Authenticated user is deactivated"),
+            Results.NotFound => throw new UnreachableException("Authenticated user not found in database"),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/Authenticated/ChangeUsername.cs

@@ -1,9 +1,13 @@
-using System.Net.Mime;
+using System.Diagnostics;
+using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
+using OpenShock.Common.Validation;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -28,12 +32,15 @@ public async Task<IActionResult> ChangeUsername([FromBody] ChangeUsernameRequest
         var result = await _accountService.ChangeUsernameAsync(CurrentUser.Id, body.Username, actorId: CurrentUser.Id,
             ignoreLimit: CurrentUser.Roles.Any(r => r is RoleType.Staff or RoleType.Admin or RoleType.System));
 
-        return result.Match<IActionResult>(
-            success => Ok(),
-            usernametaken => Problem(AccountError.UsernameTaken),
-            usernameerror => Problem(AccountError.UsernameInvalid(usernameerror)),
-            recentlychanged => Problem(AccountError.UsernameRecentlyChanged),
-            accountdeactivated => Problem(AccountError.AccountDeactivated),
-            notfound => throw new Exception("Unexpected result, apparently our current user does not exist..."));
+        return result switch
+        {
+            Results.Success => Ok(),
+            UsernameTaken => Problem(AccountError.UsernameTaken),
+            UsernameError usernameError => Problem(AccountError.UsernameInvalid(usernameError)),
+            RecentlyChanged => Problem(AccountError.UsernameRecentlyChanged),
+            AccountDeactivated => Problem(AccountError.AccountDeactivated),
+            Results.NotFound => throw new Exception("Unexpected result, apparently our current user does not exist..."),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/Authenticated/Deactivate.cs

@@ -1,7 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
 using System.Net.Mime;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
+using AccountSvc = OpenShock.API.Services.Account;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -19,12 +23,14 @@ public sealed partial class AuthenticatedAccountController
     public async Task<IActionResult> Deactivate()
     {
         var deactivationResult = await _accountService.DeactivateAccountAsync(CurrentUser.Id, CurrentUser.Id, deleteLater: true);
-        return deactivationResult.Match<IActionResult>(
-            success => NoContent(),
-            cannotDeactivatePrivledged => Problem(AccountActivationError.CannotDeactivateOrDeletePrivledgedAccount),
-            alreadyDeactivated => Problem(AccountActivationError.AlreadyDeactivated),
-            unauthorized => Problem(AccountActivationError.Unauthorized),
-            notFound => throw new Exception("This is not supposed to happen, wtf?")
-        );
+        return deactivationResult switch
+        {
+            Results.Success => NoContent(),
+            CannotDeactivatePrivilegedAccount => Problem(AccountActivationError.CannotDeactivateOrDeletePrivledgedAccount),
+            AccountDeactivationAlreadyInProgress => Problem(AccountActivationError.AlreadyDeactivated),
+            AccountSvc.Unauthorized => Problem(AccountActivationError.Unauthorized),
+            Results.NotFound => throw new Exception("This is not supposed to happen, wtf?"),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/CheckUsername.cs

@@ -1,7 +1,10 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using OpenShock.API.Services.Account;
+using OpenShock.Common.Results;
 using OpenShock.Common.Validation;
 
 namespace OpenShock.API.Controller.Account;
@@ -20,11 +23,13 @@ public async Task<UsernameCheckResponse> CheckUsername([FromBody] ChangeUsername
     {
         var result = await _accountService.CheckUsernameAvailabilityAsync(body.Username, cancellationToken);
 
-        return result.Match(
-            success => new UsernameCheckResponse(UsernameAvailability.Available),
-            taken => new UsernameCheckResponse(UsernameAvailability.Taken),
-            invalid => new UsernameCheckResponse(UsernameAvailability.Invalid, invalid)
-        );
+        return result switch
+        {
+            Success => new UsernameCheckResponse(UsernameAvailability.Available),
+            UsernameTaken => new UsernameCheckResponse(UsernameAvailability.Taken),
+            UsernameError invalid => new UsernameCheckResponse(UsernameAvailability.Invalid, invalid),
+            _ => throw new UnreachableException()
+        };
     }
 }
 

API/Controller/Account/LoginV2.cs

@@ -1,12 +1,16 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using System.Diagnostics;
 using System.Net.Mime;
 using Asp.Versioning;
 using Microsoft.AspNetCore.RateLimiting;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Problems;
 using OpenShock.API.Models.Response;
 using OpenShock.API.Services.Turnstile;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -38,14 +42,16 @@ public async Task<IActionResult> LoginV2(
         if (turnstileError is not null) return turnstileError;
 
         var getAccountResult = await _accountService.GetAccountByCredentialsAsync(body.UsernameOrEmail, body.Password, cancellationToken);
-        if (!getAccountResult.TryPickT0(out var account, out var errors))
+        if (getAccountResult is not User account)
         {
-            return errors.Match(
-                notFound => Problem(LoginError.InvalidCredentials),
-                deactivated => Problem(AccountError.AccountDeactivated),
-                notActivated => Problem(AccountError.AccountNotActivated),
-                oauthOnly => Problem(AccountError.AccountOAuthOnly)
-            );
+            return getAccountResult switch
+            {
+                Results.NotFound => Problem(LoginError.InvalidCredentials),
+                AccountDeactivated => Problem(AccountError.AccountDeactivated),
+                AccountNotActivated => Problem(AccountError.AccountNotActivated),
+                AccountIsOAuthOnly => Problem(AccountError.AccountOAuthOnly),
+                _ => throw new UnreachableException()
+            };
         }
 
         await CreateSession(account.Id, cookieDomain);

API/Controller/Account/PasswordResetCheckValid.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Mime;
 using Asp.Versioning;
 using Microsoft.AspNetCore.RateLimiting;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -41,10 +44,12 @@ public IActionResult PasswordResetCheckValidLegacy([FromRoute] Guid passwordRese
     public async Task<IActionResult> PasswordResetCheckValid([FromRoute] Guid passwordResetId, [FromRoute] string secret, CancellationToken cancellationToken)
     {
         var passwordResetExists = await _accountService.CheckPasswordResetExistsAsync(passwordResetId, secret, cancellationToken);
-        return passwordResetExists.Match(
-            success => LegacyEmptyOk("Valid password reset process"),
-            notFound => Problem(PasswordResetError.PasswordResetNotFound),
-            invalid => Problem(PasswordResetError.PasswordResetNotFound)
-        );
+        return passwordResetExists switch
+        {
+            Results.Success => LegacyEmptyOk("Valid password reset process"),
+            Results.NotFound => Problem(PasswordResetError.PasswordResetNotFound),
+            SecretInvalid => Problem(PasswordResetError.PasswordResetNotFound),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/PasswordResetComplete.cs

@@ -1,11 +1,14 @@
 using System;
+using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Mime;
 using Asp.Versioning;
 using Microsoft.AspNetCore.RateLimiting;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
 using OpenShock.Common.Models;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -44,13 +47,15 @@ public async Task<IActionResult> PasswordResetComplete([FromRoute] Guid password
     {
         var passwordResetComplete = await _accountService.CompletePasswordResetFlowAsync(passwordResetId, secret, body.Password);
 
-        return passwordResetComplete.Match(
-            success => LegacyEmptyOk("Password successfully changed"),
-            notFound => Problem(PasswordResetError.PasswordResetNotFound),
-            notActivated => Problem(AccountError.AccountNotActivated),
-            deactivated => Problem(AccountError.AccountDeactivated),
-            invalid => Problem(PasswordResetError.PasswordResetNotFound)
-                );
+        return passwordResetComplete switch
+        {
+            Results.Success => LegacyEmptyOk("Password successfully changed"),
+            Results.NotFound => Problem(PasswordResetError.PasswordResetNotFound),
+            AccountNotActivated => Problem(AccountError.AccountNotActivated),
+            AccountDeactivated => Problem(AccountError.AccountDeactivated),
+            SecretInvalid => Problem(PasswordResetError.PasswordResetNotFound),
+            _ => throw new UnreachableException()
+        };
     }
 
 

API/Controller/Account/SignupV2.cs

@@ -1,12 +1,16 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Requests;
+using OpenShock.API.Services.Account;
+using System.Diagnostics;
 using System.Net.Mime;
 using Asp.Versioning;
 using Microsoft.AspNetCore.RateLimiting;
 using OpenShock.API.Services.Turnstile;
 using OpenShock.Common.Errors;
+using OpenShock.Common.OpenShockDb;
 using OpenShock.Common.Options;
 using OpenShock.Common.Problems;
+using OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -43,9 +47,11 @@ public async Task<IActionResult> SignUpV2(
         if (turnstileError is not null) return turnstileError;
 
         var creationAction = await _accountService.CreateAccountWithActivationFlowAsync(body.Email, body.Username, body.Password);
-        return creationAction.Match<IActionResult>(
-            _ => Ok(),
-            _ => Problem(SignupError.UsernameOrEmailExists)
-        );
+        return creationAction switch
+        {
+            User _ => Ok(),
+            AccountWithEmailOrUsernameExists => Problem(SignupError.UsernameOrEmailExists),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/VerifyEmail.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Diagnostics;
 using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc;
 using Asp.Versioning;
+using OpenShock.API.Services.Account;
 using OpenShock.Common.Errors;
 using OpenShock.Common.Problems;
+using Results = OpenShock.Common.Results;
 
 using OpenShock.Internal.Common.Problems;
 
@@ -44,9 +47,12 @@ private async Task<IActionResult> VerifyPendingEmailChange(string token, Cancell
     {
         var result = await _accountService.TryVerifyEmailAsync(token, cancellationToken);
 
-        return result.Match<IActionResult>(
-            success => Ok(),
-            notFound => Problem(AccountError.EmailChangeNotFound),
-            emailTaken => Problem(AccountError.EmailChangeAlreadyInUse));
+        return result switch
+        {
+            VerifyEmailSuccess => Ok(),
+            Results.NotFound => Problem(AccountError.EmailChangeNotFound),
+            EmailAlreadyInUse => Problem(AccountError.EmailChangeAlreadyInUse),
+            _ => throw new UnreachableException()
+        };
     }
 }

API/Controller/Account/_Turnstile.cs

@@ -16,9 +16,8 @@ public sealed partial class AccountController
     private async Task<IActionResult?> VerifyTurnstileAsync(ICloudflareTurnstileService turnstileService, string turnstileResponse, CancellationToken cancellationToken)
     {
         var turnStile = await turnstileService.VerifyUserResponseTokenAsync(turnstileResponse, HttpContext.GetRemoteIP(), cancellationToken);
-        if (turnStile.IsT0) return null;
+        if (turnStile is not CloudflareTurnstileError[] cfErrors) return null;
 
-        var cfErrors = turnStile.AsT1.Value;
         if (cfErrors.All(err => err.IsClientError()))
             return Problem(TurnstileError.InvalidTurnstile);