@tapni/auth 0.0.170 → 0.0.172

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) {
+		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,79 +1,26 @@
 import { createNamespacedHelpers } from 'vuex';
 const { mapState, mapActions, mapGetters } = createNamespacedHelpers('auth');
-import GlobalMixin from './global.mixin'
+import GlobalMixin from './global.mixin';
 
 export default {
-  mixins: [GlobalMixin],
-  computed: {
-    ...mapState([
-      '$storex',
-      'refreshing',
-      'loggedInUserId',
-      'account',
-      'device',
-      'loggedInAccounts',
-      'ssoLang',
-      'display',
-      'redirect_uri',
-      'response_type',
-      'state',
-      'allowedOriginsAuth'
-    ]),
-    ...mapGetters([
-      'accessToken',
-      'refreshTokens',
-      'isLoggedIn',
-      'renderView',
-      'appLanguage'
-    ])
-  },
-  methods: {
-    ...mapActions([
-      'setLoggedInAccounts',
-      'setLoggedInUserId',
-      'getRefreshTokens',
-      'setRefreshToken',
-      'unsetRefreshToken',
-      'setToken',
-      'setView',
-      'setStorage',
-      'updateLang',
-      'login',
-      'register',
-      'verify',
-      'reset',
-      'exchangeAuthCode',
-      'changePassword',
-      'newPassword',
-      'deleteAccount',
-      'registerDevice',
-      'addFcmToken',
-      'acceptCompanyInvitation',
-      'logout',
-      'getCompanyBySSOEmail',
-      'getLoggedInAccounts',
-      'loginUsingQR',
-      'getAccountSettings',
-      'setRedirectUri',
-      'setDisplay',
-      'setState',
-      'setResponseType',
-      'switchAccount',
-      'loginSetup',
-      'loginSuccess',
-      'refreshTokenAction'
-    ])
-  },
-  watch: {
-    "$route.query": {
-      handler: function handler() {
-        if (this.$route.query.redirect_uri) this.setRedirectUri(this.$route.query.redirect_uri);
-        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);
-      },
-      deep: true,
-    },
-  },
+	mixins: [GlobalMixin],
+	computed: {
+		...mapState(['$storex', 'refreshing', 'loggedInUserId', 'account', 'device', 'loggedInAccounts', 'ssoLang', 'display', 'redirect_uri', 'response_type', 'state', 'allowedOriginsAuth']),
+		...mapGetters(['accessToken', 'refreshTokens', 'isLoggedIn', 'renderView', 'appLanguage'])
+	},
+	methods: {
+		...mapActions(['setLoggedInAccounts', 'setLoggedInUserId', 'getRefreshTokens', 'setRefreshToken', 'unsetRefreshToken', 'setToken', 'setView', 'setStorage', 'updateLang', 'login', 'register', 'verify', 'reset', 'exchangeAuthCode', 'changePassword', 'newPassword', 'deleteAccount', 'registerDevice', 'addFcmToken', 'acceptCompanyInvitation', 'logout', 'getCompanyBySSOEmail', 'getLoggedInAccounts', 'loginUsingQR', 'getAccountSettings', 'setRedirectUri', 'setDisplay', 'setState', 'setRealm', 'setResponseType', 'switchAccount', 'loginSetup', 'loginSuccess', 'refreshTokenAction'])
+	},
+	watch: {
+		'$route.query': {
+			handler: function handler() {
+				if (this.$route.query.redirect_uri) this.setRedirectUri(this.$route.query.redirect_uri);
+				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.setRealm(this.$route.query.realm);
+			},
+			deep: true
+		}
+	}
 };

package/src/mixins/facebook.mixin.js

@@ -1,78 +1,79 @@
-import to from 'await-to-js'
-import AuthService from '../services/AuthService'
+import to from 'await-to-js';
+import AuthService from '../services/AuthService';
 import { FacebookLogin } from '@capacitor-community/facebook-login';
-import {EventBus} from "../store/event-bus";
+import { EventBus } from '../store/event-bus';
 
 window.fbAsyncInit = function () {
-  // eslint-disable-next-line no-undef
-  FB.init({
-    appId: '202577611527680',
-    cookie: true, // enable cookies to allow the server to access the session
-    xfbml: true, // parse social plugins on this page
-    version: 'v16.0' // use graph api current version
-  })
+	// eslint-disable-next-line no-undef
+	FB.init({
+		appId: '202577611527680',
+		cookie: true, // enable cookies to allow the server to access the session
+		xfbml: true, // parse social plugins on this page
+		version: 'v16.0' // use graph api current version
+	});
 };
 
 // Load the SDK asynchronously
 (function (d, s, id) {
-  // eslint-disable-next-line one-var
-  var js, fjs = d.getElementsByTagName(s)[0]
-  if (d.getElementById(id)) return
-  js = d.createElement(s); js.id = id
-  js.src = 'https://connect.facebook.net/en_US/sdk.js'
-  fjs.parentNode.insertBefore(js, fjs)
-}(document, 'script', 'facebook-jssdk'))
+	// eslint-disable-next-line one-var
+	var js,
+		fjs = d.getElementsByTagName(s)[0];
+	if (d.getElementById(id)) return;
+	js = d.createElement(s);
+	js.id = id;
+	js.src = 'https://connect.facebook.net/en_US/sdk.js';
+	fjs.parentNode.insertBefore(js, fjs);
+})(document, 'script', 'facebook-jssdk');
 
 export default {
-  data () {
-    return {
-      facebookLoad: false
-    }
-  },
-  computed: {
-    fbLoginUrl () {
-      return 'https://www.facebook.com/v16.0/dialog/oauth?client_id=202577611527680&state={"oauth":"facebook"}&response_type=code%20granted_scopes&scope=email&redirect_uri=https://' + window.location.host + '/login'
-    },
-    displayFacebookLogin () {
-        return false;
-    }
-  },
-  methods: {
-    async facebookLogin () {
-      this.facebookLoad = true
-      const FACEBOOK_PERMISSIONS = ['email']
-      const [errAuth, user] = await to(FacebookLogin.login({permissions: FACEBOOK_PERMISSIONS}))
-      if (errAuth) return this.facebookLoad = false
+	data() {
+		return {
+			facebookLoad: false
+		};
+	},
+	computed: {
+		fbLoginUrl() {
+			return 'https://www.facebook.com/v16.0/dialog/oauth?client_id=202577611527680&state={"oauth":"facebook"}&response_type=code%20granted_scopes&scope=email&redirect_uri=https://' + window.location.host + '/login';
+		},
+		displayFacebookLogin() {
+			return false;
+		}
+	},
+	methods: {
+		async facebookLogin() {
+			this.facebookLoad = true;
+			const FACEBOOK_PERMISSIONS = ['email'];
+			const [errAuth, user] = await to(FacebookLogin.login({ permissions: FACEBOOK_PERMISSIONS }));
+			if (errAuth) return (this.facebookLoad = false);
 
-      // Track Referrals
-      if (this.referral) user.ref = this.referral;
+			// Track Referrals
+			if (this.referral) user.ref = this.referral;
 
-      if (this.display === 'popup') user.response_type = 'code';
+			if (this.display === 'popup') user.response_type = 'code';
 
-      if (user && user.accessToken) {
-
-        const [err, response] = await to(AuthService.facebookSDK(user, this.$storex))
-        if (err) {
-          this.facebookLoad = 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.$router.push('/' + response.data.data.username + '#edit')
-          setTimeout(() => {
-            this.facebookLoad = false
-            EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-          }, 1000)
-        } else this.errorSnack(this.ssoLang[this.appLanguage].unexpected_err)
-      } else {
-        this.facebookLoad = false
-        EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-      }
-    }
-  }
-}
+			if (user && user.accessToken) {
+				const [err, response] = await to(AuthService.facebookSDK(user, this.$storex));
+				if (err) {
+					this.facebookLoad = 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.$router.push('/' + response.data.data.username + '#edit');
+					setTimeout(() => {
+						this.facebookLoad = false;
+						EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+					}, 1000);
+				} else this.errorSnack(this.ssoLang[this.appLanguage].unexpected_err);
+			} else {
+				this.facebookLoad = false;
+				EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+			}
+		}
+	}
+};