@sowell/quasar-app-extension-auth 0.4.8 → 0.5.0

package/.eslintrc.js

@@ -2,26 +2,29 @@ module.exports = {
   env: {
     browser: true,
     commonjs: true,
-    es2021: true
+    es2021: true,
   },
   extends: [
-    'eslint:recommended',
-    'plugin:vue/vue3-strongly-recommended',
-    'prettier'
+    "eslint:recommended",
+    "plugin:vue/vue3-strongly-recommended",
+    "prettier",
   ],
   parserOptions: {
-    parser: '@typescript-eslint/parser',
+    parser: "@typescript-eslint/parser",
     ecmaVersion: 2018,
-    sourceType: 'module'
+    sourceType: "module",
   },
-  plugins: ['vue'],
+  plugins: ["vue"],
   rules: {
-    'comma-dangle': ['error', 'only-multiline'],
-    'space-before-function-paren': [
-      'error',
-      { anonymous: 'always', named: 'never', asyncArrow: 'always' }
+    "comma-dangle": ["error", "only-multiline"],
+    "space-before-function-paren": [
+      "error",
+      { anonymous: "always", named: "never", asyncArrow: "always" },
     ],
-    semi: 'off',
-    'no-unreachable': 'off'
-  }
+    semi: "off",
+    "no-unreachable": "off",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+  },
 };

package/.github/workflows/main.yml

@@ -7,16 +7,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Nodejs
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '18'
           cache: yarn
       - run: yarn install
       - run: yarn dep
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v6
         with:
           working-directory: dev
-          command: yarn test
+          command: yarn ci

package/.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Nodejs
         uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "18"
           cache: yarn
           registry-url: https://registry.npmjs.org
       - name: publish

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sowell/quasar-app-extension-auth",
-  "version": "0.4.8",
+  "version": "0.5.0",
   "description": "A Quasar app extension to manage Authentication",
   "main": "src/index.js",
   "repository": "https://github.com/sowell-ai/quasar.extension.auth",
@@ -10,7 +10,7 @@
     "dep": "cd dev && yarn",
     "test:link": "cd dev && yarn test:link",
     "test:browser": "cd dev && yarn test:browser",
-    "test": "cd dev && yarn test"
+    "test": "cd dev && yarn ci"
   },
   "keywords": [],
   "author": "SoWell SAS",
@@ -32,7 +32,7 @@
     "eslint-plugin-vue": "^7.0.0",
     "jwt-decode": "^3.1.2",
     "quasar": "^2.6.2",
-    "typescript": "^4.4.2"
+    "typescript": "^5.3.3"
   },
   "directories": {
     "test": "test"
@@ -40,6 +40,7 @@
   "dependencies": {
     "@capacitor/core": "^4.6.2",
     "@quasar/extras": "^1.13.4",
+    "@typescript-eslint/parser": "^6.19.1",
     "axios": "^0.21.1",
     "buffer": "^6.0.3",
     "pinia": "^2.0.12",

package/src/boot/router-guards.ts

@@ -2,7 +2,6 @@
 import prompts from "app/quasar.extensions.json";
 import { boot } from "quasar/wrappers";
 import { BootInterface } from "../interfaces";
-import { LocalStorage } from "quasar";
 
 export default boot(({ app, router }: BootInterface) => {
   const {

package/src/components/dialogs/sw-info-dialog.vue

@@ -14,7 +14,7 @@
         />
       </div>
       <div class="row justify-center">
-        <img :src="image" />
+        <img :src="imageSVG" />
       </div>
     </q-card-section>
 
@@ -52,7 +52,7 @@ import emailVerification from "../../assets/Email-sent.svg";
 import { ionCloseOutline } from "@quasar/extras/ionicons-v5";
 
 export default defineComponent({
-  name: "swInfoDialog",
+  name: "SwInfoDialog",
   props: {
     title: { type: String, required: true },
     content: { type: String, required: true },
@@ -60,9 +60,9 @@ export default defineComponent({
     passwordUpdated: { type: Boolean },
     isOtp: { type: Boolean, default: false, required: false },
   },
-  emit: ["goToLoginPage"],
+  emits: ["goToLoginPage"],
   setup(props: any) {
-    const image = computed(() => {
+    const imageSVG = computed(() => {
       switch (props.image) {
         case "userNotFound":
           return userNotFound;
@@ -72,9 +72,11 @@ export default defineComponent({
 
         case "emailVerification":
           return emailVerification;
+        default:
+          return "";
       }
     });
-    return { image, icons: { ionCloseOutline } };
+    return { imageSVG, icons: { ionCloseOutline } };
   },
 });
 </script>

package/src/components/pages/AdminAuth.vue

@@ -99,7 +99,7 @@
           :title="infoDialog.title"
           :content="infoDialog.content"
           :image="infoDialog.image"
-          :isOtp="true"
+          :is-otp="true"
         >
           <q-btn
             v-if="requestedOtp"
@@ -128,11 +128,6 @@ import WebSendEmail from "../dialogs/WebSendEmail.vue";
 
 import { useAuth } from "composables/auth";
 
-interface HeadersInterface {
-  headers: {
-    "x-requested-roles"?: string;
-  };
-}
 export default defineComponent({
   name: "Auth",
   components: { WebSendEmail, SwInfoDialog },

package/src/composables/auth.ts

@@ -65,7 +65,7 @@ export function useAuth() {
   const validations = ref({
     email: [
       (val: string) => {
-        errorEmailMessage.value = !!val ? "" : t("auth.emailPresenceError");
+        errorEmailMessage.value = val ? "" : t("auth.emailPresenceError");
         return !!val || t("auth.emailPresenceError");
       },
       (val: string) => {
@@ -77,9 +77,7 @@ export function useAuth() {
     ],
     password: [
       (val: string) => {
-        errorPasswordMessage.value = !!val
-          ? ""
-          : t("auth.passwordPresenceError");
+        errorPasswordMessage.value = val ? "" : t("auth.passwordPresenceError");
         return !!val || t("auth.passwordPresenceError");
       },
     ],

package/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 const path = require("path");
-function extendConf(conf) {
+function extendConf(conf, api) {
   const requiredPlugins = ["Notify"];
 
   requiredPlugins.forEach((plugin) => {
@@ -20,7 +20,9 @@ function extendConf(conf) {
   );
   conf.boot.push("~@sowell/quasar-app-extension-auth/src/boot/axios.ts");
 
-  conf.build.transpileDependencies.push(/quasar-app-extension-auth[\\/]src/);
+  if (api.hasWebpack) {
+    conf.build.transpileDependencies.push(/quasar-app-extension-auth[\\/]src/);
+  }
 
   console.log("Boot sowell auth");
 }
@@ -34,9 +36,24 @@ const chainWebpack = (ctx, chain) => {
     path.resolve(__dirname, "./composables")
   );
 };
+
+const aliasVite = (viteConf) => {
+  viteConf.define.global = {};
+  viteConf.resolve.alias = {
+    ...viteConf.resolve.alias,
+    "@sowell/auth": path.resolve(__dirname, "./components"),
+    composables: path.resolve(__dirname, "./composables"),
+  };
+};
+
 module.exports = function (api) {
   api.compatibleWith("quasar", "^2.0.0");
-  api.compatibleWith("@quasar/app", "^3.0.0");
-  api.chainWebpack((chain) => chainWebpack(api.ctx, chain));
+  if (api.hasVite === true) {
+    api.compatibleWith("@quasar/app-vite", "^1.3.0");
+    api.extendViteConf(aliasVite);
+  } else {
+    api.compatibleWith("@quasar/app", "^3.0.0");
+    api.chainWebpack((chain) => chainWebpack(api.ctx, chain));
+  }
   api.extendQuasarConf(extendConf);
 };

package/src/injects/states.ts

@@ -1,6 +1,5 @@
 import { inject } from "vue";
 import { Store } from "pinia";
-import { AxiosResponse } from "axios";
 import { $prompts } from "../injects";
 
 export interface AuthStatePayload {
@@ -72,22 +71,7 @@ export interface ResetPasswordPayload {
   };
 }
 
-export const useAuthState = (): Store<
-  "auth",
-  AuthState,
-  {
-    getIsValid(state: AuthState): boolean;
-  },
-  {
-    signin(
-      data: SignInPayload,
-      options: RequestOptions
-    ): Promise<AxiosResponse>;
-    msalSignin(): Promise<AxiosResponse>;
-    resetPassword(data: ResetPasswordPayload): Promise<AxiosResponse>;
-    updateRaw(value: string): void;
-  }
-> => {
+export const useAuthState = () => {
   const authState = inject<Store<"auth", AuthState>>("authState");
   if (authState == undefined) {
     throw Error("Could not inject authState");

package/src/routes/index.ts

@@ -1,6 +1,13 @@
 //@ts-ignore
 import prompts from "app/quasar.extensions.json";
 import { RouteRecordRaw } from "vue-router";
+import AdminAuth from "../components/pages/AdminAuth.vue";
+import WebAuth from "../components/pages/WebAuth.vue";
+import WebResetPassword from "../components/pages/WebResetPassword.vue";
+import ResetPaswword from "../components/pages/ResetPassword.vue";
+
+import Auth from "../components/pages/Auth.vue";
+import AuthReporter from "../components/pages/AuthReporter.vue";
 
 const {
   "@sowell/auth": {
@@ -20,54 +27,50 @@ let authPage = "";
 
 switch (UI_PAGE) {
   case "mobile_clean":
-    authPage = "Auth.vue";
+    authPage = Auth;
     break;
   case "reporter":
-    authPage = "AuthReporter.vue";
+    authPage = AuthReporter;
     break;
   case "admin":
-    authPage = "AdminAuth.vue";
+    authPage = AdminAuth;
     break;
   default:
-    authPage = "Auth.vue";
+    authPage = Auth;
     break;
 }
 
-const loginPage = (X_REQUESTED_ROLES: string): string => {
+const loginPage = (X_REQUESTED_ROLES: string) => {
   return X_REQUESTED_ROLES === "admin"
-    ? "AdminAuth.vue"
+    ? AdminAuth
     : webAuthRoles.includes(X_REQUESTED_ROLES)
-      ? "WebAuth.vue"
-      : authPage;
+    ? WebAuth
+    : authPage;
 };
 
-const isInRoles = (X_REQUESTED_ROLES: string): string => {
+const isInRoles = (X_REQUESTED_ROLES: string) => {
   return webAuthRoles.includes(X_REQUESTED_ROLES) ||
     AdminAuthRoles.includes(X_REQUESTED_ROLES)
-    ? "WebResetPassword.vue"
-    : "ResetPassword.vue";
+    ? WebResetPassword
+    : ResetPaswword;
 };
 
 const routes: RouteRecordRaw[] = [
   {
     path: LOCAL_LOGIN_ROUTE,
-    component: () =>
-      // @ts-ignore
-      import(`@sowell/auth/pages/${loginPage(X_REQUESTED_ROLES)}`),
+    component: () => loginPage(X_REQUESTED_ROLES),
   },
   {
     path: LOCAL_UPDATE_PASSWORD_ROUTE,
     name: "update_password",
-    component: () =>
-      // @ts-ignore
-      import(`@sowell/auth/pages/${isInRoles(X_REQUESTED_ROLES)}`),
+    component: () => isInRoles(X_REQUESTED_ROLES),
   },
   {
     path: LOCAL_OTP_ROUTE,
     name: "otp_validation",
     component: () =>
       // @ts-ignore
-      import("@sowell/auth/pages/OtpValidation.vue"),
+      import("../components/pages/OtpValidation.vue"),
   },
 ];