@tapni/auth 0.0.49 → 0.0.51

package/package.json

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

package/src/mixins/auth.mixin.js

@@ -328,8 +328,13 @@ export default {
       }
     },
     async exchangeAuthCode(data) {
-      const [err, response] = await to(AuthService.exchangeAuthCode(data, this.storage));
-      if (err) return this.errorHandler(err);
+      console.log({data});
+      const [err, response] = await to(AuthService.exchangeAuthCode(data, this.$storage));
+      if (err) {
+        console.log({err});
+        return this.errorHandler(err);
+      }
+      console.log(response);
       await this.loginSetup(response);
       await this.getLoggedInAccounts();
       this.loginSuccess(response);

package/src/mixins/saml.mixin.js

@@ -1,7 +1,7 @@
 import { Browser } from '@capacitor/browser';
 import UtilService from '@/services/UtilService';
 import { Capacitor } from "@capacitor/core";
-
+import { EventBus } from '@/store/event-bus.js';
 export default {
 	data () {
 		return {
@@ -70,6 +70,9 @@ export default {
 				if(this.isNative && this.isIOS) await Browser.close();
 				EventBus.$emit('ssoEvent', {name: 'setLoading', data: true})
 				if (this.$route.query.code) code = this.$route.query.code
+
+				console.log(this.display, {code});
+
 				if (code) {
 					if (this.display === 'popup') {
 						return window.parent?.postMessage({ code: code, state: this.$route.query.state }, '*');

package/src/routes.js

@@ -23,8 +23,9 @@ export default [
     component: Login,
   },
   {
-    path: "/callback/*",
+    path: "/callback/saml",
     name: "Callback",
+    alias: ['/callback/okta', '/callback/auth'],
     component: Callback,
   },
   {

package/src/services/Api.js

@@ -14,7 +14,7 @@ export default (storage, refreshTokenAction = false) => {
   let apiInstance = axios.create({
     baseURL,
     headers: {
-      Authorization: `Bearer ${storage.token}`,
+      ...(storage ? { Authorization: `Bearer ${storage.token}` } : {}),
       "X-Client-Name": "sso-" + appInfo.platform,
       "X-Client-Version": appInfo.version
     }
@@ -26,19 +26,23 @@ export default (storage, refreshTokenAction = false) => {
     if (['post', 'put', 'delete'].includes(config.method.toLowerCase())) {
       config.data = {
         ...config.data,
-        lang: storage.appLanguage,
-        realm: storage.realm || 'app'
+        ...(storage ? {
+          lang: storage.appLanguage,
+          realm: storage.realm || 'app'
+        } : {}),
       }
     } else if (config.method.toLowerCase() === 'get') {
       config.params = {
         ...config.params,
-        lang: storage.appLanguage,
-        realm: storage.realm || 'app'
+        ...(storage ? {
+          lang: storage.appLanguage,
+          realm: storage.realm || 'app'
+        } : {}),
       }
     }
 
     // Check refresh token expiration before request is sent
-    if (storage.token && !refreshTokenAction) {
+    if (storage && storage.token && !refreshTokenAction) {
       const decoded = jwtDecode(storage.token)
 
       // Check if access token expired

package/src/services/AuthService.js

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

package/src/views/Callback.vue

@@ -1,5 +1,5 @@
 <template>
- <div>
+ <div class="page-login content-boxed content-boxed-padding">
    <h5 v-if="($route.query.platform ==='android' || $route.query.platform ==='ios') && !isNative" style="text-align: center; width: 80%; margin: 0 auto; margin-top: 260px; ">
        {{ssoLang[this.appLanguage].you_will_be_redirected}}<br>
        {{ssoLang[this.appLanguage].if_redirect_not_directly}}, <span @click="inAppRedirect" style="color: blue; cursor: pointer">{{ssoLang[this.appLanguage].click_here}}</span>.</h5>
@@ -24,6 +24,7 @@ export default {
   },
 
   async mounted() {
+    console.log('ee');
     if(this.$route.path === '/callback/auth') {
         this.exchangeAuthCode({
             code: this.$route.query.code