@sowell/quasar-app-extension-auth 1.10.0 → 1.11.0

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@sowell/quasar-app-extension-auth",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "A Quasar app extension to manage Authentication",
   "main": "src/index.js",
   "repository": "https://github.com/sowell-ai/quasar.extension.auth",
   "scripts": {
-    "lint": "cd dev && eslint --ext .js,.ts,.vue ./",
+    "lint": "eslint --ext .js,.ts,.vue ./",
     "dev": "cd dev && quasar dev",
     "dep": "cd dev && yarn",
     "test:link": "cd dev && yarn test:link",
     "test:browser": "cd dev && yarn test:browser",
-    "test": "cd dev && yarn test"
+    "test": "vitest run"
   },
   "keywords": [],
   "author": "SoWell SAS",
@@ -34,7 +34,10 @@
     "eslint-plugin-vue": "^7.0.0",
     "jwt-decode": "^3.1.2",
     "quasar": "^2.8.4",
-    "typescript": "^4.4.2"
+    "typescript": "^4.4.2",
+    "vitest": "^4.1.11",
+    "vue": "^3.2.0",
+    "vue-i18n": "^9"
   },
   "directories": {
     "test": "test"

package/src/components/pages/AuthReporter.vue

@@ -90,9 +90,7 @@
                   type="submit"
                   class="full-width q-mt-lg login-button"
                   :disable="isSubmitBtnDisabled()">
-                  <div style="font-weight: 500; font-size: 18px">
-                    {{ $t("auth.login") }}
-                  </div>
+                  {{ $t("auth.login") }}
                 </q-btn>
               </div>
               <template v-if="USE_SSO">
@@ -415,9 +413,12 @@ export default defineComponent({
   padding-bottom: 0;
 }
 
-.login-button {
+.login-button,
+.sso-btn {
   border-radius: 15px;
-  height: 50px;
+  height: 62px;
+  font-size: 17px;
+  font-weight: 600;
 }
 
 .forgot-password-link {
@@ -458,19 +459,15 @@ export default defineComponent({
 }
 
 .btn-icon {
-  width: 16px;
-  height: 16px;
+  width: 18px;
+  height: 18px;
   margin-right: 8px;
 }
 
 .sso-btn {
-  font-size: 14px;
-  border-radius: 8px;
-  height: 50px;
-  font-weight: 600;
   background: #ebeeef;
   color: #112240;
-  }
+}
 
 .error_input {
   min-height: 50px;
@@ -558,11 +555,8 @@ export default defineComponent({
   }
 
   .login-button, .sso-btn {
-    height: 40px;
-  }
-
-  .login-button div {
-    font-size: 14px !important;
+    height: 52px;
+    font-size: 15px;
   }
 
   .error_input {

package/src/composables/useMagicLink.ts

@@ -124,6 +124,9 @@ export function useMagicLink() {
   }
 
   const requestChannels = async () => {
+    // Quasar's `loading` does not disable the button: Enter would resubmit and send
+    // a second e-mail, invalidating the first link (the API replaces the token).
+    if (isLoading.value) return
     apiErrorMessage.value = ""
     if (!validateEmail()) return
     isLoading.value = true
@@ -138,14 +141,21 @@ export function useMagicLink() {
       channels.value = offered.length ? offered : ["email"]
       channelTargets.value = targets
       selectedChannel.value = "email"
+      // Nothing to choose when only e-mail is offered (user without phone, or an
+      // app restricted to e-mail): send the link straight away.
+      if (channels.value.length === 1 && channels.value[0] === "email") {
+        await sendMagicLink("email")
+        return
+      }
       step.value = "channel"
     } catch (error) {
       const axiosError = error as AxiosError
       if (axiosError.response?.status === 403) {
-        // Backend check: ENV["COMPANY_RESET_PASSWORD_FORBIDDEN"] vs user.company_id,
-        // rescued as Rescueable::Forbidden with i18n key errors.magiclink.forbidden.
-        // No pre-flight signal exists (no Company.config field, nothing on /me) - the
-        // front can only ever find out by attempting the call, hence no button hiding.
+        // Backend check: the user's company (or its master/slaves) has
+        // `no_password_reset` set, rescued as Rescueable::Forbidden with i18n key
+        // errors.magiclink.forbidden. No pre-flight signal exists on the front, so
+        // it only finds out by attempting the call, hence no button hiding. The
+        // same 403 can come from the automatic send in requestChannels.
         restricted.value = true
         restrictedMessage.value = readApiError(error) || ""
       } else if (axiosError.response?.status === 404) {