Merge branch 'main' into fix/redirect-on-login

Author: prokawsar

README.md

@@ -2,7 +2,7 @@
 
 The Kinde SDK for SvelteKit.
 
-[![PRs - Welcome](https://img.shields.io/badge/PRs-Welcome-green?style=for-the-badge)](https://kinde.com/docs/developer-tools) [![Kinde - Docs](https://img.shields.io/badge/Kinde-Docs-white?style=for-the-badge)](https://kinde.com/docs/developer-tools) [![Kinde Community](https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/thekindecommunity/shared_invite/zt-26hdaavyc-CfOa06vP23guSwK~~OpFMQ) [![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/wHX6j7wG5d)
+[![PRs - Welcome](https://img.shields.io/badge/PRs-Welcome-green?style=for-the-badge)](https://kinde.com/docs/developer-tools) [![Kinde - Docs](https://img.shields.io/badge/Kinde-Docs-white?style=for-the-badge)]([https://kinde.com/docs/developer-tools](https://kinde.com/docs/developer-tools/sveltekit-sdk/)) [![Kinde Community](https://img.shields.io/badge/Slack-4A154B?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/thekindecommunity/shared_invite/zt-26hdaavyc-CfOa06vP23guSwK~~OpFMQ) [![Discord](https://img.shields.io/badge/Discord-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/wHX6j7wG5d)
 
 ## Development
 
@@ -83,6 +83,7 @@ KINDE_SCOPE=profile email offline openid
 KINDE_USER_EMAIL_TEST= // An user has existed in your organization
 KINDE_USER_PASSWORD_TEST=
 KINDE_AUTH_WITH_PKCE= // Set `true` if you want to use Authentication Code Flow with PKCE
+KINDE_DEBUG= // Set `true` if you want to enable the `api/auth/health` endpoint
 ```
 
 Finally, you can simply run the command

package.json

@@ -44,7 +44,7 @@
 		"svelte": "^4.0.0"
 	},
 	"dependencies": {
-		"@kinde-oss/kinde-typescript-sdk": "^2.4.0"
+		"@kinde-oss/kinde-typescript-sdk": "^2.6.2"
 	},
 	"devDependencies": {
 		"@playwright/test": "^1.28.1",

src/lib/config/config.ts

@@ -1,6 +1,7 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 import {env} from '$env/dynamic/private';
+import {version} from '$app/environment';
 
 export const kindeConfiguration = {
 	authDomain: env.KINDE_ISSUER_URL,
@@ -12,11 +13,14 @@ export const kindeConfiguration = {
 	scope: env.KINDE_SCOPE,
 	clientSecret: env.KINDE_CLIENT_SECRET,
 	loginRedirectURL: env.KINDE_POST_LOGIN_REDIRECT_URL,
-	authUsePKCE: [true, 'true'].includes(env.KINDE_AUTH_WITH_PKCE)
+	authUsePKCE: [true, 'true'].includes(env.KINDE_AUTH_WITH_PKCE),
+	debug: env.KINDE_DEBUG || process.env.NODE_ENV !== 'production'
 };
 
 export const kindeAPIConfiguration = {
 	audience: `${env.KINDE_ISSUER_URL}/api`,
 	clientId: env.KINDE_CLIENT_ID,
-	clientSecret: env.KINDE_CLIENT_SECRET
+	clientSecret: env.KINDE_CLIENT_SECRET,
+	framework: 'Sveltekit',
+	frameworkVersion: version
 };

src/lib/handleAuth/handleAuth.ts

@@ -4,6 +4,7 @@ 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';
 
@@ -19,6 +20,32 @@ export async function handleAuth({
 			storePostLoginRedirectUrl(options);
 			url = await kindeAuthClient.login(request as unknown as SessionManager, options);
 			break;
+		case 'health':
+			if (!kindeConfiguration.debug) {
+				url = new URL(kindeConfiguration.loginRedirectURL);
+				break;
+			}
+			return new Response(
+				JSON.stringify({
+					authDomain: kindeConfiguration.authDomain || '',
+					clientId: kindeConfiguration.clientId || '',
+					logoutRedirectURL: kindeConfiguration.logoutRedirectURL || '',
+					redirectURL: kindeConfiguration.redirectURL || '',
+					audience: kindeConfiguration.audience || '',
+					scope: kindeConfiguration.scope || '',
+					clientSecret: kindeConfiguration.clientSecret.match('[a-z0-9]{32}')
+						? 'Set correctly'
+						: 'Not set correctly',
+					loginRedirectURL: kindeConfiguration.loginRedirectURL || '',
+					authUsePKCE: kindeConfiguration.authUsePKCE,
+					version: version,
+					framework: 'sveltekit'
+				}),
+				{
+					status: 200,
+					headers: {'Content-Type': 'application/json'}
+				}
+			);
 		case 'register':
 			storePostLoginRedirectUrl(options);
 			url = await kindeAuthClient.register(request as unknown as SessionManager, options);

src/routes/+page.svelte

@@ -1,2 +1,5 @@
-<h1>Welcome to SvelteKit</h1>
-<p>Visit <a href="https://kit.svelte.dev">kit.svelte.dev</a> to read the documentation</p>
+<script>
+	import {version} from '$app/environment';
+</script>
+
+<h1>Welcome to Kinde Svelte SDK v{version}</h1>

svelte.config.js

@@ -1,5 +1,11 @@
 import adapter from '@sveltejs/adapter-auto';
 import { vitePreprocess } from '@sveltejs/kit/vite';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+
+const file = fileURLToPath(new URL('package.json', import.meta.url));
+const json = readFileSync(file, 'utf8');
+const pkg = JSON.parse(json);
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -11,7 +17,10 @@ const config = {
 		// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
 		// If your environment is not supported or you settled on a specific environment, switch out the adapter.
 		// See https://kit.svelte.dev/docs/adapters for more information about adapters.
-		adapter: adapter()
+		adapter: adapter(),
+    version: {
+      name: pkg.version,
+    }
 	}
 };