From 5c178f99ae2d9321145c21f9886fcfe0824d73f6 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:19:40 +0200
Subject: [PATCH 01/13] feat: add fetchInstanceStats and sendVerificationEmail
 to api composable

---
 composables/api.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/composables/api.ts b/composables/api.ts
index 603f71f..d2ca7a0 100644
--- a/composables/api.ts
+++ b/composables/api.ts
@@ -1,4 +1,4 @@
-import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse } from "~/types/interfaces";
+import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse, StatsResponse } from "~/types/interfaces";
 
 export const useApi = () => {
 	async function fetchGuilds(): Promise<GuildResponse[] | undefined> {
@@ -41,6 +41,15 @@ export const useApi = () => {
 		return await fetchWithApi(`/channels/${channelId}/messages/${messageId}`);
 	}
 
+	async function fetchInstanceStats(apiBase: string): Promise<StatsResponse> {
+		return await $fetch(`${apiBase}/stats`, { method: "GET" });
+	}
+
+	async function sendVerificationEmail(): Promise<void> {
+		const email = useAuth().user.value?.email;
+		await fetchWithApi("/auth/verify-email", { method: "POST", body: { email } });
+	}
+
 	return {
 		fetchGuilds,
 		fetchGuild,
@@ -51,6 +60,8 @@ export const useApi = () => {
 		fetchUsers,
 		fetchUser,
 		fetchMessages,
-		fetchMessage
+		fetchMessage,
+		fetchInstanceStats,
+		sendVerificationEmail
 	}
 }

From 04689e57ea34e936170049f3a76f7adb551c1bad Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:21:16 +0200
Subject: [PATCH 02/13] feat: remove old logout and other auth functions from
 login/register page

---
 layouts/auth.vue | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/layouts/auth.vue b/layouts/auth.vue
index b7d5c5e..dc65e96 100644
--- a/layouts/auth.vue
+++ b/layouts/auth.vue
@@ -20,30 +20,7 @@
 				<slot />
 			</div>
 			<div v-if="instanceUrl">
-				Instance URL is set to {{ instanceUrl }}
-			</div>
-			<div v-if="auth.accessToken.value">
-				You're logged in!
-				<form @submit="logout">
-					<div>
-						<label for="logout-password">Password</label>
-						<br>
-						<input type="password" name="logout-password" id="logout-password" v-model="form.password"
-							required>
-					</div>
-					<div>
-						<button type="submit">Log out</button>
-					</div>
-				</form>
-				<div>
-					<button @click="refresh">Refresh</button>
-				</div>
-				<div>
-					<button @click="showUser">Show user</button>
-				</div>
-				<div>
-					<button @click="getUser">Get me</button>
-				</div>
+				Instance URL is set to <span style="color: var(--primary-color);">{{ instanceUrl }}</span>
 			</div>
 		</div>
 	</div>

From 397e94798f4a0d398040c9612aa1b6e3c501ebe7 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:21:49 +0200
Subject: [PATCH 03/13] feat: remove unused type import

---
 layouts/auth.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/layouts/auth.vue b/layouts/auth.vue
index dc65e96..d58a97f 100644
--- a/layouts/auth.vue
+++ b/layouts/auth.vue
@@ -28,7 +28,6 @@
 
 <script lang="ts" setup>
 import { FetchError } from 'ofetch';
-import type { StatsResponse } from '~/types/interfaces';
 
 const instanceUrl = ref<string | null | undefined>(null);
 const instanceUrlInput = ref<string>();

From 6154bb89d069881215cecf4aac4c26ab5dd15a9e Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:23:51 +0200
Subject: [PATCH 04/13] feat: change some console.log calls

---
 layouts/auth.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/layouts/auth.vue b/layouts/auth.vue
index d58a97f..bc15be6 100644
--- a/layouts/auth.vue
+++ b/layouts/auth.vue
@@ -39,9 +39,7 @@ const registrationEnabled = useState("registrationEnabled", () => true);
 const auth = useAuth();
 
 onMounted(async () => {
-	const cookie = useCookie("instance_url").value;
-	instanceUrl.value = cookie;
-	console.log(cookie);
+	instanceUrl.value = useCookie("instance_url").value;
 	console.log("set instance url to:", instanceUrl.value);
 });
 
@@ -49,8 +47,8 @@ async function selectInstance(e: Event) {
 	e.preventDefault();
 	console.log("trying input instance");
 	if (instanceUrlInput.value) {
-		console.log("input has value");
 		const gorbTxtUrl = new URL(`/.well-known/gorb.txt`, instanceUrlInput.value);
+		console.log("input has value");
 		try {
 			console.log("trying to get gorb.txt:", gorbTxtUrl);
 			const res = await $fetch.raw(gorbTxtUrl.href, { responseType: "text" });

From 9e5d48931d2e6251ee1c482c21d8f471d0e63f9d Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:25:10 +0200
Subject: [PATCH 05/13] feat: switch to use fetcvhInstanceStats from api
 composable in auth.vue

---
 layouts/auth.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/layouts/auth.vue b/layouts/auth.vue
index bc15be6..28943ea 100644
--- a/layouts/auth.vue
+++ b/layouts/auth.vue
@@ -61,10 +61,10 @@ async function selectInstance(e: Event) {
 				instanceUrl.value = origin;
 				useCookie("instance_url").value = origin;
 				console.log("set instance url to:", origin);
-				const { status, data, error } = await useFetch<StatsResponse>(`${apiBase.value}/stats`);
-				if (status.value == "success" && data.value) {
-					registrationEnabled.value = data.value.registration_enabled;
-					console.log("set registration enabled value to:", data.value.registration_enabled);
+				const stats = await useApi().fetchInstanceStats(apiBase.value);
+				if (stats) {
+					registrationEnabled.value = stats.registration_enabled;
+					console.log("set registration enabled value to:", stats.registration_enabled);
 				}
 				return;
 			}

From 9aec279d05b05d397b14c1ee4ef3f1421cd90251 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:25:39 +0200
Subject: [PATCH 06/13] feat: refresh page when auth tokens are cleared

---
 composables/auth.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composables/auth.ts b/composables/auth.ts
index 0ac2e8b..e520c9c 100644
--- a/composables/auth.ts
+++ b/composables/auth.ts
@@ -7,6 +7,7 @@ export const useAuth = () => {
   async function clearAuth() {
     accessToken.value = null;
     user.value = null;
+	await navigateTo("/login");
   }
 
   async function register(username: string, email: string, password: string) {

From e95e81112b9fd2bd428de89d6e4bce8209fd0444 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:25:57 +0200
Subject: [PATCH 07/13] feat: improve looks of auth page

---
 layouts/auth.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/layouts/auth.vue b/layouts/auth.vue
index 28943ea..0c4ad41 100644
--- a/layouts/auth.vue
+++ b/layouts/auth.vue
@@ -122,18 +122,22 @@ async function showUser(e: Event) {
 	align-items: center;
 }
 
-#auth-form-container,
-#auth-form-container form {
+#auth-form-container {
 	display: flex;
-	width: 50dvw;
+	width: 20dvw;
 	flex-direction: column;
 	align-items: center;
+	text-align: center;
 	gap: 1em;
+	margin-bottom: 2dvh;
 }
 
 #auth-form-container form {
+	display: flex;
+	flex-direction: column;
 	text-align: left;
 	margin-top: 10dvh;
+	gap: 1em;
 }
 
 #instance-error-container {

From dd630955260df73f7c79f5e1b63147e587870cbc Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:27:16 +0200
Subject: [PATCH 08/13] feat: add check for email verification requirement and
 redirect if needed in auth middleware

---
 middleware/auth.global.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index 2a9b752..421c156 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -2,7 +2,21 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
 	console.log("to.fullPath:", to.fullPath);
 	const loading = useState("loading");
 	const accessToken = useCookie("access_token").value;
-	if (["/login", "/register"].includes(to.path)) {
+	const apiBase = useCookie("api_base").value;
+	const { fetchInstanceStats } = useApi();
+	
+	console.log("[AUTH] instance url:", apiBase);
+	if (apiBase && !Object.keys(to.query).includes("special") && to.path != "/verify-email") {
+		const user = await useAuth().getUser();
+		const stats = await fetchInstanceStats(apiBase);
+		console.log("[AUTH] stats:", stats);
+		console.log("[AUTH] email verification check:", user?.email && !user.email_verified && stats.email_verification_required);
+		if (user?.email && !user.email_verified && stats.email_verification_required) {
+			return await navigateTo("/register?special=verify_email");
+		}
+	}
+
+	if (["/login", "/register"].includes(to.path) && !Object.keys(to.query).includes("special")) {
 		console.log("path is login or register");
 		const apiBase = useCookie("api_base");
 		console.log("apiBase gotten:", apiBase.value);

From 9f66643b99aa8082195caf47e7f8b509e38fc93a Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:27:44 +0200
Subject: [PATCH 09/13] feat: add attempting to set instance URL from auth
 middleware

---
 middleware/auth.global.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index 421c156..c0da664 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -33,6 +33,14 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
 				if (parsed.ApiBaseUrl) {
 					apiBase.value = `${parsed.ApiBaseUrl}/v${apiVersion}`;
 					console.log("set apiBase to:", parsed.ApiBaseUrl);
+					console.log("hHEYOO");
+					const instanceUrl = useCookie("instance_url");
+					console.log("hHEYOO 2");
+					console.log("instance url:", instanceUrl.value);
+					if (!instanceUrl.value) {
+						instanceUrl.value = `${requestUrl.protocol}//${requestUrl.host}`;
+						console.log("set instance url to:", instanceUrl.value);
+					}
 				}
 			}
 		}

From 2863651f7031d686decac8262cddca018ffdf788 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:28:18 +0200
Subject: [PATCH 10/13] feat: switch to use fetcvhInstanceStats from api in
 login page to check for whether registration is enabled

---
 pages/login.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pages/login.vue b/pages/login.vue
index c7f4cbc..03078c3 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -44,10 +44,9 @@ const apiBase = useCookie("api_base");
 
 if (apiBase.value) {
 	console.log("apiBase:", apiBase.value);
-	const statsUrl = new URL("/stats", apiBase.value).href;
-	const { status, data } = await useFetch<StatsResponse>(statsUrl);
-	if (status.value == "success" && data.value) {
-		registrationEnabled.value = data.value.registration_enabled;
+	const stats = await useApi().fetchInstanceStats(apiBase.value);
+	if (stats) {
+		registrationEnabled.value = stats.registration_enabled;
 	}
 }
 

From 2c670ebc6a973267949e93b69ddc109b028426ea Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:29:03 +0200
Subject: [PATCH 11/13] feat: add email verification handling in register page

---
 pages/register.vue | 86 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 74 insertions(+), 12 deletions(-)

diff --git a/pages/register.vue b/pages/register.vue
index 3e2c4c4..708fed0 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -1,6 +1,6 @@
 <template>
   <NuxtLayout>
-    <form v-if="registrationEnabled" @submit="register">
+    <form v-if="registrationEnabled && !registrationSubmitted && !showEmailVerificationScreen" @submit="register">
       <div>
         <!--
         <span class="form-error" v-if="errors.username.length > 0">
@@ -32,32 +32,87 @@
         <button type="submit">Register</button>
       </div>
     </form>
+	<div v-else-if="registrationEnabled && (registrationSubmitted || showEmailVerificationScreen) && !emailSent">
+		<p v-if="emailVerificationRequired">
+			This instance requires email verification to use it.
+			<br><br>
+			<span v-if="registrationSubmitted">
+				Please open the link sent to your email.
+			</span>
+			<span v-else-if="showEmailVerificationScreen">
+				Please click on the link you've already received, or click on the button below to receive a new email.
+			</span>
+		</p>
+		<p v-else>
+			Would you like to verify your email?
+			<!--
+			<br>
+			This is required for resetting your password and making other important changes.
+			-->
+		</p>
+		<Button v-if="(!emailVerificationRequired || showEmailVerificationScreen) && !emailSent" text="Send email" variant="neutral" :callback="sendEmail"></Button>
+	</div>
+	<div v-else-if="emailSent">
+		<p>
+			An email has been sent and should arrive soon.
+			<br>
+			If you don't see it in your inbox, try checking the spam folder.
+		</p>
+	</div>
     <div v-else>
       <h3>This instance has disabled registration.</h3>
     </div>
-    <div>
-      Already have an account? <NuxtLink :href="loginUrl">Log in</NuxtLink>!
+    <div v-if="loggedIn">
+	  <Button text="Log out" variant="scary" :callback="() => {}"></Button>
+	</div>
+    <div v-else>
+	  Already have an account? <NuxtLink :href="loginUrl">Log in</NuxtLink>!
     </div>
   </NuxtLayout>
 </template>
 
 <script lang="ts" setup>
-import type { StatsResponse } from '~/types/interfaces';
 definePageMeta({
   layout: "auth"
-})
+});
 
 const registrationEnabled = useState("registrationEnabled", () => true);
+const emailVerificationRequired = useState("emailVerificationRequired", () => false);
+const registrationSubmitted = ref(false);
+const emailSent = ref(false);
+
+const auth = useAuth();
+
+const loggedIn = ref(await auth.getUser());
+
+const query = new URLSearchParams(useRoute().query as Record<string, string>);
+
+const user = await useAuth().getUser();
+
+if (user?.email_verified) {
+	if (query.get("redirect_to")) {
+		await navigateTo(query.get("redirect_to"));
+	} else {
+		await navigateTo("/");
+	}
+}
+
+const showEmailVerificationScreen = query.get("special") == "verify_email";
+console.log("show email verification screen?", showEmailVerificationScreen);
+
+const { fetchInstanceStats, sendVerificationEmail } = useApi();
 
 console.log("wah");
 console.log("weoooo")
 const apiBase = useCookie("api_base");
 console.log("apiBase:", apiBase.value);
 if (apiBase.value) {
-	const { status, data, error } = await useFetch<StatsResponse>(`${apiBase.value}/stats`);
-	if (status.value == "success" && data.value) {
-		registrationEnabled.value = data.value.registration_enabled;
-		console.log("set registration enabled value to:", data.value.registration_enabled);
+	const stats = await fetchInstanceStats(apiBase.value);
+	if (stats) {
+		registrationEnabled.value = stats.registration_enabled;
+		console.log("set registration enabled value to:", stats.registration_enabled);
+		emailVerificationRequired.value = stats.email_verification_required;
+		console.log("set email verification required value to:", stats.email_verification_required);
 	}
 }
 
@@ -90,8 +145,6 @@ const errorMessages = reactive({
 */
 
 //const authStore = useAuthStore();
-const auth = useAuth();
-const query = useRoute().query as Record<string, string>;
 const searchParams = new URLSearchParams(query);
 const loginUrl = `/login?${searchParams}`
 
@@ -133,13 +186,22 @@ async function register(e: Event) {
   console.log("Sending registration data");
   try {
     await auth.register(form.username, form.email, form.password);
-    return await navigateTo(query.redirect_to);
+	if (!emailVerificationRequired.value) {
+		return await navigateTo(query.get("redirect_to"));
+	}
+	await sendVerificationEmail();
+	registrationSubmitted.value = true;
   } catch (error) {
     console.error("Error registering:", error);
   }
   //return navigateTo(redirectTo ? redirectTo as string : useAppConfig().baseURL as string);
 }
 
+async function sendEmail() {
+	await sendVerificationEmail();
+	emailSent.value = true;
+}
+
 </script>
 
 <style></style>
\ No newline at end of file

From 84aa1f95fe555a60ff0f23cb8e4e320afaf3e090 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:30:06 +0200
Subject: [PATCH 12/13] feat: add auto redirection in verify-email page

---
 pages/verify-email.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pages/verify-email.vue b/pages/verify-email.vue
index cae02ea..f160a1d 100644
--- a/pages/verify-email.vue
+++ b/pages/verify-email.vue
@@ -15,6 +15,12 @@ const token = useRoute().query.token;
 try {
 	const res = await fetchWithApi("/auth/verify-email", { query: { token } });
 	console.log("hi");
+	const query = useRoute().query;
+	if (query.redirect_to) {
+		await navigateTo(`/?redirect_to=${query.redirect_to}`);
+	} else {
+		await navigateTo("/");
+	}
 } catch (error) {
 	console.error("Error verifying email:", error);
 	errorMessage.value = error;

From 4b6dc03b136e3d19662f1f87eb09753c655d5c27 Mon Sep 17 00:00:00 2001
From: SauceyRed <saucey@saucey.red>
Date: Wed, 9 Jul 2025 07:30:46 +0200
Subject: [PATCH 13/13] feat: refresh page when email is changed and instance
 requires verification

---
 components/Settings/UserSettings/Account.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/Settings/UserSettings/Account.vue b/components/Settings/UserSettings/Account.vue
index 85589e7..a08cffc 100644
--- a/components/Settings/UserSettings/Account.vue
+++ b/components/Settings/UserSettings/Account.vue
@@ -43,6 +43,14 @@ async function changeEmail() {
       body: formData
     })
 
+	const apiBase = useCookie("api_base").value;
+
+	if (apiBase) {
+		const stats = await useApi().fetchInstanceStats(apiBase);
+		if (stats.email_verification_required) {
+			return window.location.reload();
+		}
+	}
     alert('success!!')
   } catch (error: any) {
     if (error?.response?.status !== 200) {