@functionalcms/svelte-components 2.19.4 → 2.20.0

package/dist/auth/authenticationHandle.d.ts

@@ -1,2 +1,3 @@
 import { type Handle } from '@sveltejs/kit';
-export declare const authenticationHandle: (scope?: string, redirectPath?: string) => Handle;
+import type { IProvider } from './types.js';
+export declare const authenticationHandle: (provider: IProvider) => Handle;

package/dist/auth/authenticationHandle.js

@@ -1,8 +1,5 @@
-import { AUTH_KEYCLOAK_ID, AUTH_KEYCLOAK_ISSUER } from '$env/static/private';
 import {} from '@sveltejs/kit';
 import { createSession, getSession, deleteSession } from './sessionStorage.js';
-import { keycloak } from './authenticationProvider.js';
-const authStateCookieName = `auth_state`;
 const authSessionCookieName = `auth_session`;
 const logout = (cookies, afterLogoutPath = '/') => {
     const headers = new Headers();
@@ -47,8 +44,7 @@ const loadUserFromSession = (cookies, locals) => {
         locals.username = "";
     }
 };
-export const authenticationHandle = (scope = '', redirectPath = '/') => {
-    const provider = keycloak(AUTH_KEYCLOAK_ISSUER, AUTH_KEYCLOAK_ID, scope, redirectPath);
+export const authenticationHandle = (provider) => {
     return async ({ event, resolve }) => {
         //login user check + refresh
         if (event.url.pathname.startsWith('/')) {

package/dist/auth/{authenticationProvider.d.ts → machineAuthenticationProvider.d.ts}

@@ -1,5 +1,5 @@
 import type { Token } from './types.js';
-export declare const keycloak: (issuer: string, clientId: string, scope?: string, redirectPath?: string) => {
+export declare const keycloak: (scope?: string, redirectPath?: string) => {
     getAuthIdentity: (domain: string) => Promise<any>;
     getValidation: (event: any) => Promise<Token>;
     getUser: (token: Token) => Promise<any>;

package/dist/auth/machineAuthenticationProvider.js

@@ -0,0 +1,86 @@
+import { AUTH_KEYCLOAK_ID, AUTH_KEYCLOAK_SECRET, AUTH_KEYCLOAK_ISSUER } from '$env/static/private';
+import * as o from "oauth4webapi";
+const authStateCookieName = 'auth_state';
+const stateIdGenerator = () => crypto.randomUUID();
+const getKeycloakIdentity = async (issuer, client_id, scope, redirectUrl) => {
+    const state = stateIdGenerator();
+    const cookieHeader = `${authStateCookieName}=${state}; HttpOnly; Secure; SameSite=Lax; Max-Age=3600; Path=/`;
+    // const code_challenge = await o.calculatePKCECodeChallenge(state);
+    // const authorizationUrlSearchParams = new URLSearchParams({
+    //     client_id: client_id,
+    //     redirect_uri: redirectUrl,
+    //     response_type: 'code',
+    //     state,
+    //     scope,
+    //     code_challenge
+    // });
+    // const authorizationUrl = `${issuer}/protocol/openid-connect/auth?${authorizationUrlSearchParams}`;
+    const headers = new Headers();
+    // headers.append('Set-Cookie', cookieHeader);
+    headers.append('Location', '/auth/validate');
+    return headers;
+};
+const getKeycloakValidation = async (issuer, client_id, client_secret, scope, event) => {
+    const response = await fetch(`${issuer}/protocol/openid-connect/token`, {
+        method: "POST",
+        body: new URLSearchParams({
+            grant_type: "client_credentials",
+            client_id: client_id,
+            client_secret: client_secret,
+            scope,
+        }),
+        headers: {
+            "Content-Type": "application/x-www-form-urlencoded",
+            Accept: "application/json"
+        }
+    });
+    if (!response.ok) {
+        console.log('Response was NOT okay');
+        throw new Error('Token not validated.');
+    }
+    const token = await response.json();
+    return token;
+};
+const getUser = async (issuer, token) => {
+    try {
+        const accessToken = token.access_token;
+        const response = await fetch(`${issuer}/protocol/openid-connect/userinfo`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/x-www-form-urlencoded",
+                Accept: "application/json",
+                Authorization: `Bearer ${accessToken}`
+            }
+        });
+        if (!response.ok) {
+            throw new Error('Failed to fetch user information.');
+        }
+        const data = await response.json();
+        return data;
+    }
+    catch (error) {
+        return new Response(null, {
+            status: 400
+        });
+    }
+};
+export const keycloak = (scope = '', redirectPath = '/') => {
+    const extendedScope = `openid profile offline_access ${scope}`;
+    const redirectUrl = "/auth/validate";
+    return {
+        getAuthIdentity: async (domain) => {
+            const provider = await getKeycloakIdentity(AUTH_KEYCLOAK_ISSUER, AUTH_KEYCLOAK_ID, extendedScope, `${domain}${redirectUrl}`);
+            return provider;
+        },
+        getValidation: async (event) => {
+            const fullRedirectUrl = `${event.url.origin}${redirectUrl}`;
+            const token = await getKeycloakValidation(AUTH_KEYCLOAK_ISSUER, AUTH_KEYCLOAK_ID, AUTH_KEYCLOAK_SECRET, extendedScope, event);
+            return token;
+        },
+        getUser: async (token) => {
+            const user = await getUser(AUTH_KEYCLOAK_ISSUER, token);
+            return user;
+        },
+        redirectPath
+    };
+};

package/dist/auth/userAuthenticationProvider.d.ts

@@ -0,0 +1,7 @@
+import type { Token } from './types.js';
+export declare const userAuthenticationProvider: (scope?: string, redirectPath?: string) => {
+    getAuthIdentity: (domain: string) => Promise<any>;
+    getValidation: (event: any) => Promise<Token>;
+    getUser: (token: Token) => Promise<any>;
+    redirectPath: string;
+};

package/dist/auth/{authenticationProvider.js → userAuthenticationProvider.js}

@@ -1,3 +1,4 @@
+import { AUTH_KEYCLOAK_ID, AUTH_KEYCLOAK_ISSUER } from '$env/static/private';
 import * as o from "oauth4webapi";
 const authStateCookieName = 'auth_state';
 const stateIdGenerator = () => crypto.randomUUID();
@@ -75,21 +76,21 @@ const getUser = async (issuer, token) => {
         });
     }
 };
-export const keycloak = (issuer, clientId, scope = '', redirectPath = '/') => {
+export const userAuthenticationProvider = (scope = '', redirectPath = '/') => {
     const extendedScope = `openid profile offline_access ${scope}`;
     const redirectUrl = "/auth/validate";
     return {
         getAuthIdentity: async (domain) => {
-            const provider = await getKeycloakIdentity(issuer, clientId, extendedScope, `${domain}${redirectUrl}`);
+            const provider = await getKeycloakIdentity(AUTH_KEYCLOAK_ISSUER, AUTH_KEYCLOAK_ID, extendedScope, `${domain}${redirectUrl}`);
             return provider;
         },
         getValidation: async (event) => {
             const fullRedirectUrl = `${event.url.origin}${redirectUrl}`;
-            const token = await getKeycloakValidation(issuer, clientId, extendedScope, event, fullRedirectUrl);
+            const token = await getKeycloakValidation(AUTH_KEYCLOAK_ISSUER, AUTH_KEYCLOAK_ID, extendedScope, event, fullRedirectUrl);
             return token;
         },
         getUser: async (token) => {
-            const user = await getUser(issuer, token);
+            const user = await getUser(AUTH_KEYCLOAK_ISSUER, token);
             return user;
         },
         redirectPath

package/dist/components/menu/DynamicMenu.svelte

@@ -1,14 +1,12 @@
 <script>import { HeaderNavigationItem } from "./Menu.js";
-import { pages as pagesStore } from "../../stores/pages.js";
 import { selectVisible } from "./MenuFunctions.js";
 import { isAuthenticated } from "./authentication.js";
 import { page } from "$app/stores";
 export let css = "";
 export let navCss = "";
 export let localPages = [];
-$: activePages = !localPages || localPages.length == 0 ? $pagesStore : localPages;
 $: pagesVisiblity = isAuthenticated($page);
-$: visibleNavItems = selectVisible(activePages, pagesVisiblity);
+$: visibleNavItems = selectVisible(localPages, pagesVisiblity);
 const klasses = ["flex", "flex-dynamic-row", css ? css : ""].filter((c) => c).join(" ");
 </script>
 

package/package.json

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