@tapni/auth 1.0.15 → 1.0.17

package/package.json

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

package/src/mixins/saml.mixin.js

@@ -51,14 +51,16 @@ export default {
 				'message',
 				async (message) => {
 					if (!this.allowedOriginsAuth.includes(message.origin)) return console.log('Origin is not allowed! ' + message.origin);
-					if (message.data.code) {
-						console.log('post message from opener', message.data, self.display);
-
+					const code = message.data.code;
+					const pkce = localStorage.getItem('pkce_code_verifier');
+					if (code) {
 						if (self.display === 'popup') {
-							return window.parent?.postMessage({ code: message.data.code, state: message.data.state, code_verifier: localStorage.getItem('pkce_code_verifier') }, '*');
+							return window.parent?.postMessage({ code: code, state: message.data.state, code_verifier: pkce }, '*');
+						}
+						if (pkce) {
+							await self.exchangeAuthCode({ code: message.data.code, code_verifier: pkce });
+							localStorage.removeItem('pkce_code_verifier');
 						}
-						await self.exchangeAuthCode({ code: message.data.code, code_verifier: localStorage.getItem('pkce_code_verifier') });
-						localStorage.removeItem('pkce_code_verifier');
 					}
 				},
 				{ once: true }
@@ -72,8 +74,6 @@ export default {
 					const code = localStorage.getItem('auth_code');
 					const pkce = localStorage.getItem('pkce_code_verifier');
 
-					console.log('interval', code, pkce);
-
 					if (code) {
 						clearInterval(this.checkInterval);
 						localStorage.removeItem('auth_code');
@@ -82,8 +82,9 @@ export default {
 						// handle code exchange
 						window.parent?.postMessage({ code: code, state: this.$route.query.state, code_verifier: pkce }, '*');
 
-						// attempt to close child if possible
-						// if (this.popupWindow?.closed === false) this.popupWindow.close();
+						if (pkce && (this.display === 'npm' || this.display === 'redirect')) {
+							this.exchangeAuthCode({ code, code_verifier: pkce });
+						}
 					}
 				}, 500);
 
@@ -102,8 +103,6 @@ export default {
 			if (this.$route.query.code) {
 				code = this.$route.query.code
 			}
-			console.log('window1', window.opener);
-			console.log('window2', window.parent);
 			if (window.opener) {
 				window.opener.postMessage({ type: 'saml', code }, '*');
 				this.closeWindow();
@@ -111,8 +110,6 @@ export default {
 				if (this.isNative && this.isiOS) await Browser.close();
 				EventBus.$emit('ssoEvent', { name: 'setLoading', data: true });
 
-				console.log(this.display, { code }, window.parent, window.opener);
-
 				if (code) {
 					if (this.display === 'popup' || this.display === 'npm') {
 						localStorage.setItem('auth_code', code);
@@ -128,9 +125,7 @@ export default {
 						}
 						return location.href = redirect_url + '?code=' + code + '&code_verifier=' + localStorage.getItem('pkce_code_verifier');
 					}
-					await this.exchangeAuthCode({ code, code_verifier: localStorage.getItem('pkce_code_verifier') });
 				}
-				// localStorage.removeItem('pkce_code_verifier');
 				EventBus.$emit('ssoEvent', { name: 'setLoading', data: false });
 			}
 		}