@tapni/auth 0.0.35 → 0.0.37

package/package.json

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

package/src/App.vue

@@ -94,7 +94,7 @@ export default {
   mixins: [AuthMixin],
   data () {
     return {
-      initialized: false
+      isSetup: false
     }
   },
   components: {
@@ -112,6 +112,11 @@ export default {
       default: false
     }
   },
+  computed: {
+    initialized () {
+      return this.isSetup || this.isModal;
+    }
+  },
   async mounted() {
     this.applyBgStyle()
 
@@ -124,8 +129,8 @@ export default {
     async init () {
 
       // Make sure the function is called just once
-      if (this.initialized) return;
-      this.initialized = true;
+      if (this.isSetup) return;
+      this.isSetup = true;
 
       this.setToken(this.$storage.token);
       const refreshTokens = this.getRefreshTokens();

package/src/mixins/auth.mixin.js

@@ -255,7 +255,9 @@ export default {
       }
 
       // Set new access token
-      this.setToken(response.data.token);
+      if (response && response.data) {
+        this.setToken(response.data.token);
+      } else console.error('Invalid response setToken');
     },
     async login(data) {
       const [err, response] = await to(AuthService.login(data, this.$storage));
@@ -327,12 +329,7 @@ export default {
       }
     },
     async exchangeAuthCode(data) {
-      const [err, response] = await to(
-        axios.post(import.meta.env.VITE_APP_API_ROOT + "/v1/users/auth-code", {
-          code: data.code,
-          code_verifier: data.code_verifier,
-        })
-      );
+      const [err, response] = await to(AuthService.exchangeAuthCode(data, this.storage));
       if (err) return this.errorHandler(err);
       await this.loginSetup(response);
       await this.getLoggedInAccounts();

package/src/services/Api.js

@@ -4,9 +4,15 @@ import { version } from "../../package.json"
 import AuthMixin from "../mixins/auth.mixin"
 
 export default (storage, refreshTokenAction = false) => {
-  const appInfo = version
+  const appInfo = version;
+  let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
+
+  if (location.hostname.includes('dev.')) {
+    baseURL = 'https://api-dev.tapni.co'
+  }
+
   let apiInstance = axios.create({
-    baseURL: import.meta.env.VITE_APP_API_ROOT + '/v1/',
+    baseURL,
     headers: {
       Authorization: `Bearer ${storage.token}`,
       "X-Client-Name": "sso-" + appInfo.platform,

package/src/services/AuthService.js

@@ -67,5 +67,8 @@ export default {
   },
   samlLoginUrl (data, storage) {
     return Api(storage).post('/saml/url', data)
-  }
+  },
+  exchangeAuthCode (data, storage) {
+    return Api(storage).post('/v1/users/auth-code', data)
+  },
 }