@tapni/auth 1.0.5 → 1.0.6-3.dev

package/src/eslint.config.js

@@ -0,0 +1,15 @@
+import pluginVue from 'eslint-plugin-vue';
+export default [
+	...pluginVue.configs['flat/recommended'],
+	{
+		rules: {
+			'vue/require-valid-default-prop': 'off',
+			'vue/max-attributes-per-line': 'off',
+			'vue/html-indent': 'off',
+			'vue/html-self-closing': 'off',
+			'vue/singleline-html-element-content-newline': 'off'
+			// override/add rules settings here, such as:
+			// 'vue/no-unused-vars': 'error'
+		}
+	}
+];

package/src/index.js

@@ -0,0 +1,4 @@
+import TapniAuth from './components/TapniAuth.vue';
+
+export { TapniAuth };
+export default TapniAuth;

package/src/install.js

@@ -1,17 +1,16 @@
-import App from "./App.vue";
+import App from './App.vue';
 import auth from './store/auth.js';
 
 // Export the component by default
 export default {
-    install: (app, {store, apiRoot}) => {
-        // Register the component
-        app.component('TapniAuth', App);
+	install: (app, { store, apiRoot }) => {
+		// Register the component
+		app.component('TapniAuth', App);
 
-        if(!store.hasModule('auth')) {
-            store.registerModule('auth', auth);
-        }
+		if (!store.hasModule('auth')) {
+			store.registerModule('auth', auth);
+		}
 
-        app.config.globalProperties.$apiRoot = apiRoot;
-
-    }
+		app.config.globalProperties.$apiRoot = apiRoot;
+	}
 };

package/src/main.js

@@ -1,76 +1,75 @@
-import "@tapni/styles/dist/index.css";
-import { createApp } from 'vue'
-import RootApp from './App.vue'
-import router from './router'
-import VueCookies from 'vue-cookies'
+import '@tapni/styles/dist/index.css';
+import { createApp } from 'vue';
+import RootApp from './App.vue';
+import router from './router';
+import VueCookies from 'vue-cookies';
 import { App } from '@capacitor/app';
 import { Browser } from '@capacitor/browser';
 import store from './store/store.js';
 import { sync } from 'vuex-router-sync';
 
-const app = createApp(RootApp)
+const app = createApp(RootApp);
 
-app.config.productionTip = false
+app.config.productionTip = false;
 
 // Vuex Router Sync
 sync(store, router);
 
 // Cookies
-app.use(VueCookies)
+app.use(VueCookies);
 
-app.use(router)
+app.use(router);
 
-app.use(store)
-
-app.mount('#app')
+app.use(store);
 
+app.mount('#app');
 
 function hasQueryParams(route) {
-    return !!Object.keys(route.query).length
+	return !!Object.keys(route.query).length;
 }
 
 router.beforeEach((to, from, next) => {
-    setTimeout(() => {
-        window.scrollTo(0, 0)
-    }, 100)
-
-    if(!hasQueryParams(to) && hasQueryParams(from)){
-        next({name: to.name, query: from.query});
-    } else {
-        next()
-    }
-})
+	setTimeout(() => {
+		window.scrollTo(0, 0);
+	}, 100);
+
+	if (!hasQueryParams(to) && hasQueryParams(from)) {
+		next({ name: to.name, query: from.query });
+	} else {
+		next();
+	}
+});
 
 /**
  * Redirect users to desired profile - DEEP LINKING
  * @param data
  */
 function redirectToProfile(data) {
-    if (data && data.url) {
-        let url = new URL(data.url)
-        let pathname = url.pathname || '';
-        let queryParams = url.search || ''
-        if(queryParams) queryParams = Object.fromEntries(new URLSearchParams(queryParams));
-        else queryParams = {};
-        let subdomain = '';
-        //['my', 'tapni', 'co']
-        let tempArr = url.hostname.split('.');
-        if(tempArr.length === 3) subdomain = tempArr[0];
-        if(subdomain) queryParams.s = subdomain;
-
-        // open t.link shorter links in browser
-        if(pathname && /[A-Z]/.test(pathname) && !pathname.startsWith('/t/')) {
-            Browser.open({url: url.toString()});
-            return router.push('/');
-        }
-
-        if (pathname) {
-            router.push({
-                path: pathname,
-                query: queryParams
-            })
-        }
-    }
+	if (data && data.url && data.url !== '/undefined') {
+		let url = new URL(data.url);
+		let pathname = url.pathname || '';
+		let queryParams = url.search || '';
+		if (queryParams) queryParams = Object.fromEntries(new URLSearchParams(queryParams));
+		else queryParams = {};
+		let subdomain = '';
+		//['my', 'tapni', 'co']
+		let tempArr = url.hostname.split('.');
+		if (tempArr.length === 3) subdomain = tempArr[0];
+		if (subdomain) queryParams.s = subdomain;
+
+		// open t.link shorter links in browser
+		if (pathname && /[A-Z]/.test(pathname) && !pathname.startsWith('/t/')) {
+			Browser.open({ url: url.toString() });
+			return router.push('/');
+		}
+
+		if (pathname) {
+			router.push({
+				path: pathname,
+				query: queryParams
+			});
+		}
+	}
 }
 /**
  * CAPACITOR_CONFIG
@@ -78,13 +77,12 @@ function redirectToProfile(data) {
  * Users who have an app should get the profiles opened in the app ie: tapni.co/tapni
  */
 App.addListener('appUrlOpen', async function (data) {
-    if(data.url && data.url.startsWith('tapni://')) data.url = data.url.replace('tapni://', 'https://')
-    let url = new URL(data.url);
-    if(url.pathname.includes('/callback/')) {
-        await router.push({path: url.pathname, query:  Object.fromEntries(new URLSearchParams(url.search))});
-    }
-    else redirectToProfile(data);
-})
+	if (data.url && data.url.startsWith('tapni://')) data.url = data.url.replace('tapni://', 'https://');
+	let url = new URL(data.url);
+	if (url.pathname.includes('/callback/')) {
+		await router.push({ path: url.pathname, query: Object.fromEntries(new URLSearchParams(url.search)) });
+	} else redirectToProfile(data);
+});
 
 // When the app is open and you trigger NFC event to open the app
 // App.addListener('appStateChange', async function (l) {
@@ -93,8 +91,7 @@ App.addListener('appUrlOpen', async function (data) {
 
 // When the app is closed and NFC event opens the app
 App.getLaunchUrl().then((data) => {
-    redirectToProfile(data)
+	redirectToProfile(data);
 });
 
-
 export { app };

package/src/mixins/apple.mixin.js

@@ -1,59 +1,61 @@
-import to from 'await-to-js'
-import AuthService from '../services/AuthService'
-import {SignInWithApple} from '@capacitor-community/apple-sign-in';
+import to from 'await-to-js';
+import AuthService from '../services/AuthService';
+import { SignInWithApple } from '@capacitor-community/apple-sign-in';
 
-import { jwtDecode } from "jwt-decode";
-import {EventBus} from '../store/event-bus';
+import { jwtDecode } from 'jwt-decode';
+import { EventBus } from '../store/event-bus';
 export default {
-  data () {
-    return {
-      appleLoad: false
-    }
-  },
-  computed: {
-    displayAppleLogin () {
-      return ((Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'ios') || (!Capacitor.isNativePlatform() && this.isiOS));
-    }
-  },
-  methods: {
-    async appleLogin () {
-      this.appleLoad = true
-      const [errAuth, user] = await to(SignInWithApple.authorize({
-        clientId: 'co.tapni.applelogin',
-        redirectURI: 'https://' + window.location.host + '/login',
-        scopes: 'email name'
-      }))
-      if (errAuth) return this.appleLoad = false
-      user.response.tokenData = jwtDecode(user.response.identityToken);
+	data() {
+		return {
+			appleLoad: false
+		};
+	},
+	computed: {
+		displayAppleLogin() {
+			return (Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'ios') || (!Capacitor.isNativePlatform() && this.isiOS);
+		}
+	},
+	methods: {
+		async appleLogin() {
+			this.appleLoad = true;
+			const [errAuth, user] = await to(
+				SignInWithApple.authorize({
+					clientId: 'co.tapni.applelogin',
+					redirectURI: 'https://' + window.location.host + '/login',
+					scopes: 'email name'
+				})
+			);
+			if (errAuth) return (this.appleLoad = false);
+			user.response.tokenData = jwtDecode(user.response.identityToken);
 
-      if (user && user.response && user.response.identityToken) {
-        // Track Referrals
-        if (this.referral) user.response.ref = this.referral;
+			if (user && user.response && user.response.identityToken) {
+				// Track Referrals
+				if (this.referral) user.response.ref = this.referral;
 
-        // Code Login
-        if (this.display === 'popup') user.response_type = 'code';
+				// Code Login
+				if (this.display === 'popup') user.response_type = 'code';
 
-        const [err, response] = await to(AuthService.appleSDK(user.response, this.$storex))
-        if (err) {
-          this.appleLoad = false
-          EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-          return this.errorHandler(err)
-        }
-        if (response.data.success) {
-          if (this.display === 'popup') {
-            return window.parent?.postMessage({ code: response.data.auth_code, state: this.$route.query.state }, '*');
-          }
-          await this.loginSetup(response)
-          await this.getLoggedInAccounts()
-          this.loginSuccess({ ...response, isModal: this.isModal });
-          setTimeout(() => {
-            this.appleLoad = false
-          }, 1000)
-        } else this.errorSnack(this.ssoLang[this.appLanguage].unexpected_err)
-      } else {
-        this.appleLoad = false
-        EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-      }
-    }
-  }
-}
+				const [err, response] = await to(AuthService.appleSDK(user.response, this.$storex));
+				if (err) {
+					this.appleLoad = false;
+					EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+					return this.errorHandler(err);
+				}
+				if (response.data.success) {
+					if (this.display === 'popup') {
+						return window.parent?.postMessage({ code: response.data.auth_code, state: this.$route.query.state }, '*');
+					}
+					await this.loginSetup(response);
+					await this.getLoggedInAccounts();
+					this.loginSuccess({ ...response, isModal: this.isModal });
+					setTimeout(() => {
+						this.appleLoad = false;
+					}, 1000);
+				} else this.errorSnack(this.ssoLang[this.appLanguage].unexpected_err);
+			} else {
+				this.appleLoad = false;
+				EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+			}
+		}
+	}
+};

package/src/mixins/auth.mixin.js

@@ -1,6 +1,6 @@
 import { createNamespacedHelpers } from 'vuex';
 const { mapState, mapActions, mapGetters } = createNamespacedHelpers('auth');
-import GlobalMixin from './global.mixin'
+import GlobalMixin from './global.mixin';
 
 export default {
   mixins: [GlobalMixin],
@@ -64,6 +64,7 @@ export default {
       'setRedirectUri',
       'setDisplay',
       'setState',
+      'setRealm',
       'setResponseType',
       'switchAccount',
       'loginSetup',
@@ -78,7 +79,7 @@ export default {
         if (this.$route.query.display) this.setDisplay(this.$route.query.display);
         if (this.$route.query.state) this.setState(this.$route.query.state)
         if (this.$route.query.response_type) this.setResponseType(this.$route.query.response_type);
-        if (this.$route.query.realm && this.$storage) this.setRealm(this.$route.query.realm);
+        if (this.$route.query.realm) this.setRealm(this.$route.query.realm);
       },
       deep: true,
     },

package/src/mixins/global.mixin.js

@@ -30,10 +30,10 @@ export default {
   },
   methods: {
     getIcon(icon) {
-      if (!this.isNative && false) {
+      if (!this.isNative) {
         return 'https://cdn.tapni.co/icons/' + icon;
       } else {
-        return `http://localhost:7777/icons/${icon}`;
+        return `/icons/${icon}`;
       }
     },
     errorHandler(error) {
@@ -110,7 +110,7 @@ export default {
       try {
        return await window.grecaptcha.execute(import.meta.env.VITE_APP_GOOGLE_RECAPTCHA_SITE_KEY, {action: action});
       } catch (err){
-        console.log(err)
+        console.error('grecaptcha_error', err)
         return null
       }
     },

package/src/mixins/google.mixin.js

@@ -1,60 +1,59 @@
-import to from 'await-to-js'
-import AuthService from '../services/AuthService'
-import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth'
-import {EventBus} from "../store/event-bus";
+import to from 'await-to-js';
+import AuthService from '../services/AuthService';
+import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth';
+import { EventBus } from '../store/event-bus';
 
 export default {
-  data () {
-    return {
-      googleLoad: false
-    }
-  },
-  computed: {
-    displayGoogleLogin () {
-      return true;
-    }
-  },
-  mounted () {
-    GoogleAuth.initialize()
-  },
-  methods: {
-    async googleLogin () {
+	data() {
+		return {
+			googleLoad: false
+		};
+	},
+	computed: {
+		displayGoogleLogin() {
+			return true;
+		}
+	},
+	mounted() {
+		GoogleAuth.initialize();
+	},
+	methods: {
+		async googleLogin() {
+			this.googleLoad = true;
+			let [errAuth, user] = await to(GoogleAuth.signIn());
+			if (errAuth) return (this.googleLoad = false);
 
-      this.googleLoad = true
-      let [errAuth, user] = await to(GoogleAuth.signIn())
-      if (errAuth) return this.googleLoad = false
+			// Track Referrals
+			if (this.referral) user.ref = this.referral;
 
-      // Track Referrals
-      if (this.referral) user.ref = this.referral;
+			if (user.authentication && (user.authentication.accessToken || user.authentication.idToken)) {
+				// Track Referrals
+				if (this.referral) user.ref = this.referral;
 
-      if (user.authentication && (user.authentication.accessToken || user.authentication.idToken)) {
-        // Track Referrals
-        if (this.referral) user.ref = this.referral;
+				// Code Login
+				if (this.display === 'popup') user.response_type = 'code';
 
-        // Code Login
-        if (this.display === 'popup') user.response_type = 'code';
-
-        const [err, response] = await to(AuthService.googleSDK(user, this.$storex))
-        if (err) {
-          this.googleLoad = false
-          EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-          return this.errorHandler(err)
-        }
-        if (response.data.success) {
-          if (this.display === 'popup') {
-            return window.parent?.postMessage({ code: response.data.auth_code, state: this.$route.query.state }, '*');
-          }
-          await this.loginSetup(response)
-          await this.getLoggedInAccounts()
-          this.loginSuccess({ ...response, isModal: this.isModal });
-          setTimeout(() => {
-            this.googleLoad = false
-          }, 1000)
-        } else this.errorSnack(this.ssoLang[this.appLanguage].unexpected_err)
-      } else {
-        this.googleLoad = false
-        EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-      }
-    }
-  }
-}
+				const [err, response] = await to(AuthService.googleSDK(user, this.$storex));
+				if (err) {
+					this.googleLoad = false;
+					EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+					return this.errorHandler(err);
+				}
+				if (response.data.success) {
+					if (this.display === 'popup') {
+						return window.parent?.postMessage({ code: response.data.auth_code, state: this.$route.query.state }, '*');
+					}
+					await this.loginSetup(response);
+					await this.getLoggedInAccounts();
+					this.loginSuccess({ ...response, isModal: this.isModal });
+					setTimeout(() => {
+						this.googleLoad = false;
+					}, 1000);
+				} else this.errorSnack(this.ssoLang[this.appLanguage].unexpected_err);
+			} else {
+				this.googleLoad = false;
+				EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+			}
+		}
+	}
+};

package/src/mixins/microsoft.mixin.js

@@ -27,14 +27,11 @@ export default {
           scopes: ["User.Read"],
           knownAuthorities: [],
           keyHash: "4+5wCp8QcLptlO0aeP5RDTTOWyg=", // Android,
-          redirectUri:
-            import.meta.env.DEV
-              ? `${window.location.origin}/login`
-              : "https://" + window.location.host + "/login",
+          redirectUri: `${window.location.origin}/login`
         })
       );
       if (errAuth) {
-        console.log("Error: " + JSON.stringify(errAuth));
+        console.error("MsAuthPlugin Error: " + JSON.stringify(errAuth));
         return (this.microsoftLoad = false);
       }
 

package/src/mixins/okta.mixin.js

@@ -89,7 +89,7 @@ export default {
 			//if (response && response.data && response.data.url) {
 			let code;
 			window.addEventListener("message", async (message)=> {
-				if (!this.allowedOriginsAuth.includes(message.origin)) return console.log('Origin is not allowed!');
+				if (!this.allowedOriginsAuth.includes(message.origin)) return console.error('Origin is not allowed!');
 				if(message.data.type === 'okta') {
 					code = message.data.code;
 					await self.exchangeCode({domain: data.domain, code, clientID: data.clientID});