@functionalcms/svelte-components 5.16.0 → 5.16.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@functionalcms/svelte-components",
-	"version": "5.16.0",
+	"version": "5.16.2",
 	"license": "MIT",
 	"watch": {
 		"build": {
@@ -17,7 +17,7 @@
 		"build-modules": "node -e \"require('node:fs').cpSync('./src/pages', './dist/pages', { recursive: true })\"",
 		"build": "vite build && npm run package",
 		"preview": "vite preview",
-		"package": "npm run build-css && svelte-kit sync && svelte-package && npm run build-modules && publint",
+		"package": "npm run build-css && svelte-kit sync && svelte-package && publint",
 		"prepack": "npm run package",
 		"prepublishOnly": "npm run package",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",

package/src/pages/auth/callback/+server.ts

@@ -2,8 +2,7 @@ import { CACHE_TOKEN, CACHE_URL, CLIENT_ID, SERVER_URL, CACHE_SECRET } from '$en
 import { type RequestHandler } from '@sveltejs/kit';
 import { Redis } from '@upstash/redis';
 import * as o from "oauth4webapi";
-import { saveCookie } from '@functionalcms/svelte-components/index-server.js';
-import { loadCookie } from '../../../lib/index-server';
+import { saveCookie, loadCookie } from '@functionalcms/svelte-components/index-server.js';
 
 const pkceCookieName = "functionalcms_pkce";
 const stateCookieName = "functionalcms_state";

package/dist/pages/auth/callback/+server.ts

@@ -1,89 +0,0 @@
-import { CACHE_TOKEN, CACHE_URL, CLIENT_ID, SERVER_URL, CACHE_SECRET } from '$env/static/private';
-import { type RequestHandler } from '@sveltejs/kit';
-import { Redis } from '@upstash/redis';
-import * as o from "oauth4webapi";
-import { saveCookie } from '@functionalcms/svelte-components/index-server.js';
-import { loadCookie } from '../../../lib/index-server';
-
-const pkceCookieName = "functionalcms_pkce";
-const stateCookieName = "functionalcms_state";
-const sessionCookieName = "functionalcms_sessionId";
-
-function parseJwtToken(token: string) {
-    const base64 = token.split('.')[1]
-        .replace(/-/g, '+')
-        .replace(/_/g, '/');
-
-    const json = decodeURIComponent(
-        atob(base64)
-            .split('')
-            .map(c => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
-            .join('')
-    );
-
-    return JSON.parse(json);
-}
-
-async function handleCallback (state: string, codeVerifier: string, callbackUrl: URL): Promise<any> {
-    const discovery = await o.discoveryRequest(new URL(SERVER_URL));
-    const metadata = await o.processDiscoveryResponse(new URL(SERVER_URL), discovery);
-    const client: o.Client = {
-        client_id: CLIENT_ID,
-        token_endpoint_auth_method: "none"
-    };
-    const callbackParameters
-        = o.validateAuthResponse(
-            metadata,
-            client,
-            callbackUrl,
-            state);
-
-    // Exchange code for tokens
-    const tokenResponse
-        = await o.authorizationCodeGrantRequest(
-            metadata,
-            client,
-            o.None(),
-            callbackParameters,
-            callbackUrl.toString(),
-            codeVerifier,
-        );
-
-    // Parse tokens
-    const tokens
-        = await o.processAuthorizationCodeResponse(
-            metadata,
-            client,
-            tokenResponse
-        );
-
-    return {
-        access_token: tokens.access_token,
-        id_token: tokens.id_token,
-        refresh_token: tokens.refresh_token,
-    };
-};
-
-
-/** @type {import('./$types').RequestHandler} */
-export const GET: RequestHandler = async ({ url, cookies }) => {
-    const expectedState = await loadCookie(cookies, CACHE_SECRET, stateCookieName);
-    const codeVerifier = await loadCookie(cookies, CACHE_SECRET, pkceCookieName);
-
-    const response = await handleCallback(expectedState ?? '', codeVerifier ?? '', new URL(url));
-
-    const headers = new Headers();
-    headers.set('Location', url.origin);
-    const sessionId = crypto.randomUUID();
-    const accessToken = parseJwtToken(response.access_token);
-
-    await saveCookie(headers, CACHE_SECRET, sessionCookieName, sessionId);
-
-    const redis = new Redis({ url: CACHE_URL, token: CACHE_TOKEN });
-    const result = await redis.set(sessionId, JSON.stringify(response.access_token), { ex: accessToken.exp - Math.floor(Date.now() / 1000) });
-
-    cookies.delete(pkceCookieName, { path: "/" });
-    cookies.delete(stateCookieName, { path: "/" });
-
-    return new Response(null, { status: 302, headers });
-}

package/dist/pages/auth/login/+server.ts

@@ -1,45 +0,0 @@
-import { CLIENT_ID, SERVER_URL, CACHE_SECRET } from '$env/static/private';
-import { type RequestHandler } from '@sveltejs/kit';
-import * as o from "oauth4webapi";
-import { saveCookie } from '@functionalcms/svelte-components/index-server.js';
-
-const pkceCookieName = "functionalcms_pkce";
-const stateCookieName = "functionalcms_state";
-
-function generateRandomState() {
-    const array = new Uint8Array(16);
-    crypto.getRandomValues(array);
-    return Array.from(array, (byte) => byte.toString(16).padStart(2, "0")).join("");
-}
-
-async function createLoginHeader(serverUrl: string, clientId: string, callbackUrl: URL) {
-    const code_verifier = o.generateRandomCodeVerifier();
-    const code_challenge = await o.calculatePKCECodeChallenge(code_verifier);
-    const state = generateRandomState();
-
-    const authUrl = new URL(serverUrl + '/login/oauth/authorize');
-    authUrl.searchParams.set('client_id', clientId);
-    authUrl.searchParams.set('redirect_uri', callbackUrl.toString());
-    authUrl.searchParams.set('response_type', 'code');
-    authUrl.searchParams.set('state', state);
-    authUrl.searchParams.set('code_challenge', code_challenge);
-    authUrl.searchParams.set('code_challenge_method', 'S256');
-    authUrl.searchParams.set('scope', 'openid profile email user.extended properties');
-
-    return { state, codeVerifier: code_verifier, authorisationUrl: authUrl.toString() };
-}
-
-/** @type {import('./$types').RequestHandler} */
-export const GET: RequestHandler = async ({ params, locals, url }) => {
-    const callbackUrl = new URL(`${url.origin}/auth/callback`);
-    const response = await createLoginHeader(SERVER_URL, CLIENT_ID, callbackUrl);
-
-    const headers = new Headers();
-    headers.set('Location', response.authorisationUrl);
-
-    await saveCookie(headers, CACHE_SECRET, pkceCookieName, response.codeVerifier);
-    await saveCookie(headers, CACHE_SECRET, stateCookieName, response.state);
-
-
-    return new Response(null, { status: 302, headers });
-}