@sowell/quasar-app-extension-auth 0.4.4 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sowell/quasar-app-extension-auth",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A Quasar app extension to manage Authentication",
   "main": "src/index.js",
   "repository": "https://github.com/sowell-ai/quasar.extension.auth",

package/src/boot/router-guards.ts

@@ -22,7 +22,9 @@ export default boot(({ app, router }: BootInterface) => {
       (!isValid || !token) &&
       to.path !== LOCAL_LOGIN_ROUTE &&
       to.name !== "update_password" &&
-      to.name !== "otp_validation"
+      to.name !== "otp_validation" &&
+      // NOTE: msal hash token
+      !to.fullPath.includes("code=")
     ) {
       next(LOCAL_LOGIN_ROUTE);
     } else {

package/src/components/pages/WebAuth.vue

@@ -148,10 +148,10 @@
           :title="infoDialog.title"
           :content="infoDialog.content"
           :image="infoDialog.image"
-          :isOtp="true"
+          :isOtp="isOtp"
         >
           <q-btn
-            v-if="requestedOtp"
+            v-if="isOtp"
             class="bg-white submitBtn"
             unelevated
             outline
@@ -217,13 +217,13 @@ export default defineComponent({
       X_REQUESTED_ROLES
     );
     const isNotification = ref(false);
-    const requestedOtp = ref(false);
     const infoDialog = ref({
       title: "",
       content: "",
       image: "",
     });
 
+    const isOtp = computed(() => IS_OTP.toLowerCase() === "y");
     const submitBtnDisabled = computed(
       () =>
         !(
@@ -254,16 +254,15 @@ export default defineComponent({
             };
             forgottenPassword.value = false;
             isNotification.value = true;
-            requestedOtp.value = true;
           });
         } catch {
-          requestedOtp.value = false;
+          isNotification.value = false;
+
           infoDialog.value = {
             title: t("auth.userNotFoundTitle"),
             content: t("auth.userNotFoundSubtitle"),
             image: "userNotFound",
           };
-          isNotification.value = true;
         }
       }
     };
@@ -288,7 +287,6 @@ export default defineComponent({
       WELCOME_SUBTITLE,
       WELCOME_TITLE,
       isSubmitBtnDisabled,
-      requestedOtp,
       goToOtpValidation,
       retypeEmail,
       onSubmit,
@@ -296,6 +294,7 @@ export default defineComponent({
       USE_SSO,
       MicrosoftLogo,
       msalAuth,
+      isOtp,
       resetPassword,
       handleSubmit,
     };

package/src/composables/resetPassword.ts

@@ -26,7 +26,7 @@ export function useResetPassword() {
   const loading = ref(false);
   const passwordUpdated = ref(false);
   const showPassword = ref(false);
-  const token = ref("");
+  const tempToken = ref("");
   const userInfos = JSON.parse(localStorage.getItem("userInfos") || "{}");
 
   const { patch, post } = $api();
@@ -40,11 +40,12 @@ export function useResetPassword() {
   const $route = router.currentRoute.value;
 
   const decodedToken = computed(() => {
-    if (!token.value) return null;
-    return jwt(token.value) as DecodedToken;
+    if (!tempToken.value) return null;
+    return jwt(tempToken.value) as DecodedToken;
   }) as Ref<DecodedToken | null>;
 
   const isOtp = computed(() => IS_OTP.toLowerCase() === "y");
+
   const canSubmit = computed(() => {
     return (
       (decodedToken.value !== null || userInfos?.uid) &&
@@ -93,8 +94,10 @@ export function useResetPassword() {
   };
 
   const onSubmit = () => {
-    let idUser =
-      isOtp && userInfos?.uid ? userInfos?.uid : decodedToken?.value?.sub;
+    let idUser = decodedToken?.value?.sub;
+    if (isOtp.value && userInfos?.uid) {
+      idUser = userInfos?.uid;
+    }
     const updatePasswordPayload = {
       data: {
         type: "users",
@@ -104,9 +107,15 @@ export function useResetPassword() {
         },
       },
     };
+
+    let authorization = `Bearer ${tempToken.value}`;
+    if (isOtp.value) {
+      authorization = `Bearer ${userInfos?.token}`;
+    }
+
     const updatePasswordHeaders = {
       headers: {
-        Authorization: `Bearer ${isOtp ? userInfos?.token : token.value}`,
+        Authorization: authorization,
       },
     };
     loading.value = true;
@@ -144,7 +153,7 @@ export function useResetPassword() {
   };
 
   onMounted(() => {
-    if (IS_OTP.toLowerCase() === "n") {
+    if (!isOtp.value) {
       let key = $route.query.key as string;
       const { decoded, email, tmpToken } = decodeKey(key);
 
@@ -172,8 +181,8 @@ export function useResetPassword() {
 
       post(AUTH_SERVER_SIGNING_ROUTE, tmpAuthPayload)
         .then((response) => {
-          token.value = response.data.jwt;
-          if (!token.value) throw "Error reading the temporary token";
+          tempToken.value = response.data.jwt;
+          if (!tempToken.value) throw "Error reading the temporary token";
         })
         .catch((error) => {
           if (error.response) {