@sowell/quasar-app-extension-auth 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sowell/quasar-app-extension-auth",
-  "version": "1.4.4",
+  "version": "1.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/components/pages/AuthReporter.vue

@@ -97,36 +97,40 @@
                 data-cy="forgot-password">
                 {{ $t("auth.forgottenPassword") }}
               </div>
-              <div class="full-width">
-                <q-separator color="#727272" />
-              </div>
-              <div
-                class="q-mb-sm q-mt-md forgot-password-link self-start text-weight-medium">
-                {{ $t("auth.continueWith") }}
-              </div>
-
-              <div class="row justify-between full-width items-center">
-                <!-- <q-btn
-                  data-testid="google-btn"
-                  unelevated
-                  no-caps
-                  dense
-                  class="col sso-btn btn-label"
-                  style="margin-right: 4px !important;">
-                  <img src="../../assets/google-logo.svg" class="btn-icon" />
-                  Google
-                </q-btn> -->
-                <q-btn
-                  data-testid="microsoft-button"
-                  unelevated
-                  no-caps
-                  dense
-                  class="col sso-btn btn-label"
-                  @click="msalAuth">
-                  <img src="../../assets/logo-microsoft.svg" class="btn-icon" />
-                  Microsoft
-                </q-btn>
-              </div>
+              <template v-if="USE_SSO">
+                <div class="full-width">
+                  <q-separator color="#727272" />
+                </div>
+                <div
+                  class="q-mb-sm q-mt-md forgot-password-link self-start text-weight-medium">
+                  {{ $t("auth.continueWith") }}
+                </div>
+
+                <div class="row justify-between full-width items-center">
+                  <!-- <q-btn
+                    data-testid="google-btn"
+                    unelevated
+                    no-caps
+                    dense
+                    class="col sso-btn btn-label"
+                    style="margin-right: 4px !important;">
+                    <img src="../../assets/google-logo.svg" class="btn-icon" />
+                    Google
+                  </q-btn> -->
+                  <q-btn
+                    data-testid="microsoft-button"
+                    unelevated
+                    no-caps
+                    dense
+                    class="col sso-btn btn-label"
+                    @click="msalAuth">
+                    <img
+                      src="../../assets/logo-microsoft.svg"
+                      class="btn-icon" />
+                    Microsoft
+                  </q-btn>
+                </div>
+              </template>
             </div>
             <div class="error-message-container">
               <div
@@ -260,7 +264,7 @@ export default defineComponent({
       try {
         forgottenPassword.value = false
         await authState.resetPassword(data).then(() => {
-          localStorage.setItem("emailResetPassword", email)
+          localStorage.set("emailResetPassword", email)
           sendEmailCode.value = 200
           isReset.value = true
         })
@@ -276,10 +280,17 @@ export default defineComponent({
     }
 
     const goToPrivacyPolicy = async () => {
-      await InAppBrowser.openInSystemBrowser({
-        url: "https://sowell.app/privacy-policy-sowell/",
-        options: DefaultSystemBrowserOptions
-      })
+      const privacyPolicyUrl = "https://sowell.app/privacy-policy-sowell/"
+      try {
+        await InAppBrowser.openInSystemBrowser({
+          url: privacyPolicyUrl,
+          options: DefaultSystemBrowserOptions
+        })
+      } catch (error) {
+        if (typeof window !== "undefined") {
+          window.open(privacyPolicyUrl, "_blank")
+        }
+      }
     }
 
     onMounted(() => {

package/src/components/pages/OtpValidation.vue

@@ -99,7 +99,7 @@ export default defineComponent({
   setup() {
     const { t } = useI18n()
     const router = $router()
-    const $q = useQuasar()
+    const { localStorage, notify } = useQuasar()
     const { post } = $api()
     const {
       LOCAL_LOGIN_ROUTE,
@@ -127,7 +127,7 @@ export default defineComponent({
             if (response.data.auth) {
               let decoded = jwt(response.data.auth) as DecodedToken
               if (decoded) {
-                localStorage.setItem(
+                localStorage.set(
                   "userInfos",
                   JSON.stringify({
                     uid: decoded.uid,
@@ -140,7 +140,7 @@ export default defineComponent({
           })
           .catch((error) => {
             console.log("error", error)
-            $q.notify({
+            notify({
               message: t("auth.passwordRecoveryFailed"),
               color: "negative",
               icon: ionAlertCircleOutline,
@@ -152,7 +152,7 @@ export default defineComponent({
                 }
               ]
             })
-          }).finaly(() => {
+          }).finally(() => {
             loading.value = false
           })
       }

package/src/composables/resetPassword.ts

@@ -7,7 +7,7 @@ import {
   ionEyeOutline,
   ionEyeOffOutline,
   ionAlertCircleOutline,
-  ionLockClosedOutline,
+  ionLockClosedOutline
 } from "@quasar/extras/ionicons-v5"
 
 import { $api, $prompts, $router } from "../injects"
@@ -19,7 +19,7 @@ interface DecodedToken {
   token: string
 }
 export function useResetPassword() {
-  const $q = useQuasar()
+  const { localStorage, notify } = useQuasar()
   const { t } = useI18n()
 
   const password = ref("")
@@ -27,7 +27,10 @@ export function useResetPassword() {
   const passwordUpdated = ref(false)
   const showPassword = ref(false)
   const tempToken = ref("")
-  const userInfos = JSON.parse(localStorage.getItem("userInfos") || "{}")
+  const userInfos = JSON.parse(localStorage.getItem("userInfos") || "{}") as {
+    uid: string
+    token: string
+  }
 
   const { patch, post } = $api()
   const router = $router()
@@ -70,9 +73,7 @@ export function useResetPassword() {
     try {
       // remove backslash to avoid decoding error
       key = key.replace(/\\n/g, "")
-      const decodedKey = Buffer.from(key, "base64")
-        .toString("utf-8")
-        .split(",")
+      const decodedKey = Buffer.from(key, "base64").toString("utf-8").split(",")
       // split instead of JSON.parse as JSON.parse doesn't work
 
       if (decodedKey.length !== 2) {
@@ -128,12 +129,12 @@ export function useResetPassword() {
       .then(() => {
         loading.value = false
         passwordUpdated.value = true
-        localStorage.removeItem("emailResetPassword")
-        localStorage.removeItem("userInfos")
+        localStorage.remove("emailResetPassword")
+        localStorage.remove("userInfos")
       })
       .catch(() => {
         loading.value = false
-        $q.notify({
+        notify({
           message: t("auth.passwordRecoveryFailed"),
           color: "negative",
           icon: ionAlertCircleOutline,
@@ -158,7 +159,7 @@ export function useResetPassword() {
       const { decoded, email, tmpToken } = decodeKey(key)
 
       if (!decoded) {
-        return $q.notify({
+        return notify({
           message: t("auth.passwordRecoveryInvalidLink"),
           color: "negative",
           position: "top",
@@ -188,7 +189,7 @@ export function useResetPassword() {
           if (error.response) {
             // Request made and server responded
             if (error.response.status === 404) {
-              return $q.notify({
+              return notify({
                 message: t("auth.passwordRecoveryExpiredLink"),
                 color: "negative",
                 icon: ionAlertCircleOutline,
@@ -196,13 +197,13 @@ export function useResetPassword() {
                 actions: [
                   {
                     color: "white",
-                    icon: ionCloseOutline,
-                  },
-                ],
+                    icon: ionCloseOutline
+                  }
+                ]
               })
             }
           }
-          return $q.notify({
+          return notify({
             message: t("auth.passwordRecoveryFailed"),
             color: "negative",
             position: "top",
@@ -231,7 +232,7 @@ export function useResetPassword() {
     icons: {
       ionEyeOutline,
       ionEyeOffOutline,
-      ionLockClosedOutline,
-    },
+      ionLockClosedOutline
+    }
   }
 }