@functionalcms/svelte-components 5.2.0 → 5.2.2

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

@@ -17,14 +17,6 @@ export const authenticationHandle = (secret, provider) => {
             }
             else if (event.url.pathname === '/auth/logout') {
                 handleLogout(event);
-                // } else {
-                //     const hasUser = event.locals.user;
-                //     const accessToken = await loadCookie(event.cookies, secret, accessTokenCookie);
-                //     const idToken = await loadCookie(event.cookies, secret, idTokenCookie);
-                //     console.log(`accessToken: ${accessToken}, idToken: ${idToken}, hasUser: ${hasUser}`);
-                //     if (!hasUser && accessToken != "") {
-                //         await loginUserWithToken(event, accessToken, idToken, provider);
-                //     }
             }
         }
         catch (error) {
@@ -66,7 +58,3 @@ async function handleCallback(event, secret, provider) {
     await deleteCookie(event.cookies, headers, stateCookieName);
     return headers;
 }
-// async function loginUserWithToken(event: any, accessToken: string, idToken: string, provider: AuthenticationProvider) {
-//     const user = await provider.retrieveUser(accessToken);
-//     event.locals.user = user;
-// }

package/dist/server-side/functionalSequence.js

@@ -3,6 +3,8 @@ import errorHandler from "./auth/errorHandle";
 import { paraglideHandler } from "./handlers/paraglideHandler";
 import sessionHandler from "./handlers/sessionHandler";
 import authorizationHandle from "./auth/authorizationHandle";
+import { userHandler } from "./handlers/userHandler";
+import { accessTokenHandler } from "./handlers/accessTokenHandler";
 export const hookSequence = (secret, paraglideMiddleware, getTextDirection, customHooks) => {
-    return sequence(sessionHandler(secret), errorHandler, paraglideHandler(paraglideMiddleware, getTextDirection), authorizationHandle(), ...customHooks);
+    return sequence(sessionHandler(secret), userHandler(secret), accessTokenHandler(secret), errorHandler, paraglideHandler(paraglideMiddleware, getTextDirection), authorizationHandle(), ...customHooks);
 };

package/dist/server-side/getServices.js

@@ -1,7 +1,5 @@
 import { CommunicationService, DataService, TemplateService, WebsitesService, AuthService, FilesService, } from "@functionalcms/services";
-const getAccessToken = (locals) => {
-    return locals.token.access_token;
-};
+const getAccessToken = (locals) => locals.token;
 export const getDataService = (locals, endpoint) => {
     const accessToken = getAccessToken(locals);
     const service = new DataService(accessToken, endpoint);

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

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

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

@@ -0,0 +1,12 @@
+import {} from '@sveltejs/kit';
+import { loadCookie } from '../cookies';
+const accessTokenCookie = "functionalcms_access_token";
+export const accessTokenHandler = (secret) => {
+    return async ({ event, resolve }) => {
+        let token = await loadCookie(event.cookies, secret, accessTokenCookie);
+        if (token) {
+            event.locals.token = token;
+        }
+        return resolve(event);
+    };
+};

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

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

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

@@ -0,0 +1,23 @@
+import {} from '@sveltejs/kit';
+import { loadCookie } from '../cookies';
+const accessTokenCookie = "functionalcms_access_token";
+const retrieveUser = async (idToken) => {
+    const parts = idToken.split('.');
+    // Base64url to string conversion
+    const base64 = parts[1].replace(/-/g, '+').replace(/_/g, '/');
+    // Use TextDecoder (available in Node.js 11+)
+    const binString = globalThis.atob(base64);
+    const bytes = Uint8Array.from(binString, (m) => m.codePointAt(0));
+    const payload = JSON.parse(new TextDecoder().decode(bytes));
+    return payload;
+};
+export const userHandler = (secret) => {
+    return async ({ event, resolve }) => {
+        let idToken = await loadCookie(event.cookies, secret, accessTokenCookie);
+        if (idToken) {
+            let user = await retrieveUser(idToken);
+            event.locals.user = user;
+        }
+        return resolve(event);
+    };
+};

package/package.json

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