.config/dotnet-tools.json

@@ -1,11 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "husky": {
-      "version": "0.7.1",
-      "commands": ["husky"],
-      "rollForward": false
-    }
-  }
-}

.husky/pre-commit

@@ -1,22 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-## husky task runner examples -------------------
-## Note : for local installation use 'dotnet' prefix. e.g. 'dotnet husky'
-
-## run all tasks
-#husky run
-
-### run all tasks with group: 'group-name'
-#husky run --group group-name
-
-## run task with name: 'task-name'
-#husky run --name task-name
-
-## pass hook arguments to task
-#husky run --args "$1" "$2"
-
-## or put your custom commands -------------------
-#echo 'Husky.Net is awesome!'
-
-dotnet husky run

.husky/task-runner.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://alirezanet.github.io/Husky.Net/schema.json",
-  "tasks": [
-    {
-      "name": "run-prettier",
-      "command": "yarn",
-      "args": ["format"],
-      "pathMode": "absolute"
-    },
-    {
-      "name": "dotnet-format",
-      "command": "dotnet",
-      "args": ["format"]
-    }
-  ]
-}

.idea/.idea.Foxnouns.NET/.idea/jsLinters/eslint.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="EslintConfiguration">
     <files-pattern value="**/*.{js,ts,jsx,tsx,html,vue,svelte}" />
-    <option name="fix-on-save" value="true" />
   </component>
 </project>

.idea/.idea.Foxnouns.NET/.idea/prettier.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
+    <option name="myConfigurationMode" value="MANUAL" />
     <option name="myRunOnSave" value="true" />
     <option name="myRunOnReformat" value="true" />
     <option name="myFilesPattern" value="**/*.{js,ts,jsx,tsx,vue,astro,svelte,html}" />

Foxnouns.Backend/Controllers/Authentication/AuthController.cs

@@ -1,18 +1,14 @@
 using System.Web;
-using Foxnouns.Backend.Database;
 using Foxnouns.Backend.Extensions;
-using Foxnouns.Backend.Middleware;
 using Foxnouns.Backend.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using NodaTime;
 
 namespace Foxnouns.Backend.Controllers.Authentication;
 
-[Route("/api/internal/auth")]
-public class AuthController(Config config, DatabaseContext db, KeyCacheService keyCache, ILogger logger)
-    : ApiControllerBase
+[Route("/api/v2/auth")]
+public class AuthController(Config config, KeyCacheService keyCache, ILogger logger) : ApiControllerBase
 {
     private readonly ILogger _logger = logger.ForContext<AuthController>();
 
@@ -65,15 +61,4 @@ public class AuthController(Config config, DatabaseContext db, KeyCacheService k
     public record OauthRegisterRequest(string Ticket, string Username);
 
     public record CallbackRequest(string Code, string State);
-
-    [HttpPost("force-log-out")]
-    [Authorize("identify")]
-    public async Task<IActionResult> ForceLogoutAsync()
-    {
-        _logger.Information("Invalidating all tokens for user {UserId}", CurrentUser!.Id);
-        await db.Tokens.Where(t => t.UserId == CurrentUser.Id)
-            .ExecuteUpdateAsync(s => s.SetProperty(t => t.ManuallyExpired, true));
-
-        return NoContent();
-    }
 }

Foxnouns.Backend/Controllers/Authentication/DiscordAuthController.cs

@@ -10,7 +10,7 @@ using NodaTime;
 
 namespace Foxnouns.Backend.Controllers.Authentication;
 
-[Route("/api/internal/auth/discord")]
+[Route("/api/v2/auth/discord")]
 public class DiscordAuthController(
     [UsedImplicitly] Config config,
     ILogger logger,

Foxnouns.Backend/Controllers/Authentication/EmailAuthController.cs

@@ -1,7 +1,6 @@
 using Foxnouns.Backend.Database;
 using Foxnouns.Backend.Database.Models;
 using Foxnouns.Backend.Extensions;
-using Foxnouns.Backend.Middleware;
 using Foxnouns.Backend.Services;
 using Foxnouns.Backend.Utils;
 using JetBrains.Annotations;
@@ -11,7 +10,7 @@ using NodaTime;
 
 namespace Foxnouns.Backend.Controllers.Authentication;
 
-[Route("/api/internal/auth/email")]
+[Route("/api/v2/auth/email")]
 public class EmailAuthController(
     [UsedImplicitly] Config config,
     DatabaseContext db,
@@ -124,20 +123,9 @@ public class EmailAuthController(
         ));
     }
 
-    [HttpPost("add")]
-    [Authorize("*")]
-    public async Task<IActionResult> AddEmailAddressAsync()
-    {
-        _logger.Information("beep");
-
-        return NoContent();
-    }
-
-    public record AddEmailAddressRequest(string Email, string Password);
-
     private void CheckRequirements()
     {
-        if (!config.EmailAuth.Enabled)
+        if (!config.DiscordAuth.Enabled)
             throw new ApiError.BadRequest("Email authentication is not enabled on this instance.");
     }
 

Foxnouns.Backend/Controllers/UsersController.cs

@@ -186,8 +186,7 @@ public class UsersController(
 
         if (preferences.Count > MaxCustomPreferences)
             errors.Add(("custom_preferences",
-                ValidationError.LengthError("Too many custom preferences", 0, MaxCustomPreferences,
-                    preferences.Count)));
+                ValidationError.LengthError("Too many custom preferences", 0, MaxCustomPreferences, preferences.Count)));
         if (preferences.Count > 50) return errors;
 
         // TODO: validate individual preferences

Foxnouns.Backend/Utils/AuthUtils.cs

@@ -27,7 +27,7 @@ public static class AuthUtils
 
     public static string[] ExpandScopes(this string[] scopes)
     {
-        if (scopes.Contains("*")) return ["*", ..Scopes];
+        if (scopes.Contains("*")) return Scopes;
         List<string> expandedScopes = ["identify"];
         if (scopes.Contains("user")) expandedScopes.AddRange(UserScopes);
         if (scopes.Contains("member")) expandedScopes.AddRange(MemberScopes);

Foxnouns.Backend/Utils/ValidationUtils.cs

@@ -289,7 +289,6 @@ public static partial class ValidationUtils
 
     [GeneratedRegex(@"^[a-zA-Z_0-9\-\.]{2,40}$", RegexOptions.IgnoreCase, "en-NL")]
     private static partial Regex UsernameRegex();
-
     [GeneratedRegex("""^[^@'$%&()+<=>^|~`,*!#/\\\[\]""\{\}\?]{1,100}$""", RegexOptions.IgnoreCase, "en-NL")]
     private static partial Regex MemberRegex();
 }

Foxnouns.Frontend/app/env.server.ts

@@ -2,5 +2,4 @@ import "dotenv/config";
 import { env } from "node:process";
 
 export const API_BASE = env.API_BASE || "https://pronouns.localhost/api";
-export const INTERNAL_API_BASE = env.INTERNAL_API_BASE || "https://localhost:5000/api";
 export const LANGUAGE = env.LANGUAGE || "en";

Foxnouns.Frontend/app/lib/request.server.ts

@@ -1,5 +1,5 @@
 import { parse as parseCookie, serialize as serializeCookie } from "cookie";
-import { API_BASE, INTERNAL_API_BASE } from "~/env.server";
+import { API_BASE } from "~/env.server";
 import { ApiError, ErrorCode } from "./api/error";
 import { tokenCookieName } from "~/lib/utils";
 
@@ -8,17 +8,14 @@ export type RequestParams = {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	body?: any;
 	headers?: Record<string, string>;
-	isInternal?: boolean;
 };
 
-async function requestInternal(
+export default async function serverRequest<T>(
 	method: string,
 	path: string,
 	params: RequestParams = {},
-): Promise<Response> {
-	const base = params.isInternal ? INTERNAL_API_BASE + "/internal" : API_BASE + "/v2";
-
-	const url = `${base}${path}`;
+) {
+	const url = `${API_BASE}/v2${path}`;
 	const resp = await fetch(url, {
 		method,
 		body: params.body ? JSON.stringify(params.body) : undefined,
@@ -40,19 +37,6 @@ async function requestInternal(
 	}
 
 	if (resp.status < 200 || resp.status >= 400) throw (await resp.json()) as ApiError;
-	return resp;
-}
-
-export async function fastRequest(method: string, path: string, params: RequestParams = {}) {
-	await requestInternal(method, path, params);
-}
-
-export default async function serverRequest<T>(
-	method: string,
-	path: string,
-	params: RequestParams = {},
-) {
-	const resp = await requestInternal(method, path, params);
 	return (await resp.json()) as T;
 }
 

Foxnouns.Frontend/app/routes/auth.callback.discord/route.tsx

@@ -43,7 +43,6 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
 	const resp = await serverRequest<CallbackResponse>("POST", "/auth/discord/callback", {
 		body: { code, state },
-		isInternal: true,
 	});
 
 	if (resp.has_account) {
@@ -90,7 +89,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 	try {
 		const resp = await serverRequest<AuthResponse>("POST", "/auth/discord/register", {
 			body: { username, ticket },
-			isInternal: true,
 		});
 
 		return redirect("/auth/welcome", {

Foxnouns.Frontend/app/routes/auth.log-in/route.tsx

@@ -41,7 +41,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 		}
 	}
 
-	const urls = await serverRequest<AuthUrls>("POST", "/auth/urls", { isInternal: true });
+	const urls = await serverRequest<AuthUrls>("POST", "/auth/urls");
 
 	return json({
 		meta: { title: t("log-in.title") },
@@ -57,7 +57,6 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 	try {
 		const resp = await serverRequest<AuthResponse>("POST", "/auth/email/login", {
 			body: { email, password },
-			isInternal: true,
 		});
 
 		return redirect("/", {

Foxnouns.Frontend/app/routes/settings._index/route.tsx

@@ -1,6 +1,6 @@
 import { Button, Form, InputGroup, Table } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
-import { Form as RemixForm, useActionData, useFetcher, useRouteLoaderData } from "@remix-run/react";
+import { Form as RemixForm, useActionData, useRouteLoaderData } from "@remix-run/react";
 import { loader as settingsLoader } from "../settings/route";
 import { loader as rootLoader } from "../../root";
 import { DateTime } from "luxon";
@@ -43,7 +43,6 @@ export default function SettingsIndex() {
 	const actionData = useActionData<typeof action>();
 	const { meta } = useRouteLoaderData<typeof rootLoader>("root")!;
 	const { t } = useTranslation();
-	const fetcher = useFetcher();
 
 	const createdAt = idTimestamp(user.id);
 
@@ -56,7 +55,13 @@ export default function SettingsIndex() {
 							<Form.Group className="mb-3" controlId="username">
 								<Form.Label>{t("settings.general.username")}</Form.Label>
 								<InputGroup className="m-1 w-75">
-									<Form.Control defaultValue={user.username} name="username" type="text" required />
+									<Form.Control
+										defaultValue={user.username}
+										id="username"
+										name="username"
+										type="text"
+										required
+									/>
 									<Button variant="secondary" type="submit">
 										{t("settings.general.change-username")}
 									</Button>
@@ -80,14 +85,9 @@ export default function SettingsIndex() {
 			</div>
 			<div>
 				<h4>{t("settings.general.log-out-everywhere")}</h4>
-				<p>{t("settings.general.log-out-everywhere-hint")}</p>
-				<fetcher.Form method="POST" action="/settings/force-log-out">
-					<Button type="submit" variant="danger">
-						{t("settings.general.force-log-out-button")}
-					</Button>
-				</fetcher.Form>
+				<p></p>
 			</div>
-			<h4 className="mt-2">{t("settings.general.table-header")}</h4>
+			<h4>{t("settings.general.table-header")}</h4>
 			<Table striped bordered hover>
 				<tbody>
 					<tr>

Foxnouns.Frontend/app/routes/settings.force-log-out/route.tsx

@@ -1,19 +0,0 @@
-import { ActionFunction, redirect } from "@remix-run/node";
-import { fastRequest, getToken, writeCookie } from "~/lib/request.server";
-import { tokenCookieName } from "~/lib/utils";
-
-export const action: ActionFunction = async ({ request }) => {
-	const token = getToken(request);
-	if (!token)
-		return redirect("/", {
-			status: 303,
-			headers: { "Set-Cookie": writeCookie(tokenCookieName, "token", 0) },
-		});
-
-	await fastRequest("POST", "/auth/force-log-out", { token, isInternal: true });
-
-	return redirect("/", {
-		status: 303,
-		headers: { "Set-Cookie": writeCookie(tokenCookieName, "token", 0) },
-	});
-};

Foxnouns.Frontend/public/locales/en.json

@@ -96,8 +96,6 @@
 			"change-username": "Change username",
 			"username-change-hint": "Changing your username will make any existing links to your or your members' profiles invalid.\nYour username must be unique, be at most 40 characters long, and only contain letters from the basic English alphabet, dashes, underscores, and periods. Your username is used as part of your profile link, you can set a separate display name.",
 			"log-out-everywhere": "Log out everywhere",
-			"log-out-everywhere-hint": "If you think one of your tokens might have been compromised, you can log out on all devices by clicking this button.",
-			"force-log-out-button": "Force log out",
 			"table-header": "General account information",
 			"id": "Your user ID",
 			"created": "Account created at",

docker-compose.yml

@@ -18,7 +18,6 @@ services:
     build: ./Foxnouns.Frontend
     environment:
       - "API_BASE=http://rate:5003/api"
-      - "INTERNAL_API_BASE=http://backend:5000/api"
     restart: unless-stopped
     volumes:
       - ./docker/frontend.env:/app/.env

migrators/NetImporter/ImportUser.cs

@@ -112,12 +112,12 @@ public static class Users
         foreach (var field in oldUser.Fields ?? [])
         {
             var entries = field.Entries.Select(entry => new FieldEntry
-            {
-                Value = entry.Value,
-                Status = prefMapping.TryGetValue(entry.Status, out var newStatus)
+                {
+                    Value = entry.Value,
+                    Status = prefMapping.TryGetValue(entry.Status, out var newStatus)
                         ? newStatus.ToString()
                         : entry.Status,
-            })
+                })
                 .ToList();
 
             user.Fields.Add(new Field

package.json

@@ -3,7 +3,6 @@
     "concurrently": "^9.0.1"
   },
   "scripts": {
-    "dev": "concurrently -n .net,node,rate -c magenta,yellow,blue -i 'cd Foxnouns.Backend && dotnet watch --no-hot-reload' 'cd Foxnouns.Frontend && yarn dev' 'cd rate && go run -v .'",
-    "format": "cd Foxnouns.Frontend && yarn format"
+    "dev": "concurrently -n .net,node,rate -c magenta,yellow,blue -i 'cd Foxnouns.Backend && dotnet watch --no-hot-reload' 'cd Foxnouns.Frontend && yarn dev' 'cd rate && go run -v .'"
   }
 }