feat: added method in url []

sparrowapp-dev · Oct 8, 2024 · 6406949 · 6406949
1 parent 7c77cc1
commit 6406949
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/pages/Auth/login-page/LoginPage.svelte b/src/pages/Auth/login-page/LoginPage.svelte
@@ -100,8 +100,8 @@
 							isLogin = true;
 							const accessToken = response?.accessToken?.token;
 							const refreshToken = response?.refreshToken?.token;
-							const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response)}&event=login`;
-							const sparrowWebRedirect = constants.SPARROW_WEB_URL +`?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response)}&event=login`;
+							const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response)}&event=login&method=email`;
+							const sparrowWebRedirect = constants.SPARROW_WEB_URL +`?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response)}&event=login&method=email`;
 							if(userFromDesktop === "true"){
 								setTimeout(() => {
 									let data = JSON.parse(window.atob(accessToken?.split('.')[1]));

diff --git a/src/pages/Auth/oauth-redirect/OauthRedirect.svelte b/src/pages/Auth/oauth-redirect/OauthRedirect.svelte
@@ -9,7 +9,7 @@
 		const accessToken = urlParams.get('accessToken');
 		const refreshToken = urlParams.get('refreshToken');
 		const source = urlParams.get('source');
-		const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&event=${source}`;
+		const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&event=${source}&method=google`;
 
 		if (accessToken && refreshToken) {
 			setTimeout(() => {

diff --git a/src/pages/Auth/verify-email/VerifyEmail.svelte b/src/pages/Auth/verify-email/VerifyEmail.svelte
@@ -2,7 +2,7 @@
 	import lineIcon from '$lib/assets/line.svg';
 	import starIcon from '$lib/assets/starIcon.svg';
 	import { errorMessageText, isLoading, username } from '$lib/store/auth.store';
-	import { handleVerifyEmail, isSuccessfulResponse } from './verify-email';
+	import { handleVerifyUserEmail, isSuccessfulResponse } from './verify-email';
 	import sparrowicon from '$lib/assets/logoSparrowSquare.svg';
 	import { writable } from 'svelte/store';
 	import { onDestroy, onMount } from 'svelte';
@@ -492,12 +492,12 @@
 						loader={verifyCodeLoader}
 						onClick={async () => {
 							verifyCodeLoader = true;
-							let response = await handleVerifyEmail(verifyCodeCredential);
+							let response = await handleVerifyUserEmail(verifyCodeCredential);
 							if (response?.isSuccessful) {
 								isRegistered = true;
 								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`;
+								const sparrowRedirect = `sparrow://?accessToken=${accessToken}&refreshToken=${refreshToken}&response=${JSON.stringify(response.data)}&event=register&method=email`;
 								setTimeout(() => {
 									let data = JSON.parse(window.atob(accessToken?.split('.')[1]));
 									redirectRules.title = `Welcome ${data.name.split(' ')[0]}`;

diff --git a/src/pages/Auth/verify-email/verify-email.ts b/src/pages/Auth/verify-email/verify-email.ts
@@ -5,7 +5,7 @@ export const isSuccessfulResponse = writable(false);
 
 import { writable } from 'svelte/store';
 
-export const handleVerifyEmail = async (verifyCodeCredential: verifyPostbody) => {
+export const handleVerifyUserEmail = async (verifyCodeCredential: verifyPostbody) => {
 	const response = await verifyUserEmail(verifyCodeCredential);
 	if (response.isSuccessful) {
         errorMessageText.set("");