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

package/package.json

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

package/src/components/pages/AdminAuth.vue

@@ -9,7 +9,7 @@
           <div class="q-pl-md q-pr-md" style="max-width: 500px">
             <h4 class="title">{{ WELCOME_TITLE }}</h4>
             <div class="subtitle">{{ WELCOME_SUBTITLE }}</div>
-            <q-form @submit="onSubmit">
+            <q-form @submit="handleSubmit">
               <div>
                 <div class="q-ml-xs q-mb-xs text-subtitle2 text-weight-bold">
                   {{ $t("auth.email") }}
@@ -160,6 +160,10 @@ export default defineComponent({
       icons,
     } = useAuth();
 
+    const handleSubmit = () => {
+      onSubmit()
+    }
+
     const IS_ADMIN = ["admin"].includes(X_REQUESTED_ROLES);
     const isNotification = ref(false);
     const requestedOtp = ref(false);
@@ -232,7 +236,7 @@ export default defineComponent({
       goToOtpValidation,
       resetPassword,
       retypeEmail,
-      onSubmit,
+      handleSubmit,
       icons,
     };
   },

package/src/components/pages/Auth.vue

@@ -92,7 +92,7 @@
             :loading="loading"
             type="submit"
             class="full-width q-mt-lg"
-            :disable="isSubmitBtnDisabled()"
+            :disable="isSubmitBtnDisabled() || loading || msalLoading"
           />
           <div
             class="q-mb-lg q-mt-xl text-primary"
@@ -125,7 +125,8 @@
               no-caps
               unelevated
               text-color="black"
-              :loading="loading"
+              :loading="msalLoading"
+              :disable="msalLoading || loading"
               :icon="`img:${MicrosoftLogo}`"
               class="full-width q-mt-lg"
               @click="msalAuth"
@@ -183,6 +184,7 @@ export default defineComponent({
       email,
       password,
       loading,
+      msalLoading,
       showPassword,
       validations,
       forgottenPassword,
@@ -233,6 +235,7 @@ export default defineComponent({
       email,
       password,
       loading,
+      msalLoading,
       showPassword,
       validations,
       forgottenPassword,

package/src/components/pages/AuthReporter.vue

@@ -17,7 +17,7 @@
           </div>
         </div>
         <div class="">
-          <q-form @submit="onSubmit">
+          <q-form @submit="handleSubmit">
             <div>
               <div
                 class="q-ml-xs q-mb-xs"
@@ -187,6 +187,10 @@ export default defineComponent({
       icons,
     } = useAuth();
 
+    const handleSubmit = () => {
+      onSubmit()
+    }
+
     const appVersion = reactive({
       versionNumber: "",
     });
@@ -229,7 +233,7 @@ export default defineComponent({
       emailResetPassword,
       isReset,
       sendEmailSuccess,
-      onSubmit,
+      handleSubmit,
       resetPassword,
       goToOtpValidation,
       isSubmitBtnDisabled,

package/src/components/pages/WebAuth.vue

@@ -17,7 +17,8 @@
                 no-caps
                 unelevated
                 text-color="black"
-                :loading="loading"
+                :loading="msalLoading"
+                :disable="msalLoading || loading"
                 :icon="`img:${MicrosoftLogo}`"
                 class="full-width q-mt-lg"
                 @click="msalAuth"
@@ -99,7 +100,7 @@
                   text-color="white"
                   :loading="loading"
                   type="submit"
-                  :disable="isSubmitBtnDisabled()"
+                  :disable="isSubmitBtnDisabled() || loading || msalLoading"
                   class="submitBtn text-subtitle2 text-weight-bold"
                 />
                 <div
@@ -193,6 +194,7 @@ export default defineComponent({
       email,
       password,
       loading,
+      msalLoading,
       showPassword,
       validations,
       forgottenPassword,
@@ -275,6 +277,7 @@ export default defineComponent({
       infoDialog,
       password,
       loading,
+      msalLoading,
       showPassword,
       validations,
       submitBtnDisabled,
@@ -287,14 +290,14 @@ export default defineComponent({
       isSubmitBtnDisabled,
       requestedOtp,
       goToOtpValidation,
-      resetPassword,
       retypeEmail,
       onSubmit,
       icons,
       USE_SSO,
       MicrosoftLogo,
-      handleSubmit,
       msalAuth,
+      resetPassword,
+      handleSubmit,
     };
   },
 });

package/src/composables/auth.ts

@@ -54,6 +54,7 @@ export function useAuth() {
   const password = ref("");
   const msalToken = ref("");
   const loading = ref(false);
+  const msalLoading = ref(false);
   const showPassword = ref(false);
   const forgottenPassword = ref(false);
   const isReset = ref(false);
@@ -101,7 +102,9 @@ export function useAuth() {
   };
 
   const onSubmit = async (provider = "SoWell") => {
-    loading.value = true;
+    if (provider === "SoWell") {
+      loading.value = true;
+    }
     const data: SignInPayload = {
       auth: {
         email: email.value,
@@ -133,6 +136,7 @@ export function useAuth() {
     try {
       await authState.signin(data, options);
       loading.value = false;
+      msalLoading.value = false;
       // @ts-ignore
       if (!window.Cypress) {
         // FIXME: encrypt password
@@ -145,6 +149,7 @@ export function useAuth() {
     } catch (err) {
       console.error("onSubmit", err);
       loading.value = false;
+      msalLoading.value = false;
     }
   };
 
@@ -171,6 +176,7 @@ export function useAuth() {
   };
 
   const msalAuth = () => {
+    msalLoading.value = true;
     msalState.signIn().then(
       async (result) => {
         email.value = result.email;
@@ -195,6 +201,7 @@ export function useAuth() {
     email,
     password,
     loading,
+    msalLoading,
     showPassword,
     validations,
     errorEmailMessage,
@@ -211,6 +218,8 @@ export function useAuth() {
     IS_OTP,
     LOCAL_OTP_ROUTE,
     USE_SSO,
+    msalState,
+    msalAuth,
     goToOtpValidation,
     onSubmit,
     retypeEmail,
@@ -223,7 +232,5 @@ export function useAuth() {
       ionEyeSharp,
       ionEyeOffSharp,
     },
-    msalState,
-    msalAuth,
   };
 }