@tapni/auth 1.0.7 → 1.0.9

package/src/store/store.js

@@ -1,8 +1,8 @@
-import { createStore } from 'vuex'
-import auth from './auth.js'
+import { createStore } from 'vuex';
+import auth from './auth.js';
 
 export default createStore({
-  modules: {
-    auth
-  },
-})
+	modules: {
+		auth
+	}
+});

package/src/views/Account.vue

@@ -103,7 +103,7 @@
         </div>
       </router-link>
 
-      <router-link to="/apps" class="settingRow">
+      <router-link v-if="false" to="/apps" class="settingRow">
         <div class="firstRow">
           <img
               :src="getIcon('apps-black.svg')"
@@ -115,7 +115,7 @@
         </div>
       </router-link>
 
-      <router-link to="/billing" class="settingRow">
+      <router-link v-if="false" to="/billing" class="settingRow">
         <div class="firstRow">
           <img
               :src="getIcon('billing-card-black.svg')"

package/src/views/Callback.vue

@@ -1,46 +1,49 @@
 <template>
- <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>
-   <h4 v-else style="text-align: center; width: 80%; margin: 0 auto; margin-top: 260px; ">{{ssoLang[this.appLanguage].please_wait}}</h4>
- </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>
+		<h4 v-else style="text-align: center; width: 80%; margin: 0 auto; margin-top: 260px">{{ ssoLang[this.appLanguage].please_wait }}</h4>
+	</div>
 </template>
 
 <script>
 /* eslint-disable */
-import OktaMixin from "../mixins/okta.mixin";
-import SamlMixin from "../mixins/saml.mixin";
-import AuthMixin from "../mixins/auth.mixin";
+import OktaMixin from '../mixins/okta.mixin';
+import SamlMixin from '../mixins/saml.mixin';
+import AuthMixin from '../mixins/auth.mixin';
 import { sanitizeUrl } from '@braintree/sanitize-url';
 export default {
-  name: "AuthCallback",
-  mixins: [OktaMixin, SamlMixin, AuthMixin],
+	name: 'AuthCallback',
+	mixins: [OktaMixin, SamlMixin, AuthMixin],
 
-  data() {
-    return {
+	data() {
+		return {};
+	},
 
-    };
-  },
-
-  async mounted() {
-    if(this.$route.path === '/callback/auth') {
-        this.exchangeAuthCode({
-            code: this.$route.query.code
-        })
-    }
-    if(this.$route.path === '/callback/okta') return await this.handleOktaRedirect();
-    if(this.$route.path === '/callback/saml') return await this.handleSamlRedirect();
-  },
-  methods: {
-    inAppRedirect() {
-      let url = sanitizeUrl(location.href);
-      url = url.replace('http', 'tapni')
-      url = url.replace('https', 'tapni')
-      return window.open(url);
+	async mounted() {
+		if (this.$route.path === '/callback/redirect') {
+      return location.href = atob(this.$route.query.uri);
     }
-  },
-
+		if (this.$route.path === '/callback/auth') {
+			this.exchangeAuthCode({
+				code: this.$route.query.code,
+        code_verifier: this.$route.query.code_verifier
+			});
+		}
+		if (this.$route.path === '/callback/okta') return await this.handleOktaRedirect();
+		if (this.$route.path === '/callback/saml') return await this.handleSamlRedirect();
+	},
+	methods: {
+		inAppRedirect() {
+			let url = sanitizeUrl(location.href);
+			url = url.replace('http', 'tapni');
+			url = url.replace('https', 'tapni');
+			return window.open(url);
+		}
+	}
 };
 </script>
 

package/src/views/Login.vue

@@ -152,27 +152,6 @@
         <span v-else class="button--loading-black button__loader"></span>
       </a>
 
-        <!-- Facebook Login Button -->
-      <a
-          @click="facebookLogin"
-          v-if="displayFacebookLogin"
-          class="button-center button button-90 google-button pointer"
-      >
-        <img
-            src="https://cdn.tapni.co/icons/facebook-blue.png"
-            style="
-            position: absolute;
-            margin-left: -9px;
-            padding: 10px 0;
-            height: 100%;
-          "
-        />
-        <span v-if="!facebookLoad"
-        >{{ ssoLang[appLanguage].sign_in_with }} Facebook</span
-        >
-        <span v-else class="button--loading-black button__loader"></span>
-      </a>
-
         <!-- Microsoft Login Button -->
       <a
           @click="microsoftLogin"
@@ -314,7 +293,6 @@
 
 <script>
 import GoogleMixin from "../mixins/google.mixin";
-import FacebookMixin from "../mixins/facebook.mixin";
 import AppleMixin from "../mixins/apple.mixin";
 import MicrosoftMixin from "../mixins/microsoft.mixin";
 import OktaMixin from "../mixins/okta.mixin";
@@ -325,7 +303,7 @@ import { EventBus } from "../store/event-bus";
 import to from "await-to-js";
 export default {
   name: "AuthLogin",
-  mixins: [GoogleMixin, FacebookMixin, AppleMixin, MicrosoftMixin, OktaMixin, SamlMixin, AuthMixin, QRAuthMixin],
+  mixins: [GoogleMixin, AppleMixin, MicrosoftMixin, OktaMixin, SamlMixin, AuthMixin, QRAuthMixin],
   data() {
     return {
       loading: true,
@@ -386,10 +364,10 @@ export default {
           this.forceClose();
           return this.errorSnack(this.ssoLang[this.appLanguage].no_sso_logins);
         } else {
-          if (ssoTypes[0] === "azure")
+          if (ssoTypes[1] === "azure")
             this.microsoftLogin("sso", response.sso.azure.sso);
-          if (ssoTypes[0] === "okta") this.oktaLogin(response.sso.okta.sso);
-          if (ssoTypes[0] === "saml")
+          if (ssoTypes[1] === "okta") this.oktaLogin(response.sso.okta.sso);
+          if (ssoTypes[1] === "saml")
             this.samlLogin(response.sso.saml.sso.loginUrl);
         }
       }

package/src/views/Register.vue

@@ -66,15 +66,6 @@
 		<span v-else class="button--loading-black button__loader"></span>
 	</a>
 
-	<!-- Facebook Login Button -->
-	<a v-if="displayFacebookLogin"
-	   @click="facebookLogin"
-		 class="button-center button button-90 google-button pointer">
-		  <img src="https://cdn.tapni.co/icons/facebook-blue.png" style="position: absolute; margin-left: -10px; padding: 10px 0; height: 100%;"/>
-		  <span v-if="!facebookLoad">{{ssoLang[this.appLanguage].sign_up_with}} Facebook</span>
-		<span v-else class="button--loading-black button__loader"></span>
-	</a>
-
 	<!-- Email Login Button -->
 	<a @click="emailLogin = true" v-if="!emailLogin"
 	   class="button-center button button-90 google-button pointer">
@@ -103,14 +94,13 @@
 
 <script>
 import GoogleMixin from '../mixins/google.mixin'
-import FacebookMixin from '../mixins/facebook.mixin'
 import AppleMixin from '../mixins/apple.mixin'
 import MicrosoftMixin from '../mixins/microsoft.mixin'
 import {EventBus} from "../store/event-bus";
 import AuthMixin from "../mixins/auth.mixin";
 export default {
   name: 'AuthRegister',
-  mixins: [GoogleMixin, FacebookMixin, AppleMixin, MicrosoftMixin, AuthMixin],
+  mixins: [GoogleMixin, AppleMixin, MicrosoftMixin, AuthMixin],
   props: {
   	isModal: {
   	  type: Boolean,

package/src/views/Reset.vue

@@ -1,155 +1,152 @@
 <template>
-  <form v-if="!passwordChange" class="page-login content-boxed content-boxed-padding" @submit.prevent="resetEmail" autocomplete="on">
-    <h3 class="bold no-bottom center-text" style="margin-top: 63px;">{{ssoLang[this.appLanguage].reset_password}}</h3>
-    <p class="half-bottom small-top center-text color-black"></p>
-    <div class="page-login-field half-top color-black">
-	  <i style="padding-top: 10px; margin-left: 10px;">
-		<img src="https://cdn.tapni.co/icons/mail.png" class="responsive-image" style="width: 80%;">
-	  </i>
-	  <input id="emailInput" v-model="email" @keydown.space.prevent type="email" :placeholder="ssoLang[this.appLanguage].email" required>
-	  <em></em>
-	</div>
-    <button type="submit" class="button black-button google-button bg-tapni-grey button-90 button-center uppercase bold full-top">
-      <span v-if="!submitted" class="uppercase">{{ssoLang[this.appLanguage].reset_password}}</span>
-	  <span v-else class="button--loading button__loader"></span>
-	</button>
-    <div class="decoration decoration-lines-thin no-bottom half-top"></div>
-	<p class="close-text center-text half-top color-black">
-	  <span v-html="ssoLang[this.appLanguage].reset_password_p1"></span><a :href="'mailto:support@tapni.com?subject=' + ssoLang[this.appLanguage].password_reset_t"> support@tapni.com</a>
-	</p>
-    <div class="decoration decoration-lines-thin no-bottom half-top"></div>
+	<form v-if="!passwordChange" class="page-login content-boxed content-boxed-padding" @submit.prevent="resetEmail" autocomplete="on">
+		<h3 class="bold no-bottom center-text" style="margin-top: 63px">{{ ssoLang[this.appLanguage].reset_password }}</h3>
+		<p class="half-bottom small-top center-text color-black"></p>
+		<div class="page-login-field half-top color-black">
+			<i style="padding-top: 10px; margin-left: 10px">
+				<img src="https://cdn.tapni.co/icons/mail.png" class="responsive-image" style="width: 80%" />
+			</i>
+			<input id="emailInput" v-model="email" @keydown.space.prevent type="email" :placeholder="ssoLang[this.appLanguage].email" required />
+			<em></em>
+		</div>
+		<button type="submit" class="button black-button google-button bg-tapni-grey button-90 button-center uppercase bold full-top">
+			<span v-if="!submitted" class="uppercase">{{ ssoLang[this.appLanguage].reset_password }}</span>
+			<span v-else class="button--loading button__loader"></span>
+		</button>
+		<div class="decoration decoration-lines-thin no-bottom half-top"></div>
+		<p class="close-text center-text half-top color-black"><span v-html="ssoLang[this.appLanguage].reset_password_p1"></span><a :href="'mailto:support@tapni.com?subject=' + ssoLang[this.appLanguage].password_reset_t"> support@tapni.com</a></p>
+		<div class="decoration decoration-lines-thin no-bottom half-top"></div>
 
-	<div class="page-login-links">
-	  <router-link class="create float-right" to="/verify">{{ssoLang[this.appLanguage].verify_account}}</router-link>
-	  <router-link class="forgot float-left" to="/login">{{ssoLang[this.appLanguage].sign_in}}</router-link>
-	  <div class="clear"></div>
-	</div>
-  </form>
-  <form v-else class="page-login content-boxed content-boxed-padding" @submit.prevent="changePw">
-    <h3 class="bold no-bottom center-text" style="margin-top: 63px;">{{ssoLang[this.appLanguage].password_change}}</h3>
-    <p class="half-bottom small-top center-text color-black">{{ssoLang[this.appLanguage].password_new}}</p>
-    <div class="page-login-field half-top">
-	  <i style="padding-top: 15px">
-		  <img src="https://cdn.tapni.co/icons/padlock.png" class="responsive-image" style="width: 50%;">
-	  </i>
-      <input v-model="password" :type="revealPassword ? 'text' : 'password'" :placeholder="ssoLang[this.appLanguage].password" required>
-	  <em @click="revealPassword = !revealPassword">
-		 <img v-show="!revealPassword" src="https://cdn.tapni.co/icons/reveal-password.png" class="responsive-image password-reveal-icon">
-		 <img v-show="revealPassword" src="https://cdn.tapni.co/icons/hide-password.png" class="responsive-image password-reveal-icon">
-	  </em>
-    </div>
-    <div class="page-login-field half-top">
-	  <i style="padding-top: 15px">
-		  <img src="https://cdn.tapni.co/icons/padlock.png" class="responsive-image" style="width: 50%;">
-	  </i>
-      <input v-model="passwordRepeat" :type="revealPassword2 ? 'text' : 'password'" :placeholder="ssoLang[this.appLanguage].password_repeat" required>
-	  <em @click="revealPassword2 = !revealPassword2">
-		  <img v-show="!revealPassword2" src="https://cdn.tapni.co/icons/reveal-password.png" class="responsive-image password-reveal-icon">
-		  <img v-show="revealPassword2" src="https://cdn.tapni.co/icons/hide-password.png" class="responsive-image password-reveal-icon">
-	  </em>
-    </div>
-    <button type="submit" class="button black-button google-button bg-tapni-grey button-90 button-center uppercase bold full-top">
-      <span v-if="!submitted" class="uppercase">{{ssoLang[this.appLanguage].password_change}}</span>
-	  <span v-else class="button--loading button__loader"></span>
-	</button>
+		<div class="page-login-links">
+			<router-link class="create float-right" to="/verify">{{ ssoLang[this.appLanguage].verify_account }}</router-link>
+			<router-link class="forgot float-left" to="/login">{{ ssoLang[this.appLanguage].sign_in }}</router-link>
+			<div class="clear"></div>
+		</div>
+	</form>
+	<form v-else class="page-login content-boxed content-boxed-padding" @submit.prevent="changePw">
+		<h3 class="bold no-bottom center-text" style="margin-top: 63px">{{ ssoLang[this.appLanguage].password_change }}</h3>
+		<p class="half-bottom small-top center-text color-black">{{ ssoLang[this.appLanguage].password_new }}</p>
+		<div class="page-login-field half-top">
+			<i style="padding-top: 15px">
+				<img src="https://cdn.tapni.co/icons/padlock.png" class="responsive-image" style="width: 50%" />
+			</i>
+			<input v-model="password" :type="revealPassword ? 'text' : 'password'" :placeholder="ssoLang[this.appLanguage].password" required />
+			<em @click="revealPassword = !revealPassword">
+				<img v-show="!revealPassword" src="https://cdn.tapni.co/icons/reveal-password.png" class="responsive-image password-reveal-icon" />
+				<img v-show="revealPassword" src="https://cdn.tapni.co/icons/hide-password.png" class="responsive-image password-reveal-icon" />
+			</em>
+		</div>
+		<div class="page-login-field half-top">
+			<i style="padding-top: 15px">
+				<img src="https://cdn.tapni.co/icons/padlock.png" class="responsive-image" style="width: 50%" />
+			</i>
+			<input v-model="passwordRepeat" :type="revealPassword2 ? 'text' : 'password'" :placeholder="ssoLang[this.appLanguage].password_repeat" required />
+			<em @click="revealPassword2 = !revealPassword2">
+				<img v-show="!revealPassword2" src="https://cdn.tapni.co/icons/reveal-password.png" class="responsive-image password-reveal-icon" />
+				<img v-show="revealPassword2" src="https://cdn.tapni.co/icons/hide-password.png" class="responsive-image password-reveal-icon" />
+			</em>
+		</div>
+		<button type="submit" class="button black-button google-button bg-tapni-grey button-90 button-center uppercase bold full-top">
+			<span v-if="!submitted" class="uppercase">{{ ssoLang[this.appLanguage].password_change }}</span>
+			<span v-else class="button--loading button__loader"></span>
+		</button>
 
-	<div class="decoration decoration-lines-thin no-bottom half-top"></div>
-	<p class="close-text center-text half-top color-black">
-	  <span v-html="ssoLang[this.appLanguage].reset_password_p2"></span> <a :href="'mailto:support@tapni.com?subject=' + ssoLang[this.appLanguage].password_reset_t"> support@tapni.com</a>
-	</p>
-  </form>
+		<div class="decoration decoration-lines-thin no-bottom half-top"></div>
+		<p class="close-text center-text half-top color-black"><span v-html="ssoLang[this.appLanguage].reset_password_p2"></span> <a :href="'mailto:support@tapni.com?subject=' + ssoLang[this.appLanguage].password_reset_t"> support@tapni.com</a></p>
+	</form>
 </template>
 
 <script>
-import AuthMixin from "../mixins/auth.mixin";
-import {EventBus} from "../store/event-bus";
+import AuthMixin from '../mixins/auth.mixin';
+import { EventBus } from '../store/event-bus';
 
 export default {
-  name: 'AuthReset',
-  mixins: [AuthMixin],
-  data () {
-    return {
-      loading: true,
-      submitted: false,
-      passwordChange: false,
-      email: '',
-      password: '',
-      passwordRepeat: '',
-      code: '',
-      captcha: '',
-      revealPassword: false,
-      revealPassword2: false,
-    }
-  },
-  mounted () {
-    if (this.$storex.verifyEmail) {
-      this.email = this.$storex.verifyEmail
-    }
-    if (this.$route.query.c) {
-      this.code = this.$route.query.c;
-      this.passwordChange = true
-    }
-    if (this.$route.query.e) {
-      this.email = this.$route.query.e
-    }
-    EventBus.$emit('ssoEvent', {name: 'setLoading', data: false})
-  },
-  methods: {
-    async resetEmail() {
-      // if (this.captcha === '') return this.errorHandler({ message: 'Please select recaptcha' });
+	name: 'AuthReset',
+	mixins: [AuthMixin],
+	data() {
+		return {
+			loading: true,
+			submitted: false,
+			passwordChange: false,
+			email: '',
+			password: '',
+			passwordRepeat: '',
+			code: '',
+			captcha: '',
+			revealPassword: false,
+			revealPassword2: false
+		};
+	},
+	mounted() {
+		if (this.$storex.verifyEmail) {
+			this.email = this.$storex.verifyEmail;
+		}
+		if (this.$route.query.c) {
+			this.code = this.$route.query.c;
+			this.passwordChange = true;
+		}
+		if (this.$route.query.e) {
+			this.email = this.$route.query.e;
+		}
+		EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
+	},
+	methods: {
+		async resetEmail() {
+			// if (this.captcha === '') return this.errorHandler({ message: 'Please select recaptcha' });
 
-      if (this.submitted) return
-      this.submitted = true
+			if (this.submitted) return;
+			this.submitted = true;
 
-	    this.email = this.email.trim()
+			this.email = this.email.trim();
 
-      let data = {
-        email: this.email,
-        captchaToken: await this.getCaptchaToken('password_reset')
-      };
+			let data = {
+				email: this.email,
+				captchaToken: await this.getCaptchaToken('password_reset')
+			};
 
-      await this.reset(data)
-      this.submitted = false
-      await this.$router.push('/verify?e=' + this.email + '#reset')
+			await this.reset(data);
+			this.submitted = false;
+			await this.$router.push('/verify?e=' + this.email + '#reset');
+		},
+		async changePw() {
+			// if (this.captcha === '') return this._vm.errorHandler({ message: 'Please select recaptcha' });
+			if (this.code.length !== 6) return this.errorSnack(this.ssoLang[this.appLanguage].invalid_code);
+			if (this.password !== this.passwordRepeat) return this.errorSnack(this.ssoLang[this.appLanguage].password_not_match);
 
-    },
-    async changePw() {
-      // if (this.captcha === '') return this._vm.errorHandler({ message: 'Please select recaptcha' });
-      if (this.code.length !== 6) return this.errorSnack(this.ssoLang[this.appLanguage].invalid_code);
-      if (this.password !== this.passwordRepeat) return this.errorSnack(this.ssoLang[this.appLanguage].password_not_match);
+			if (this.submitted) return;
+			this.submitted = true;
 
-      if (this.submitted) return
-      this.submitted = true
+			this.email = this.email.trim();
+			this.code = this.code.trim();
 
-      this.email = this.email.trim()
-      this.code = this.code.trim()
+			let data = {
+				email: this.email,
+				code: this.code,
+				password: this.password,
+				passwordRepeat: this.passwordRepeat,
+				captchaToken: await this.getCaptchaToken('password_reset')
+			};
 
-      let data = {
-        email: this.email,
-        code: this.code,
-        password: this.password,
-        passwordRepeat: this.passwordRepeat,
-        captchaToken: await this.getCaptchaToken('password_reset')
-      };
-
-      let success = await this.changePassword(data)
-      this.submitted = false
-      if (success === true) {
-        this.$router.push('/login');
-        this.successSnack(this.ssoLang[this.appLanguage].password_reseted_success);
-      }
-    },
-  },
-  watch: {
-    email(nv) { this.$storex.verifyEmail = nv }
-  }
-}
+			let success = await this.changePassword(data);
+			this.submitted = false;
+			if (success === true) {
+				this.$router.push('/login');
+				this.successSnack(this.ssoLang[this.appLanguage].password_reseted_success);
+			}
+		}
+	},
+	watch: {
+		email(nv) {
+			this.$storex.verifyEmail = nv;
+		}
+	}
+};
 </script>
 
 <style scoped>
-  #emailInput {
-	  text-align: center;
-	  padding-right: 15%;
-	  font-size: 17px;
-  }
+#emailInput {
+	text-align: center;
+	padding-right: 15%;
+	font-size: 17px;
+}
 </style>