@functionalcms/svelte-components 5.15.0 → 5.15.1

package/dist/server-side/auth/userAuthenticationHandle.js

@@ -1,12 +1,10 @@
 import { deleteCookie, loadCookie, saveCookie } from "../cookies";
 import { userAuthenticationProvider } from "./userAuthenticationProvider";
-import { parse } from "svelte/compiler";
 import { Redis } from "@upstash/redis";
+import { parseJwtToken } from "../tokenToUserParser";
 const pkceCookieName = "functionalcms_pkce";
 const stateCookieName = "functionalcms_state";
 const sessionCookieName = "functionalcms_sessionId";
-const idTokenCookie = "functionalcms_id_token";
-const refreshTokenCookie = "functionalcms_refresh_token";
 export const userAuthenticationHandle = (secret, serverUrl, clientId, redis) => {
     const provider = userAuthenticationProvider(serverUrl, clientId);
     return async ({ event, resolve }) => {
@@ -36,16 +34,6 @@ function handleLogout(event) {
     event.locals.user = null;
     event.locals.session = {};
 }
-function parseJwt(token) {
-    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 handleLogin(event, provider, secret) {
     const callbackUrl = new URL(`${event.url.origin}/auth/callback`);
     const response = await provider.handleLogin(callbackUrl);
@@ -62,16 +50,9 @@ async function handleCallback(event, secret, provider, redis) {
     const headers = new Headers();
     headers.set('Location', event.url.origin);
     const sessionId = crypto.randomUUID();
-    const accessToken = parseJwt(response.access_token);
+    const accessToken = parseJwtToken(response.access_token);
     await saveCookie(headers, secret, sessionCookieName, sessionId, accessToken.exp - Math.floor(Date.now() / 1000));
     redis.set(sessionId, JSON.stringify(response.access_token), { ex: accessToken.exp - Math.floor(Date.now() / 1000) });
-    // await saveCookie(headers, secret, accessTokenCookie, response.access_token, accessToken.exp - Math.floor(Date.now() / 1000));
-    // if (response.id_token) {
-    //     await saveCookie(headers, secret, idTokenCookie, response.id_token);
-    // }
-    // if (response.refresh_token) {
-    //     await saveCookie(headers, secret, refreshTokenCookie, response.refresh_token);
-    // }
     await deleteCookie(event.cookies, headers, pkceCookieName);
     await deleteCookie(event.cookies, headers, stateCookieName);
     return headers;

package/dist/server-side/functionalSequence.js

@@ -6,5 +6,5 @@ import { userHandler } from "./handlers/userHandler";
 import { accessTokenHandler } from "./handlers/accessTokenHandler";
 import { sitemapHandle } from "./handlers/sitemapHandler";
 export const hookSequence = (secret, redis, paraglideMiddleware, getTextDirection, settings, customHooks) => {
-    return sequence(userHandler(secret, redis), accessTokenHandler(secret), paraglideHandler(paraglideMiddleware, getTextDirection), authorizationHandle(), sitemapHandle(settings), ...customHooks, errorHandler);
+    return sequence(accessTokenHandler(secret, redis), userHandler(), paraglideHandler(paraglideMiddleware, getTextDirection), authorizationHandle(), sitemapHandle(settings), ...customHooks, errorHandler);
 };

package/dist/server-side/handlers/accessTokenHandler.d.ts

@@ -1,2 +1,3 @@
 import { type Handle } from '@sveltejs/kit';
-export declare const accessTokenHandler: (secret: string) => Handle;
+import { Redis } from '@upstash/redis';
+export declare const accessTokenHandler: (secret: string, redis: Redis) => Handle;

package/dist/server-side/handlers/accessTokenHandler.js

@@ -1,12 +1,14 @@
 import {} from '@sveltejs/kit';
 import { loadCookie } from '../cookies';
+import { Redis } from '@upstash/redis';
 const accessTokenCookie = "functionalcms_sessionId";
-export const accessTokenHandler = (secret) => {
+export const accessTokenHandler = (secret, redis) => {
     return async ({ event, resolve }) => {
         try {
-            let token = await loadCookie(event.cookies, secret, accessTokenCookie);
-            if (token) {
-                event.locals.token = token;
+            let sessionId = await loadCookie(event.cookies, secret, accessTokenCookie);
+            if (sessionId) {
+                const accessToken = await redis.get(sessionId);
+                event.locals.token = accessToken;
             }
         }
         finally {

package/dist/server-side/handlers/userHandler.d.ts

@@ -1,3 +1,2 @@
 import { type Handle } from '@sveltejs/kit';
-import { Redis } from '@upstash/redis';
-export declare const userHandler: (secret: string, redis: Redis) => Handle;
+export declare const userHandler: () => Handle;

package/dist/server-side/handlers/userHandler.js

@@ -1,13 +1,13 @@
 import {} from '@sveltejs/kit';
 import { loadCookie } from '../cookies';
 import { Redis } from '@upstash/redis';
+import { parseJwtToken } from '../tokenToUserParser';
 const accessTokenCookie = "functionalcms_sessionId";
-export const userHandler = (secret, redis) => {
+export const userHandler = () => {
     return async ({ event, resolve }) => {
         try {
-            let sessionId = await loadCookie(event.cookies, secret, accessTokenCookie);
-            if (sessionId) {
-                const user = await redis.get(sessionId);
+            if (event.locals.token) {
+                const user = parseJwtToken(event.locals.token);
                 event.locals.user = user;
             }
         }

package/dist/server-side/tokenToUserParser.d.ts

@@ -0,0 +1 @@
+export declare function parseJwtToken(token: string): any;

package/dist/server-side/tokenToUserParser.js

@@ -0,0 +1,10 @@
+export function parseJwtToken(token) {
+    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);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@functionalcms/svelte-components",
-	"version": "5.15.0",
+	"version": "5.15.1",
 	"license": "MIT",
 	"watch": {
 		"build": {