@tapni/auth 0.0.53 → 0.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapni/auth",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "type": "module",
   "main": "./dist/TapniAuth.umd.js",
   "module": "./dist/TapniAuth.es.js",

package/src/install.js

@@ -1,17 +1,13 @@
 import App from "./App.vue";
 import ReactiveStorage from '@tapni/capacitor-reactive-localstorage-vue3'
+import Api from './services/Api'
+
 
 // Export the component by default
 export default {
     TapniAuth: App,
     install: (app, options) => {
-        if (options && options.API_ROOT) {
-            App.mixin({
-                created() {
-                  this.API_ROOT = options.API_ROOT;
-                }
-            })
-        }    
+        if (options && options.API_ROOT) Api.setApiRootFromOptions(options.API_ROOT);
         app.component('TapniAuth', App);
     }
 };

package/src/mixins/auth.mixin.js

@@ -94,9 +94,6 @@ export default {
     }
   },
   methods: {
-    apiRootGet(){
-      return this.API_ROOT;
-    },
     errorHandler(error) {
       if (
         error &&

package/src/services/Api.js

@@ -3,64 +3,72 @@ import { jwtDecode } from "jwt-decode";
 import { version } from "../../package.json"
 import AuthMixin from "../mixins/auth.mixin"
 
-export default (storage, refreshTokenAction = false) => {
-  const appInfo = version;
-  let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
+let apiRootFromOptions;
 
-  const apiRoot = AuthMixin.methods.apiRootGet();
-  if (apiRoot) {
-    baseURL = apiRoot
-  }
 
-  let apiInstance = axios.create({
-    baseURL,
-    headers: {
-      ...(storage ? { Authorization: `Bearer ${storage.token}` } : {}),
-      "X-Client-Name": "sso-" + appInfo.platform,
-      "X-Client-Version": appInfo.version
-    }
-  })
+export default {
+  setApiRootFromOptions(apiRoot) {
+    apiRootFromOptions = apiRoot
+  },
+  instance(storage, refreshTokenAction = false) {
 
-  // Add a request interceptor
-  apiInstance.interceptors.request.use(async function (config) {
+    const appInfo = version;
+    let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
 
-    if (['post', 'put', 'delete'].includes(config.method.toLowerCase())) {
-      config.data = {
-        ...config.data,
-        ...(storage ? {
-          lang: storage.appLanguage,
-          realm: storage.realm || 'app'
-        } : {}),
+    if (apiRootFromOptions) {
+      baseURL = apiRootFromOptions;
+    }
+
+    let apiInstance = axios.create({
+      baseURL,
+      headers: {
+        ...(storage ? { Authorization: `Bearer ${storage.token}` } : {}),
+        "X-Client-Name": "sso-" + appInfo.platform,
+        "X-Client-Version": appInfo.version
       }
-    } else if (config.method.toLowerCase() === 'get') {
-      config.params = {
-        ...config.params,
-        ...(storage ? {
-          lang: storage.appLanguage,
-          realm: storage.realm || 'app'
-        } : {}),
+    })
+
+    // Add a request interceptor
+    apiInstance.interceptors.request.use(async function (config) {
+
+      if (['post', 'put', 'delete'].includes(config.method.toLowerCase())) {
+        config.data = {
+          ...config.data,
+          ...(storage ? {
+            lang: storage.appLanguage,
+            realm: storage.realm || 'app'
+          } : {}),
+        }
+      } else if (config.method.toLowerCase() === 'get') {
+        config.params = {
+          ...config.params,
+          ...(storage ? {
+            lang: storage.appLanguage,
+            realm: storage.realm || 'app'
+          } : {}),
+        }
       }
-    }
 
-    // Check refresh token expiration before request is sent
-    if (storage && storage.token && !refreshTokenAction) {
-      const decoded = jwtDecode(storage.token)
+      // Check refresh token expiration before request is sent
+      if (storage && storage.token && !refreshTokenAction) {
+        const decoded = jwtDecode(storage.token)
 
-      // Check if access token expired
-      if (decoded.exp - 30 < Math.floor(Date.now() / 1000)) {
+        // Check if access token expired
+        if (decoded.exp - 30 < Math.floor(Date.now() / 1000)) {
 
-        return AuthMixin.methods.refreshTokenAction(decoded)
-            .then(() => {
-              config.headers = {
-                ...config.headers,
-                Authorization: `Bearer ${storage.token}`
-              }
-              return config;
-            })
+          return AuthMixin.methods.refreshTokenAction(decoded)
+              .then(() => {
+                config.headers = {
+                  ...config.headers,
+                  Authorization: `Bearer ${storage.token}`
+                }
+                return config;
+              })
+        }
       }
-    }
-    return config;
-  });
+      return config;
+    });
 
-  return apiInstance;
-}
+    return apiInstance;
+  }
+}

package/src/services/AuthService.js

@@ -1,74 +1,76 @@
-import Api from './Api'
+import Api from './Api';
 import { Device } from '@capacitor/device';
-import axios from "axios";
+const api = Api.instance;
+
 let deviceID;
 Device.getId().then((DeviceId)=> deviceID = DeviceId.uuid)
+
 export default {
   register (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/register', data)
+    return api(storage).post('/users/register', data)
   },
   login (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/login', data)
+    return api(storage).post('/users/login', data)
   },
   logout (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/logout', data)
+    return api(storage).post('/users/logout', data)
   },
   refreshToken (data, storage) {
-    return Api(storage, true).get(`/users/refresh-token?UserId=${data.id}&token=${data.refreshToken}`)
+    return api(storage, true).get(`/users/refresh-token?UserId=${data.id}&token=${data.refreshToken}`)
   },
   getLoggedInAccounts(data, storage) {
-    return Api(storage).post(`/users/tokens`, data);
+    return api(storage).post(`/users/tokens`, data);
   },
   sendResetEmail (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/reset', data)
+    return api(storage).post('/users/reset', data)
   },
   changePassword (data, storage) {
-    return Api(storage).put('/users/password', data, {
+    return api(storage).put('/users/password', data, {
       headers: { Authorization: 'Bearer ' + data.token }
     })
   },
   verify (data, storage) {
-    return Api(storage).get('/users/verify?c=' + data.code + '&e=' + data.email + '&captchatoken=' + data.captchaToken)
+    return api(storage).get('/users/verify?c=' + data.code + '&e=' + data.email + '&captchatoken=' + data.captchaToken)
   },
   googleUrl (storage) {
-    return Api(storage).get('/users/google/url')
+    return api(storage).get('/users/google/url')
   },
   google (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/google', data)
+    return api(storage).post('/users/google', data)
   },
   facebook (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/facebook', data)
+    return api(storage).post('/users/facebook', data)
   },
   googleSDK (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/google/sdk', data)
+    return api(storage).post('/users/google/sdk', data)
   },
   facebookSDK (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/facebook/sdk', data)
+    return api(storage).post('/users/facebook/sdk', data)
   },
   appleSDK (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/apple/sdk', data)
+    return api(storage).post('/users/apple/sdk', data)
   },
   microsoftSDK (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/microsoft/sdk', data)
+    return api(storage).post('/users/microsoft/sdk', data)
   },
   oktaSDK (data, storage) {
     data.device_id = deviceID
-    return Api(storage).post('/users/okta/sdk', data)
+    return api(storage).post('/users/okta/sdk', data)
   },
   samlLoginUrl (data, storage) {
-    return Api(storage).post('/saml/url', data)
+    return api(storage).post('/saml/url', data)
   },
   exchangeAuthCode (data, storage) {
-    return Api(storage).post('/users/auth-code', data)
+    return api(storage).post('/users/auth-code', data)
   },
 }

package/src/services/CompanyService.js

@@ -1,13 +1,14 @@
-import Api from './Api'
+import Api from './Api';
+const api = Api.instance;
 
 export default {
   getBySSOEmail (email, storage) {
-    return Api(storage).get(`/company/sso/${email}`)
+    return api(storage).get(`/company/sso/${email}`)
   },
   acceptCompanyInvitation (code, storage) {
-    return Api(storage).get(`/users/invitation?ic=${code}`)
+    return api(storage).get(`/users/invitation?ic=${code}`)
   },
   qrCodePooling(payload, storage) {
-    return Api(storage).post("/company/login/qr", payload);
+    return api(storage).post("/company/login/qr", payload);
   },
 }

package/src/services/DeviceService.js

@@ -1,10 +1,11 @@
-import Api from './Api'
+import Api from './Api';
+const api = Api.instance;
 
 export default {
 	registerDevice(data, storage) {
-		return Api(storage).post(`/devices/add`, data)
+		return api(storage).post(`/devices/add`, data)
 	},
 	addFcmToken(data, storage) {
-		return Api(storage).post(`/devices/fcm/add`, data)
+		return api(storage).post(`/devices/fcm/add`, data)
 	}
 }

package/src/services/UserService.js

@@ -1,4 +1,5 @@
-import Api from "./Api";
+import Api from './Api';
+const api = Api.instance;
 
 export default {
   getMe() {
@@ -8,7 +9,7 @@ export default {
     let referrer = document.referrer || "";
     let params = data.utmParams || {};
     if (data.dontTap) params.dontTap = true;
-    return Api(storage).get(`/users/${data.username}`, {
+    return api(storage).get(`/users/${data.username}`, {
       params,
       headers: { "X-Referer": referrer },
     });
@@ -17,33 +18,33 @@ export default {
     let referrer = document.referrer || "";
     let params = data.utmParams || {};
     if (data.dontTap) params.dontTap = true;
-    return Api(storage).get(`/users/tag/${data.serial}`, {
+    return api(storage).get(`/users/tag/${data.serial}`, {
       params,
       headers: { "X-Referer": referrer },
     });
   },
   save(data, storage) {
-    return Api(storage).put(`/users`, data);
+    return api(storage).put(`/users`, data);
   },
   newPassword(data, storage) {
-    return Api(storage).put(`/users/new-password`, data);
+    return api(storage).put(`/users/new-password`, data);
   },
   connect(data, storage) {
-    return Api(storage).post(`/users/connect`, data);
+    return api(storage).post(`/users/connect`, data);
   },
   eventLog(data, storage) {
-    return Api(storage).post(`/users/log`, data);
+    return api(storage).post(`/users/log`, data);
   },
   deleteAccount(data, storage) {
-    return Api(storage).post(`/users/profile/delete`, data);
+    return api(storage).post(`/users/profile/delete`, data);
   },
   registerDevice(data, storage) {
-    return Api(storage).post(`/users/device/register`, data);
+    return api(storage).post(`/users/device/register`, data);
   },
   addFcmToken(data, storage) {
-    return Api(storage).post(`/users/device/fcm`, data);
+    return api(storage).post(`/users/device/fcm`, data);
   },
   loginUsingQR(data, storage) {
-    return Api(storage).post("/users/qr/login", data);
+    return api(storage).post("/users/qr/login", data);
   }
 };

package/src/views/Callback.vue

@@ -24,7 +24,6 @@ export default {
   },
 
   async mounted() {
-    console.log('ee');
     if(this.$route.path === '/callback/auth') {
         this.exchangeAuthCode({
             code: this.$route.query.code