@tapni/auth 0.0.109 → 0.0.118

package/src/mixins/auth.mixin.js

@@ -1,522 +1,65 @@
-import to from "await-to-js";
-
-import UserService from "../services/UserService";
-import DeviceService from "../services/DeviceService";
-import AuthService from "../services/AuthService";
-import CompanyService from "../services/CompanyService";
-
-import { EventBus } from "../store/event-bus";
-import { Device } from "@capacitor/device";
-import axios from "axios";
-import en from "../store/locales/en.js";
-import de from "../store/locales/de.js";
-import es from "../store/locales/es.js";
-import fr from "../store/locales/fr.js";
-import it from "../store/locales/it.js";
-import sr from "../store/locales/sr.js";
-import tr from "../store/locales/tr.js";
-import cn from "../store/locales/cn.js";
-import kr from "../store/locales/kr.js";
+import { mapState, mapActions, mapGetters } from 'vuex';
 import GlobalMixin from './global.mixin'
+
 export default {
   mixins: [GlobalMixin],
-  data() {
-    return {
-      lang: "en",
-      token: "",
-      refreshToken: "",
-      refreshing: "",
-      loggedInUserId: "",
-      ssoUser: {},
-      ssoCompany: {},
-      device: {},
-      loggedInAccounts: {},
-      ssoLang: {
-        en: en.state,
-        de: de.state,
-        es: es.state,
-        fr: fr.state,
-        it: it.state,
-        sr: sr.state,
-        tr: tr.state,
-        cn: cn.state,
-        kr: kr.state,
-      },
-      display: import.meta.env.VITE_APP_MODE,
-      redirect_uri: import.meta.env.VITE_APP_APP_ROOT + "/callback/auth",
-      response_type: "token",
-      state: "",
-      allowedOrigins: [
-        "https://business.tapni.com",
-        "https://business-dev.tapni.com",
-        "https://tapni.com",
-        "https://tapni.co",
-        "https://t.link",
-        "https://my.tapni.com",
-        "https://my.tapni.co",
-        "https://dev.tapni.co",
-        "https://dev.tapni.com",
-        "https://auth.tapni.com",
-        "https://auth.tapni.co",
-        "https://mailsign.link",
-        "https://sign.tapni.com",
-        "https://qrcodetoolkit.com",
-        "https://qr.tapni.com",
-        "https://designer.tapni.com",
-        "https://designer-dev.tapni.com",
-      ],
-    };
-  },
   computed: {
-    isLoggedIn() {
-      return !!this.token && this.token !== "" && this.token !== "null";
-    },
-    renderView() {
-      if (this.display === "redirect") {
-        return false;
-      } else return this.view;
-    },
-    appLanguage () {
-      return this.display === 'npm' ? this.appLang : this.lang;
-    }
-  },
-  mounted() {
-    if (this.$route.query.redirect_uri)
-      this.redirect_uri = this.$route.query.redirect_uri;
-    if (this.$route.query.display) this.display = this.$route.query.display;
-    if (this.$route.query.state) this.state = this.$route.query.state;
-    if (this.$route.query.response_type)
-      this.response_type = this.$route.query.response_type;
-    if (this.$route.query.realm) this.$storage.realm = this.$route.query.realm;
-
-    EventBus.$on("updateLang", this.updateLang);
-
-    if (import.meta.env.NODE_ENV === "development") {
-      this.allowedOrigins.push("http://localhost:8082");
-      this.allowedOrigins.push("http://localhost:7777");
-      this.allowedOrigins.push("http://localhost:5173");
-    }
+    ...mapState([
+      '$storex',
+      'refreshing',
+      'loggedInUserId',
+      'account',
+      'device',
+      'loggedInAccounts',
+      'ssoLang',
+      'display',
+      'redirect_uri',
+      'response_type',
+      'state',
+      'allowedOrigins'
+    ]),
+    ...mapGetters([
+      'isLoggedIn',
+      'renderView',
+      'appLanguage'
+    ])
   },
   methods: {
-    errorHandler(error) {
-      if (
-        error &&
-        error.response &&
-        error.response.data &&
-        error.response.data.error
-      ) {
-        if (error.response.data.error === "ACCESS_DENIED") {
-          return this.logout();
-        }
-        // Link click network error bug fix
-        if (
-          !error.response.data.error.includes("Network Error") &&
-          !error.response.data.error.includes("TOKEN_EXPIRED") &&
-          !error.response.data.error.includes("Cannot read properties")
-        ) {
-          this.errorSnack(error.response.data.error);
-        }
-      }
-      return error;
-    },
-    errorSnack(message) {
-      let snackbar = document.getElementById("snackbar");
-      let errMessage = document.getElementById("errorMessage");
-      let errorSnack = document.getElementById("errorSnack");
-      errMessage.innerHTML = message;
-      snackbar.classList.add("show-snack");
-      errorSnack.classList.add("active-snack");
-      setTimeout(function () {
-        errorSnack.classList.remove("active-snack");
-        snackbar.classList.remove("show-snack");
-      }, 3000);
-    },
-    successSnack(message) {
-      let snackbar = document.getElementById("snackbar");
-      let successMessage = document.getElementById("successMessage");
-      let successSnack = document.getElementById("successSnack");
-      successMessage.innerHTML = message;
-      snackbar.classList.add("show-snack");
-      successSnack.classList.add("active-snack");
-      setTimeout(function () {
-        successSnack.classList.remove("active-snack");
-        snackbar.classList.remove("show-snack");
-      }, 3000);
-    },
-    closeSnacks() {
-      document.getElementById("snackbar").classList.remove("show-snack");
-      document.getElementById("successSnack").classList.remove("active-snack");
-      document.getElementById("errorSnack").classList.remove("active-snack");
-    },
-
-    async eventLog(data) {
-      const [err, response] = await to(
-        UserService.eventLog(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response;
-    },
-    async maintenance() {
-      const [err, response] = await to(
-        axios.get("https://status.tapni.co/data/maintenance.json")
-      );
-      if (err) return console.error(err);
-      if (response) {
-        let maintenanceState = response.data;
-        if (typeof response.data === "string") {
-          maintenanceState = JSON.parse(response.data);
-        }
-
-        if (maintenanceState.api && maintenanceState.api.maintenanceActive) {
-          location.href =
-            "https://t.link/maintenance?msg=" + maintenanceState.api.msg;
-        }
-      }
-    },
-    async loginSetup(response) {
-      // Save Refresh Token
-      if (response.data.refreshToken)
-        this.setRefreshToken(response.data.refreshToken);
-
-      // Save Access Token
-      if (response.data.token) this.setToken(response.data.token);
-
-      this.setLoggedInUserId(response.data.data.id);
-
-      this.$storage.UserId = response.data.data.id;
-      this.$storage.username = response.data.data.username;
-      this.$storage.localUser = response.data.data;
-
-      if (response.isModal === true) {
-        this.setLoggedInAccounts([
-          {
-            id: response.data.data.id,
-            username: response.data.data.username,
-            refreshToken: response.data.refreshToken,
-            photo: response.data.data.photo,
-          },
-        ]);
-      }
-
-      // await this.registerDevice();
-      // if (Capacitor.isNativePlatform()) initPushNotifications();
-    },
-    async switchAccount(username) {
-      this.$storage.username = username;
-      if (this.loggedInAccounts[username]) {
-        this.$storage.UserId = this.loggedInAccounts[username].id;
-        this.setLoggedInUserId(this.loggedInAccounts[username].id);
-        this.setRefreshToken(this.loggedInAccounts[username].refreshToken);
-        await this.refreshTokenAction({...this.loggedInAccounts[username], storage: this.$storage });
-      }
-
-      EventBus.$emit("ssoEvent", { name: "switchAccount",  data: { username }, });
-    },
-    async refreshTokenAction(data) {
-      return new Promise(async (resolve, reject) => {
-        if (!data.refreshToken || this.refreshing) {
-          return resolve(null);
-        }
-
-        this.refreshing = true;
-        const [err, response] = await to(
-            AuthService.refreshToken({
-              id: data.id,
-              refreshToken: data.refreshToken,
-              refreshTokenAction: true
-            }, data.storage)
-        );
-        if (err && err.response && err.response.data.error === "ACCESS_DENIED") {
-          this.logout(data.refreshToken, false);
-          return location.reload();
-        }
-
-        // Set new access token
-        if (response && response.data) {
-          EventBus.$emit("setToken", response.data.token);
-          data.storage.token = response.data.token;
-          EventBus.$emit("ssoEvent", { name: "setStorage", data: data.storage });
-          resolve(response.data.token);
-        }
-        this.refreshing = false;
-      })
-    },
-    async login(data) {
-      const [err, response] = await to(AuthService.login(data, this.$storage));
-      if (err) return this.errorHandler(err);
-      if (response.data.success) {
-        if (this.display === "npm") {
-          this.loginSetup({ ...response, isModal: data.isModal });
-          await this.getLoggedInAccounts();
-        }
-
-        this.loginSuccess({ ...response, isModal: data.isModal });
-
-        return true;
-      }
-    },
-    loginSuccess(response) {
-      if (this.display === "redirect") {
-        if (this.redirect_uri &&
-          !this.allowedOrigins.some((domain) =>
-            this.redirect_uri.startsWith(domain)
-          )
-        ) {
-          return console.error("Redirect URI not allowed");
-        }
-
-        location.href = this.redirect_uri +
-          "?code=" +
-          response.data.auth_code +
-          "&state=" +
-          this.state;
-      } else if (this.display === "popup") {
-        this.allowedOrigins.forEach((domain) => {
-          window.parent?.postMessage(
-            { code: response.data.auth_code, state: this.$route.query.state },
-            domain
-          );
-        });
-      } else if (this.display === "npm") {
-        EventBus.$emit('ssoEvent', {name: 'setLoading', data: true})
-        EventBus.$emit("ssoEvent", { name: "setStorage", data: this.$storage });
-        EventBus.$emit("ssoEvent", { name: "getUser", data: {username: response.data.data.username} });
-
-        if (response.isModal) {
-          EventBus.$emit("closeModal");
-          this.successSnack(this.ssoLang[this.appLanguage].success_login);
-          setTimeout(() => {
-            location.reload();
-          }, 1500);
-        }
-        this.$router.push("/" + response.data.data.username + "#edit");
-      }
-    },
-    async register(data) {
-      const [err, response] = await to(
-        AuthService.register(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response;
-    },
-    async verify(data) {
-      const [err, response] = await to(AuthService.verify(data, this.$storage));
-      if (err) return this.errorHandler(err);
-      return response;
-    },
-    async reset(data) {
-      const [err, response] = await to(
-        AuthService.sendResetEmail(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      if (response.data.success) {
-        this.successSnack(this.ssoLang[this.appLanguage].password_reset_success);
-      }
-    },
-    async exchangeAuthCode(data) {
-      const [err, response] = await to(AuthService.exchangeAuthCode(data, this.$storage));
-      if (err) return this.errorHandler(err);
-      await this.loginSetup(response);
-      await this.getLoggedInAccounts();
-      this.loginSuccess(response);
-    },
-    async changePassword(data) {
-      const [err, response] = await to(
-        AuthService.changePassword(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response.data.success;
-    },
-    async newPassword(data) {
-      const [err, response] = await to(
-        UserService.newPassword(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response.data.success;
-    },
-    async deleteAccount(data) {
-      const [err, response] = await to(
-        UserService.deleteAccount(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response.data.success;
-    },
-    async registerDevice() {
-      const deviceID = await Device.getId();
-      const deviceInfo = await Device.getInfo();
-      let deviceData = {
-        device_id: deviceID.uuid,
-        platform: deviceInfo.platform,
-        device_info: {
-          model: deviceInfo.model,
-          manufacturer: deviceInfo.manufacturer,
-          operatingSystem: deviceInfo.operatingSystem,
-          osVersion: deviceInfo.osVersion,
-          isVirtual: deviceInfo.isVirtual,
-          webViewVersion: deviceInfo.webViewVersion,
-        },
-      };
-      const [err, response] = await to(
-        DeviceService.registerDevice(deviceData, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response;
-    },
-    async addFcmToken(data) {
-      const [err, response] = await to(
-        DeviceService.addFcmToken(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response;
-    },
-    async acceptCompanyInvitation(code) {
-      const [err, response] = await to(
-        CompanyService.acceptCompanyInvitation(code, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response;
-    },
-    async logout(refreshToken, sendRequest = true) {
-      if (sendRequest && refreshToken) {
-        AuthService.logout({ token: refreshToken }, this.$storage);
-      }
-
-      if (this.$storage) {
-        this.$storage.username = '';
-        this.$storage.UserId = '';
-        this.$storage.localUser = '';
-        this.setToken('');
-      }
-      this.setLoggedInUserId('');
-
-      const remainingRefreshTokens = this.unsetRefreshToken(refreshToken);
-
-      if (remainingRefreshTokens.length >= 1) {
-        Object.keys(this.loggedInAccounts).forEach((username) => {
-          if (this.loggedInAccounts[username].refreshToken === remainingRefreshTokens[0]) {
-
-            this.refreshTokenAction({...this.loggedInAccounts[username], storage: this.$storage }).then(() => {
-              this.setLoggedInUserId(this.loggedInAccounts[username].id);
-              if (this.$storage) {
-                this.$storage.username = username;
-                this.$storage.UserId = this.loggedInAccounts[username].id;
-              }
-              this.getLoggedInAccounts();
-              this.$router.push("/" + username);
-
-              setTimeout(() => {
-                location.reload();
-              }, 1500)
-            });
-          }
-        });
-      } else {
-        this.setUser(null);
-        this.$router.push("/welcome");
-      }
-    },
-    async getCompanyBySSOEmail(data) {
-      const [err, response] = await to(
-        CompanyService.getBySSOEmail(data.email, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      if (response.data.success) {
-        return response.data;
-      }
-    },
-    async getLoggedInAccounts(refreshTokens) {
-      if (!refreshTokens) refreshTokens = this.getRefreshTokens();
-      if (refreshTokens && refreshTokens.length >= 1) {
-        const [err, response] = await to(
-            AuthService.getLoggedInAccounts({ refreshTokens }, this.$storage)
-        );
-        if (err) return this.errorHandler(err);
-        if (response && response.data && response.data.success) {
-          this.setLoggedInAccounts(response.data.accounts);
-        }
-      }
-    },
-    async loginUsingQR(data) {
-      const [err, response] = await to(
-        UserService.loginUsingQR(data, this.$storage)
-      );
-      if (err) return this.errorHandler(err);
-      return response.data.success;
-    },
-    setLoggedInAccounts(accounts) {
-      this.loggedInAccounts = {};
-      accounts.forEach((account) => {
-        this.loggedInAccounts[account.username] = account;
-      });
-      EventBus.$emit("ssoEvent", { name: "setLoggedInAccounts", data: accounts });
-    },
-    setLoggedInUserId(id) {
-      this.loggedInUserId = id;
-    },
-    setUser(user) {
-      this.ssoUser = user;
-      if (
-        this.$storage &&
-        this.ssoUser &&
-        this.$storage.username === this.ssoUser.username
-      ) {
-        this.appLanguage = user.ssoLang;
-      }
-    },
-    getRefreshTokens() {
-      if (this.$storage && this.$storage.refreshTokens) return this.$storage.refreshTokens.split(',')
-      else return [];
-    },
-    setRefreshToken(token) {
-      // Get all refresh tokens
-      let refreshTokens = this.getRefreshTokens();
-
-      // If token exists, add to the top of the list
-      if (!refreshTokens.includes(token)) {
-        refreshTokens.unshift(token);
-      } else {
-        // Move token to the top of the list
-        refreshTokens = refreshTokens.filter((t) => t !== token);
-        refreshTokens.unshift(token);
-      }
-
-      this.$storage.refreshTokens = refreshTokens.join(",");
-    },
-    unsetRefreshToken(refreshToken) {
-      // Get all refresh tokens
-      let refreshTokens = this.getRefreshTokens();
-
-      refreshTokens = refreshTokens.filter((t) => t !== refreshToken);
-
-      if (this.$storage) {
-        this.$storage.refreshTokens = refreshTokens.join(",");
-      }
-
-      return refreshTokens;
-    },
-    setToken(token) {
-      this.$storage.token = token;
-      this.token = token;
-    },
-    setUserID(userID) {
-      this.$storage.UserId = userID;
-    },
-    updateLang(lang) {
-      this.lang = lang;
-    }
+    ...mapActions([
+      'setLoggedInAccounts',
+      'setLoggedInUserId',
+      'getRefreshTokens',
+      'setRefreshToken',
+      'unsetRefreshToken',
+      'setToken',
+      'setUserID',
+      'updateLang',
+      'login',
+      'register',
+      'verify',
+      'reset',
+      'exchangeAuthCode',
+      'changePassword',
+      'newPassword',
+      'deleteAccount',
+      'registerDevice',
+      'addFcmToken',
+      'acceptCompanyInvitation',
+      'logout',
+      'getCompanyBySSOEmail',
+      'getLoggedInAccounts',
+      'loginUsingQR',
+      'getAccountSettings',
+    ])
   },
   watch: {
     "$route.query": {
       handler: function handler() {
-        if (this.$route.query.redirect_uri)
-          this.redirect_uri = this.$route.query.redirect_uri;
-        if (this.$route.query.display) this.display = this.$route.query.display;
-        if (this.$route.query.state) this.state = this.$route.query.state;
-        if (this.$route.query.response_type)
-          this.response_type = this.$route.query.response_type;
-        if (this.$route.query.realm)
-          this.$storage.realm = this.$route.query.realm;
-        if (this.$route.query.qrLogin) this.changeLoginToQr();
+        if (this.$route.query.redirect_uri) this.$store.dispatch('setRedirectUri', this.$route.query.redirect_uri);
+        if (this.$route.query.display) this.$store.dispatch('setDisplay', this.$route.query.display);
+        if (this.$route.query.state) this.$store.dispatch('setState', this.$route.query.state)
+        if (this.$route.query.response_type) this.$store.dispatch('setResponseType', this.$route.query.response_type);
+        if (this.$route.query.realm && this.$storage) this.$store.dispatch('setRealm', this.$route.query.realm);
       },
       deep: true,
     },

package/src/mixins/facebook.mixin.js

@@ -34,7 +34,7 @@ export default {
       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 // (this.ssoCompany?.login?.facebook_login && !this.isModal) ?? true;
+        return false;
     }
   },
   methods: {
@@ -51,7 +51,7 @@ export default {
 
       if (user && user.accessToken) {
 
-        const [err, response] = await to(AuthService.facebookSDK(user, this.$storage))
+        const [err, response] = await to(AuthService.facebookSDK(user, this.$storex))
         if (err) {
           this.facebookLoad = false
           EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})

package/src/mixins/global.mixin.js

@@ -1,11 +1,11 @@
 import {Capacitor} from '@capacitor/core';
-
+import { EventBus } from "../store/event-bus";
 export default {
   computed: {
     home() {
-      if (this.$storage && this.$storage.token && this.$storage.username) {
-        if (import.meta.env.VITE_APP_MODE === 'npm') return '/' + this.$storage.username
-        if (import.meta.env.VITE_APP_MODE === 'redirect') return 'https://t.link/'
+      if (this.$storex && this.$storex.token && this.$storex.username) {
+        if (import.meta.env.VITE_APP_MODE === 'npm') return '/' + this.$storex.username
+        if (import.meta.env.VITE_APP_MODE === 'redirect') return '/account'
       } else return '/welcome'
     },
     isAndroid(){
@@ -37,6 +37,7 @@ export default {
         ) {
           this.logout();
         }
+
         // Link click network error bug fix
         if (!error.response.data.error.includes('Network Error') && !error.response.data.error.includes('Cannot read properties')) {
           this.errorSnack(error.response.data.error)

package/src/mixins/google.mixin.js

@@ -11,7 +11,7 @@ export default {
   },
   computed: {
     displayGoogleLogin () {
-      return (this.ssoCompany?.login?.google_login && !this.isModal) ?? true;
+      return true;
     }
   },
   mounted () {
@@ -34,7 +34,7 @@ export default {
         // Code Login
         if (this.display === 'popup') user.response_type = 'code';
 
-        const [err, response] = await to(AuthService.googleSDK(user, this.$storage))
+        const [err, response] = await to(AuthService.googleSDK(user, this.$storex))
         if (err) {
           this.googleLoad = false
           EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})