Merge pull request #18 from kinde-oss/fix/redirect-on-login

Setting dynamic post login redirect url

Author: DanielRivers

src/lib/config/config.ts

@@ -8,6 +8,7 @@ export const kindeConfiguration = {
 	clientId: env.KINDE_CLIENT_ID,
 	logoutRedirectURL: env.KINDE_POST_LOGOUT_REDIRECT_URL,
 	redirectURL: env.KINDE_REDIRECT_URL,
+	appBase: new URL(env.KINDE_REDIRECT_URL).origin,
 	audience: env.KINDE_AUDIENCE,
 	scope: env.KINDE_SCOPE,
 	clientSecret: env.KINDE_CLIENT_SECRET,

src/lib/handleAuth/handleAuth.ts

@@ -1,10 +1,13 @@
 import {kindeAuthClient} from '$lib/KindeSDK.js';
 import {kindeConfiguration} from '$lib/index.js';
+import {sessionStorage} from '$lib/sessionStorage/sessionStorage.js';
 import {parseSearchParamsToObject} from '$lib/utils/index.js';
 import type {SessionManager} from '@kinde-oss/kinde-typescript-sdk';
 import {error, redirect, type RequestEvent} from '@sveltejs/kit';
 import {version} from '$app/environment';
 
+const KEY_POST_LOGIN_REDIRECT_URL = 'post-login-redirect-url';
+
 export async function handleAuth({
 	request,
 	params,
@@ -14,6 +17,7 @@ export async function handleAuth({
 	let url: URL | null = null;
 	switch (params.kindeAuth) {
 		case 'login':
+			storePostLoginRedirectUrl(options);
 			url = await kindeAuthClient.login(request as unknown as SessionManager, options);
 			break;
 		case 'health':
@@ -43,6 +47,7 @@ export async function handleAuth({
 				}
 			);
 		case 'register':
+			storePostLoginRedirectUrl(options);
 			url = await kindeAuthClient.register(request as unknown as SessionManager, options);
 			break;
 		case 'create_org':
@@ -53,6 +58,7 @@ export async function handleAuth({
 				request as unknown as SessionManager,
 				new URL(request.url)
 			);
+			redirectToPostLoginUrl();
 			throw redirect(302, kindeConfiguration.loginRedirectURL ?? '/');
 		case 'logout':
 			url = await kindeAuthClient.logout(request as unknown as SessionManager);
@@ -62,3 +68,25 @@ export async function handleAuth({
 	}
 	throw redirect(302, url.toString());
 }
+
+const storePostLoginRedirectUrl = (options: Record<string, string | number>) => {
+	if (options.post_login_redirect_url && typeof options.post_login_redirect_url == 'string') {
+		sessionStorage.setSessionItem(KEY_POST_LOGIN_REDIRECT_URL, options.post_login_redirect_url);
+	}
+};
+
+const isAbsoluteUrl = (url: string) =>
+	url.indexOf('http://') === 0 || url.indexOf('https://') === 0;
+
+const redirectToPostLoginUrl = () => {
+	if (sessionStorage.getSessionItem(KEY_POST_LOGIN_REDIRECT_URL)) {
+		const post_login_redirect_url = sessionStorage.getSessionItem(KEY_POST_LOGIN_REDIRECT_URL);
+		sessionStorage.removeSessionItem(KEY_POST_LOGIN_REDIRECT_URL);
+
+		if (isAbsoluteUrl(post_login_redirect_url)) {
+			throw redirect(302, new URL(post_login_redirect_url));
+		} else {
+			throw redirect(302, new URL(post_login_redirect_url, kindeConfiguration.appBase));
+		}
+	}
+};