fix security page not properly prompting privileged session, closes #…

…1292
HangarMC · Dec 9, 2023 · a65cd19 · a65cd19
1 parent 767628a
commit a65cd19
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/frontend/src/composables/useValidationHelpers.ts b/frontend/src/composables/useValidationHelpers.ts
@@ -1,6 +1,6 @@
 import { type ErrorObject, useVuelidate, type ValidationRule } from "@vuelidate/core";
 import { computed } from "vue";
-import type { ComputedRef, type Ref } from "vue";
+import type { ComputedRef, Ref } from "vue";
 import * as validators from "@vuelidate/validators";
 import { createI18nMessage, helpers, type ValidatorWrapper } from "@vuelidate/validators";
 import { difference, isEmpty, uniq } from "lodash-es";
@@ -108,7 +108,13 @@ export const validPageName = withOverrideMessage((body: ComputedRef<{ projectId:
         await useInternalApi("pages/checkName", "get", body.value);
         return { $valid: true };
       } catch (e: AxiosError | any) {
-        return e?.response?.data?.detail ? { $valid: false, $message: e.response.data.detail } : { $valid: false };
+        if (e?.response?.data?.detail) {
+          return { $valid: false, $message: e.response.data.detail };
+        } else if (e?.response?.data?.message) {
+          return { $valid: false, $message: e.response.data.message };
+        } else {
+          return { $valid: false };
+        }
       }
     }, body)
   )

diff --git a/frontend/src/pages/auth/settings/security.vue b/frontend/src/pages/auth/settings/security.vue
@@ -53,7 +53,7 @@ async function addAuthenticator() {
       codes.value = e.response.data.body;
       backupCodeModal.value.isOpen = true;
       savedRequest.value = e.config;
-    } else if (e.response?.data?.detail === "error.privileged") {
+    } else if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else if (e?.toString()?.startsWith("NotAllowedError")) {
       notification.error("Security Key Authentication failed!");
@@ -70,7 +70,7 @@ async function unregisterAuthenticator(authenticator: AuthSettings["authenticato
     await useInternalApi("auth/webauthn/unregister", "POST", authenticator.id, { headers: { "content-type": "text/plain" } });
     emit("refreshSettings");
   } catch (e) {
-    if (e.response?.data?.detail === "error.privileged") {
+    if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else if (e?.toString()?.startsWith("NotAllowedError")) {
       notification.error("Security Key Authentication failed!");
@@ -88,7 +88,7 @@ async function setupTotp() {
   try {
     totpData.value = await useInternalApi<{ secret: string; qrCode: string }>("auth/totp/setup", "POST");
   } catch (e) {
-    if (e.response?.data?.detail === "error.privileged") {
+    if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else {
       notification.fromError(i18n, e);
@@ -111,7 +111,7 @@ async function addTotp() {
       backupCodeModal.value.isOpen = true;
       savedRequest.value = e.config;
       otp.value = e.response.headers["x-hangar-verify"];
-    } else if (e.response?.data?.detail === "error.privileged") {
+    } else if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else {
       notification.fromError(i18n, e);
@@ -126,7 +126,7 @@ async function unlinkTotp() {
     await useInternalApi("auth/totp/remove", "POST");
     emit("refreshSettings");
   } catch (e) {
-    if (e.response?.data?.detail === "error.privileged") {
+    if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else {
       notification.fromError(i18n, e);
@@ -184,7 +184,7 @@ async function revealCodes() {
     }
     showCodes.value = true;
   } catch (e) {
-    if (e.response?.data?.detail === "error.privileged") {
+    if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else {
       notification.fromError(i18n, e);
@@ -200,7 +200,7 @@ async function generateNewCodes() {
     notification.success("Regenerated backup codes!");
     emit("refreshSettings");
   } catch (e) {
-    if (e.response?.data?.detail === "error.privileged") {
+    if (e.response?.data?.message === "error.privileged") {
       await router.push(useAuth.loginUrl(route.path) + "&privileged=true");
     } else {
       notification.fromError(i18n, e);