From 368886d1454190626c1b4c4f0908ec84a67e4bd6 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Fri, 14 Jun 2024 14:46:35 +0200
Subject: [PATCH] bugfixing redirect correctyl after login/register

---
 src/routes/login/+page.server.ts    | 3 ---
 src/routes/oauth/+server.ts         | 9 ++++-----
 src/routes/pricing/+page.server.ts  | 5 -----
 src/routes/register/+page.server.ts | 4 ----
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/routes/login/+page.server.ts b/src/routes/login/+page.server.ts
index 8a71b6ce..c5be85a2 100644
--- a/src/routes/login/+page.server.ts
+++ b/src/routes/login/+page.server.ts
@@ -95,9 +95,6 @@ export const actions = {
 			maxAge: 60
 	  	});
 		
-		oauthState.update( value => state);
-        oauthVerifier.update( value => verifier);
-		oauthProvider.update( value => providerSelected);
 
 
 		redirect(302,authProviderRedirect);
diff --git a/src/routes/oauth/+server.ts b/src/routes/oauth/+server.ts
index 44a3a199..7b481dc4 100644
--- a/src/routes/oauth/+server.ts
+++ b/src/routes/oauth/+server.ts
@@ -71,13 +71,12 @@ export const GET = async ({locals,  url, cookies}) => {
 
     }
 
-    try {
-        const path = cookies?.get('path');
-        redirect(301, path?.length !== 0 ? path : "/");
-    } catch(e) {
+    if(cookies?.get('path')) {
+        redirect(301, cookies?.get('path'));
+    } else {
         redirect(301,"/");
-
     }
+
     //Login user automatically
 
     //const avatarUrl = newUser['meta']['avatarUrl'];
diff --git a/src/routes/pricing/+page.server.ts b/src/routes/pricing/+page.server.ts
index 10d925be..d6214f01 100644
--- a/src/routes/pricing/+page.server.ts
+++ b/src/routes/pricing/+page.server.ts
@@ -1,8 +1,6 @@
 import { error, fail, redirect } from "@sveltejs/kit";
 import { validateData } from "$lib/utils";
 import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-import { oauthState, oauthVerifier, oauthProvider } from '$lib/store';
-
 
 export const actions = {
 	
@@ -129,9 +127,6 @@ export const actions = {
 			maxAge: 60
 	  	});
 		
-		oauthState.update( value => state);
-        oauthVerifier.update( value => verifier);
-		oauthProvider.update( value => providerSelected);
 
 
 		redirect(302,authProviderRedirect);
diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts
index 2b6d0362..2e8b4e9c 100644
--- a/src/routes/register/+page.server.ts
+++ b/src/routes/register/+page.server.ts
@@ -1,7 +1,6 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import { registerUserSchema } from '$lib/schemas';
 import { validateData } from '$lib/utils';
-import { oauthState, oauthVerifier, oauthProvider } from '$lib/store';
 
 
 
@@ -104,9 +103,6 @@ export const actions = {
 			maxAge: 60
 	  	});
 		
-		oauthState.update( value => state);
-        oauthVerifier.update( value => verifier);
-		oauthProvider.update( value => providerSelected);
 
 
 		redirect(302,authProviderRedirect);