@sowell/quasar-app-extension-auth 0.3.22 → 0.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sowell/quasar-app-extension-auth",
-  "version": "0.3.22",
+  "version": "0.3.23",
   "description": "A Quasar app extension to manage Authentication",
   "main": "src/index.js",
   "repository": "https://github.com/sowell-ai/quasar.extension.auth",
@@ -38,6 +38,7 @@
     "test": "test"
   },
   "dependencies": {
+    "@capacitor/core": "^4.6.2",
     "@quasar/extras": "^1.13.4",
     "axios": "^0.21.1",
     "buffer": "^6.0.3",

package/src/composables/auth.ts

@@ -1,4 +1,4 @@
-import { ref, onMounted } from "vue";
+import { ref, onMounted, inject } from "vue";
 import isEmail from "validator/es/lib/isEmail";
 import { useI18n } from "vue-i18n";
 import {
@@ -11,7 +11,7 @@ import {
 } from "@quasar/extras/ionicons-v5";
 import { Platform } from "quasar";
 
-import { $prompts, $router, useAuthState } from "../injects";
+import { $prompts, $router, SignInPayload, useAuthState } from "../injects";
 
 interface HeadersInterface {
   headers: {
@@ -21,6 +21,13 @@ interface HeadersInterface {
 
 export function useAuth() {
   const authState = useAuthState();
+  const device = inject("Device")
+  let deviceInfos = {
+    cleanManufacturer: "",
+    cleanModel: "",
+    cleanPlatform: "",
+    cleanVersion: ""
+  }
 
   const { t } = useI18n();
   const {
@@ -31,6 +38,7 @@ export function useAuth() {
     WELCOME_SUBTITLE,
     IS_OTP,
     LOCAL_OTP_ROUTE,
+    APP_VERSION
   } = $prompts();
   const { push, replace } = $router();
 
@@ -71,20 +79,44 @@ export function useAuth() {
     forgottenPassword.value = true;
   };
 
+  const deviceInfo = async () => {
+    if (device) {
+      const info = await device.getInfo();
+      deviceInfos = {
+        cleanManufacturer: info.manufacturer,
+        cleanModel: info.model,
+        cleanPlatform: info.platform,
+        cleanVersion: info.osVersion
+      }
+    }
+  }
+
   const onSubmit = async () => {
     loading.value = true;
-    const data = {
+    const data: SignInPayload = {
       auth: {
         email: email.value,
         password: password.value,
       },
     };
+    if (device) {
+      data.device = {
+        cleanManufacturer: deviceInfos.cleanManufacturer,
+        cleanModel: deviceInfos.cleanModel,
+        cleanPlatform: deviceInfos.cleanPlatform,
+        cleanVersion: deviceInfos.cleanVersion,
+      },
+      data.app = {
+        cleanVersionNumber: APP_VERSION
+      }
+    };
     const options: HeadersInterface = {
       headers: {},
     };
     // @ts-ignore
     let requestedRoles = window.Cypress
-      ? window.Cypress.requestedRoles
+      ? // @ts-ignore
+        window.Cypress.requestedRoles
       : X_REQUESTED_ROLES;
     if (requestedRoles) options.headers["x-requested-roles"] = requestedRoles;
 
@@ -125,7 +157,8 @@ export function useAuth() {
     push(LOCAL_OTP_ROUTE);
   };
 
-  onMounted(() => {
+  onMounted(async () => {
+    await deviceInfo()
     if (authState.raw) {
       replace(LOCAL_SUCCESS_REDIRECTION_ROUTE);
     }

package/src/injects/prompts.ts

@@ -22,6 +22,7 @@ export interface PromptsInterface {
   LOCAL_OTP_ROUTE: string;
   AUTH_SERVER_VERIFY_OTP: string;
   UI_PAGE: string;
+  APP_VERSION: string;
 }
 export const $prompts = (): PromptsInterface => {
   const $prompts = inject<Record<"@sowell/auth", PromptsInterface>>("$prompts");

package/src/injects/states.ts

@@ -23,9 +23,18 @@ export interface RequestOptions {
 
 export interface SignInPayload {
   auth: {
-    email: string;
-    password: string;
-  };
+    email: string
+    password: string
+  }
+  device?: {
+    cleanManufacturer: string
+    cleanModel: string
+    cleanPlatform: string,
+    cleanVersion: string
+  }
+  app?: {
+    cleanVersionNumber: string
+  }
 }
 
 export interface ResetPasswordPayload {

package/src/prompts.js

@@ -169,5 +169,11 @@ module.exports = function () {
       message: "API endpoint to send OTP (without host)",
       default: "/sign-in-otp",
     },
+    {
+      name: "APP_VERSION",
+      required: true,
+      message: "Version de l'application",
+      default: "",
+    },
   ];
 };