@functionalcms/svelte-components 2.18.3 → 2.19.1

package/dist/auth/authenticationHandle.js

@@ -1,5 +1,5 @@
 import {} from '@sveltejs/kit';
-import { createSession, getSession, deleteSession } from './sessionStorage.js';
+import { createSession, getSession, deleteSession } from './sessionstorage.js';
 import { keycloak } from './authenticationProvider.js';
 const authStateCookieName = `auth_state`;
 const authSessionCookieName = `auth_session`;
@@ -10,7 +10,7 @@ const logout = (cookies, afterLogoutPath = '/') => {
         cookies.delete('auth_session', { path: '/' });
         const sid = cookies.get('auth_session');
         deleteSession(sid);
-        headers.append('Set-Cookie', 'auth_session=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT;');
+        headers.append('Set-Cookie', `${authSessionCookieName}=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT;`);
         headers.append('Location', afterLogoutPath);
     }
     else {
@@ -21,21 +21,29 @@ const logout = (cookies, afterLogoutPath = '/') => {
 const createUserSession = async (provider, event) => {
     const token = await provider.getValidation(event);
     const session = await provider.getUser(token);
-    const headers = new Headers();
-    headers.append('Location', '/');
-    headers.append('Set-Cookie', 'auth_state=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT;');
     if (session !== undefined) {
         session.userId = session.sub;
         event.locals.session = session;
         event.locals.accessToken = token.access_token;
         const sessionId = createSession({ session, token }, token.expires_in);
-        headers.append('Set-Cookie', `auth_session=${sessionId}; HttpOnly; Secure; SameSite=strict; Max-Age=${token.expires_in}; Path=/`);
+        const headers = getHeadersWithCookie(sessionId, token.expires_in);
         headers.append('Location', provider.redirectPath);
+        // headers.append(
+        //   'Set-Cookie',
+        //   `${authStateCookieName}=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT;`);
+        return headers;
+    }
+    else {
+        const headers = new Headers();
+        headers.append('Location', '/');
+        // headers.append(
+        //   'Set-Cookie',
+        //   `${authStateCookieName}=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT;`);
+        return headers;
     }
-    return headers;
 };
 const loadUserFromSession = (cookies, locals) => {
-    const sid = cookies.get('auth_session');
+    const sid = cookies.get(authSessionCookieName);
     const session = getSession(sid);
     if (session) {
         locals.session = session.session;
@@ -45,6 +53,12 @@ const loadUserFromSession = (cookies, locals) => {
         locals.username = "";
     }
 };
+const getHeadersWithCookie = (sessionId, expiresIn) => {
+    const cookieHeader = `${authSessionCookieName}=${sessionId}; HttpOnly; Secure; SameSite=strict; Max-Age=${expiresIn}; Path=/`;
+    const headers = new Headers();
+    headers.append('Set-Cookie', cookieHeader);
+    return headers;
+};
 export const authenticationHandle = (issuer, clientId, scope = '', redirectPath = '/') => {
     const provider = keycloak(issuer, clientId, scope, redirectPath);
     return async ({ event, resolve }) => {

package/dist/auth/authenticationProvider.js

@@ -1,9 +1,9 @@
 import * as o from "oauth4webapi";
-const aurthStateCookieName = 'auth_state';
+const authStateCookieName = 'auth_state';
 const stateIdGenerator = () => crypto.randomUUID();
 const getKeycloakIdentity = async (issuer, client_id, scope, redirectUrl) => {
     const state = stateIdGenerator();
-    const cookieHeader = `${aurthStateCookieName}=${state}; HttpOnly; Secure; SameSite=strict; Max-Age=3600; Path=/`;
+    const cookieHeader = `${authStateCookieName}=${state}; HttpOnly; Secure; SameSite=strict; Max-Age=3600; Path=/`;
     const code_challenge = await o.calculatePKCECodeChallenge(state);
     const authorizationUrlSearchParams = new URLSearchParams({
         client_id: client_id,
@@ -20,7 +20,7 @@ const getKeycloakIdentity = async (issuer, client_id, scope, redirectUrl) => {
     return headers;
 };
 const getKeycloakValidation = async (issuer, client_id, scope, event, redirectUrl) => {
-    const storedState = event.cookies.get(aurthStateCookieName);
+    const storedState = event.cookies.get(authStateCookieName);
     const state = event.url.searchParams.get("state");
     if (!storedState || !state || storedState !== state) {
         throw new Error('State not valid');
@@ -50,7 +50,6 @@ const getKeycloakValidation = async (issuer, client_id, scope, event, redirectUr
         throw new Error('Token not validated.');
     }
     const token = await response.json();
-    event.cookies.delete(aurthStateCookieName, { path: '/' });
     return token;
 };
 const getUser = async (issuer, token) => {

package/dist/components/Link.svelte

@@ -331,6 +331,7 @@ $: klasses = [
   css ? css : ""
 ].filter((c) => c).join(" ");
 </script>
+<svelte:options customElement="active-link" />
 <a class={klasses} href={href}>
     <slot />
 </a>

package/dist/index-server.d.ts

@@ -1,4 +1,5 @@
 import { authenticationHandle } from './auth/authenticationHandle.js';
 import authorizationHandle from './auth/authorizationHandle.js';
 import errorHandler from './auth/errorHandle.js';
-export { authenticationHandle, authorizationHandle, errorHandler };
+import { getBlobService, getCommunicationService, getDataService, getTemplateService, getWebsiteService } from './server-side/getServices.js';
+export { authenticationHandle, authorizationHandle, errorHandler, getDataService, getCommunicationService, getWebsiteService, getTemplateService, getBlobService };

package/dist/index-server.js

@@ -1,4 +1,5 @@
 import { authenticationHandle } from './auth/authenticationHandle.js';
 import authorizationHandle from './auth/authorizationHandle.js';
 import errorHandler from './auth/errorHandle.js';
-export { authenticationHandle, authorizationHandle, errorHandler };
+import { getBlobService, getCommunicationService, getDataService, getTemplateService, getWebsiteService } from './server-side/getServices.js';
+export { authenticationHandle, authorizationHandle, errorHandler, getDataService, getCommunicationService, getWebsiteService, getTemplateService, getBlobService };

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

@@ -0,0 +1,5 @@
+export declare const getDataService: (locals: any) => any;
+export declare const getCommunicationService: (locals: any) => any;
+export declare const getWebsiteService: (locals: any) => any;
+export declare const getTemplateService: (locals: any) => any;
+export declare const getBlobService: (locals: any) => any;

package/dist/server-side/getServices.js

@@ -0,0 +1,30 @@
+import { DOMAIN, ENDPOINT } from "$env/static/private";
+import { CommunicationService, DataService, TemplateService, WebsitesService, BlobService } from "@functionalcms/services";
+const getAccessToken = (locals) => {
+    return locals.token.access_token;
+};
+export const getDataService = (locals) => {
+    const accessToken = getAccessToken(locals);
+    const service = new DataService(accessToken, DOMAIN, ENDPOINT);
+    return service;
+};
+export const getCommunicationService = (locals) => {
+    const accessToken = getAccessToken(locals);
+    const service = new CommunicationService(accessToken, DOMAIN, ENDPOINT);
+    return service;
+};
+export const getWebsiteService = (locals) => {
+    const accessToken = getAccessToken(locals);
+    const service = new WebsitesService(accessToken, DOMAIN, ENDPOINT);
+    return service;
+};
+export const getTemplateService = (locals) => {
+    const accessToken = getAccessToken(locals);
+    const service = new TemplateService(accessToken, DOMAIN, ENDPOINT);
+    return service;
+};
+export const getBlobService = (locals) => {
+    const accessToken = getAccessToken(locals);
+    const service = new BlobService(accessToken, DOMAIN, ENDPOINT);
+    return service;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@functionalcms/svelte-components",
-	"version": "2.18.3",
+	"version": "2.19.1",
 	"watch": {
 		"build": {
 			"patterns": [