From 5e8a899208d3b7e9f35aedf94f2eed5178a98dad Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Tue, 11 Aug 2026 20:32:21 +0200
Subject: [PATCH] feat: implement error handling to login/register

---
 src/pages/account/login/index.vue    |  9 ++-------
 src/pages/account/register/index.vue | 29 +++++++++++++++-------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 435153c..3c3895f 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { FetchError } from 'ofetch';
-
 const route = useRoute();
 const auth = useAuthStore();
 const redirect = computed(() => route.query.redirect);
@@ -29,11 +27,8 @@ async function loginSubmission() {
 			await navigateTo('/account');
 		}
 	} catch (error: unknown) {
-		if (error instanceof FetchError) {
-			errorMessage.value = error.message;
-		} else {
-			errorMessage.value = `Error during login: ${error}`; // TODO: localize
-		}
+		const err = getApiError(error);
+		errorMessage.value = err.code;
 
 		setTimeout(() => { // TODO: replace this toast
 			errorMessage.value = null;
diff --git a/src/pages/account/register/index.vue b/src/pages/account/register/index.vue
index 5087321..198ea61 100644
--- a/src/pages/account/register/index.vue
+++ b/src/pages/account/register/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import VueHcaptcha from '@hcaptcha/vue3-hcaptcha';
-import { FetchError } from 'ofetch';
+import type { ApiAuthRegisterRequest } from '~~/shared/api-types';
 
 const route = useRoute();
 const redirect = computed(() => route.query.redirect);
@@ -15,9 +15,15 @@ async function registerSubmission() {
 	try {
 		const hCaptchaResponse = invisibleHcaptcha.value ? (await invisibleHcaptcha.value.executeAsync()).response : null;
 
-		await $fetch('/api/account/register', {
+		await $fetch('/api/auth/register', {
 			method: 'POST',
-			body: { ...registerForm, hCaptchaResponse }
+			body: {
+				email: registerForm.email,
+				miiName: registerForm.mii_name,
+				password: registerForm.password,
+				username: registerForm.username,
+				captchaResponse: hCaptchaResponse ?? undefined
+			} satisfies ApiAuthRegisterRequest
 		});
 
 		if (typeof redirect.value === 'string') {
@@ -26,16 +32,13 @@ async function registerSubmission() {
 			await navigateTo('/account');
 		}
 	} catch (error: unknown) {
-		if (error instanceof FetchError) {
-			errorMessage.value = error.message;
-		} else {
-			if (error === 'challenge-closed') { // Thrown if the captcha is closed, can be safely ignored
-				return;
-			}
-
-			errorMessage.value = `Error during registration: ${error}`; // TODO: localize
+		if (error === 'challenge-closed') {
+			// Thrown if the captcha is closed, can be safely ignored
+			return;
 		}
 
+		const err = getApiError(error);
+		errorMessage.value = err.code;
 		setTimeout(() => { // TODO: replace this toast
 			errorMessage.value = null;
 		}, 5000);
@@ -119,9 +122,9 @@ async function registerSubmission() {
       </form>
     </div>
     <vue-hcaptcha
-      v-if="$config.public.hCaptchaSitekey"
+      v-if="$config.public.hcaptchaSiteKey"
       ref="invisibleHcaptcha"
-      :sitekey="$config.public.hCaptchaSitekey"
+      :sitekey="$config.public.hcaptchaSiteKey"
       class="h-captcha"
       size="invisible"
     />