Fixed cookies domain not being set correctly

rezk2ll · Oct 30, 2023 · a8d1345 · a8d1345
1 parent 500fa5c
commit a8d1345
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
@@ -13,6 +13,7 @@ import {
 } from '$lib/services/user';
 import { validateName, validateNickName } from '$lib/utils/username';
 import authService from '$lib/services/auth';
+import { extractMainDomain } from '$lib/utils/url';
 
 export const load: PageServerLoad = async ({ parent }) => {
 	await Client.getClient();
@@ -146,15 +147,17 @@ export const actions: Actions = {
 
 			const authSessionCookie = await authService.login(nickname, password);
 
-			cookies.set(authService.cookieName, authSessionCookie, { domain: url.host });
+			cookies.set(authService.cookieName, authSessionCookie, {
+				domain: extractMainDomain(url.host)
+			});
 
 			throw redirect(302, '/success');
 		} catch (err) {
 			if ((err as Redirect).location) {
 				throw err;
 			}
 
-			console.error({ err })
+			console.error({ err });
 
 			return fail(500, { error: true });
 		}
@@ -187,15 +190,15 @@ export const actions: Actions = {
 				user: user?.cn
 			}));
 
-			cookies.set(authService.cookieName, cookie, { domain: url.host });
+			cookies.set(authService.cookieName, cookie, { domain: extractMainDomain(url.host) });
 
 			throw redirect(302, '/success');
 		} catch (err) {
 			if ((err as Redirect).location) {
 				throw err;
 			}
 
-			console.error({ err })
+			console.error({ err });
 
 			return fail(500, { failed_login: true });
 		}

diff --git a/src/routes/api/register/+server.ts b/src/routes/api/register/+server.ts
@@ -4,6 +4,7 @@ import { validatePassword } from '$lib/utils/password';
 import { checkNickNameAvailability, checkPhoneAvailability, signup } from '$lib/services/user';
 import authService from '$lib/services/auth';
 import { validateName, validateNickName } from '$lib/utils/username';
+import { extractMainDomain } from '$lib/utils/url';
 
 export const POST: RequestHandler = async ({ request, locals, cookies, url }) => {
 	const { nickname, phone, firstname, lastname, password } = await request.json();
@@ -53,7 +54,7 @@ export const POST: RequestHandler = async ({ request, locals, cookies, url }) =>
 
 	const authSessionCookie = await authService.login(nickname, password);
 
-	cookies.set(authService.cookieName, authSessionCookie, { domain: url.host 	});
+	cookies.set(authService.cookieName, authSessionCookie, { domain: extractMainDomain(url.host) });
 
 	return new Response('ok', { status: 201 });
 };