Merge pull request #72 from sparrowapp-dev/fix/fixed-source-for-register

fix: Fixed source missing in register event
sparrowapp-dev · Oct 18, 2024 · 94f6321 · 94f6321
2 parents 4884d01 + 5de79e8
commit 94f6321
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/pages/Auth/oauth-redirect/OauthRedirect.svelte b/src/pages/Auth/oauth-redirect/OauthRedirect.svelte
@@ -4,14 +4,19 @@
 	import Redirect from '../redirect/Redirect.svelte';
 	import constants from '$lib/utils/constants';
 
+	let userFromDesktop = localStorage.getItem('isUserFromDesktop');
+
+
 	onMount(() => {
 		const urlParams = new URLSearchParams(window.location.search);
 		const accessToken = urlParams.get('accessToken');
 		const refreshToken = urlParams.get('refreshToken'); 
 		const source = urlParams.get('source');
 		const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&event=${source}&method=google`;
+		const sparrowWebRedirect = constants.SPARROW_WEB_URL +`?accessToken=${accessToken}&refreshToken=${refreshToken}&event=${source}&method=google`;
 
 		if (accessToken && refreshToken) {
+			if(userFromDesktop === "true"){
 			setTimeout(() => {
 				let data = JSON.parse(window.atob(accessToken?.split('.')[1]));
 				redirectRules.title = `Welcome ${data.name}`;
@@ -27,6 +32,10 @@
 				};
 			}, constants.API_REDIRECT_TIMEOUT);
 		}
+			else{
+				navigate(sparrowWebRedirect)
+			}
+		}
 	});
 	let redirectRules = {
 		title: 'Welcome to Sparrow!',

diff --git a/src/pages/Auth/verify-email/VerifyEmail.svelte b/src/pages/Auth/verify-email/VerifyEmail.svelte
@@ -14,6 +14,7 @@
 	import AngleUp from '$lib/assets/angle-up.svelte';
 	import BgContainer from '$lib/components/bgContainer/BgContainer.svelte';
 	import Redirect from '../redirect/Redirect.svelte';
+	import constants from '$lib/utils/constants';
 	export let id: string;
 
 	let seconds = 60;
@@ -74,6 +75,10 @@
 
 	let emailText: string = id || '';
 
+
+	let userFromDesktop = localStorage.getItem('isUserFromDesktop');
+
+
 	const handleVerificationCode = () => {
 		verifyCode =
 			verificationCode1 +
@@ -498,6 +503,9 @@
 								const accessToken = response?.data.accessToken?.token;
 								const refreshToken = response?.data.refreshToken?.token;
 								const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response.data)}&event=register&method=email`;
+								const sparrowWebRedirect = constants.SPARROW_WEB_URL +`?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response)}&event=register&method=email`;
+
+								if(userFromDesktop === "true"){
 								setTimeout(() => {
 									let data = JSON.parse(window.atob(accessToken?.split('.')[1]));
 									redirectRules.title = `Welcome ${data.name.split(' ')[0]}`;
@@ -513,6 +521,11 @@
 								}, 5000);
 							}
 
+								else{
+									navigate(sparrowWebRedirect);
+								}
+							}
+
 							verifyCodeLoader = false;
 						}}
 					/>