@functionalcms/svelte-components 5.2.4 → 5.3.0

package/dist/components/form/SmartForm.svelte

@@ -4,7 +4,6 @@
 		type SelectField,
 		type CollectionField,
 		type TextareaField,
-		type FieldType,
 		type InputField,
 		type FilePickerField,
 		type PhoneInputField,

package/dist/index-server.d.ts

@@ -1,7 +1,7 @@
 export { default as authorizationHandle } from './server-side/auth/authorizationHandle.js';
 export { default as errorHandler } from './server-side/auth/errorHandle.js';
-export { authenticationHandle } from './server-side/auth/authentication.js';
-export { machineAuthenticationProvider } from './server-side/auth/machineAuthenticationProvider.js';
+export { authenticationHandle } from './server-side/auth/user_authentication.js';
+export { machineAuthenticationHandle } from './server-side/auth/machine_authentication.js';
 export { userAuthenticationProvider } from './server-side/auth/userAuthenticationProvider.js';
 export { hookSequence } from './server-side/functionalSequence.js';
 export { sessionStorageHandler } from './server-side/handlers/sessionStorageHandler.js';

package/dist/index-server.js

@@ -1,7 +1,7 @@
 export { default as authorizationHandle } from './server-side/auth/authorizationHandle.js';
 export { default as errorHandler } from './server-side/auth/errorHandle.js';
-export { authenticationHandle } from './server-side/auth/authentication.js';
-export { machineAuthenticationProvider } from './server-side/auth/machineAuthenticationProvider.js';
+export { authenticationHandle } from './server-side/auth/user_authentication.js';
+export { machineAuthenticationHandle } from './server-side/auth/machine_authentication.js';
 export { userAuthenticationProvider } from './server-side/auth/userAuthenticationProvider.js';
 export { hookSequence } from './server-side/functionalSequence.js';
 export { sessionStorageHandler } from './server-side/handlers/sessionStorageHandler.js';

package/dist/index.d.ts

@@ -10,7 +10,7 @@ export { default as Well } from './components/presentation/Well.svelte';
 export { default as FlexBox } from './components/presentation/FlexBox.svelte';
 export { default as StyleBox } from './components/presentation/StyleBox.svelte';
 export { default as ImageCompare } from './components/presentation/ImageCompare.svelte';
-export { InputType, FieldType, type Field, type InputField, type TextareaField, type CollectionField, type SelectField, type FilePickerField, type TimePickerField, type PhoneInputField, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, } from './components/form/form.js';
+export { InputType, type Field, type InputField, type TextareaField, type CollectionField, type SelectField, type FilePickerField, type TimePickerField, type PhoneInputField, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, } from './components/form/form.js';
 export { default as AntiBot } from './components/form/AntiBot.svelte';
 export { default as SmartForm } from './components/form/SmartForm.svelte';
 export { default as EasyTools } from './components/integrations/EasyTools.svelte';

package/dist/index.js

@@ -9,7 +9,7 @@ export { default as Well } from './components/presentation/Well.svelte';
 export { default as FlexBox } from './components/presentation/FlexBox.svelte';
 export { default as StyleBox } from './components/presentation/StyleBox.svelte';
 export { default as ImageCompare } from './components/presentation/ImageCompare.svelte';
-export { InputType, FieldType, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, } from './components/form/form.js';
+export { InputType, SubmitResult, createInputField, createTextareaField, createFilePickerField, createCollectionField, createSelectField, createTimePickerField, createPhoneInputField, createHiddenField, } from './components/form/form.js';
 export { default as AntiBot } from './components/form/AntiBot.svelte';
 export { default as SmartForm } from './components/form/SmartForm.svelte';
 export { default as EasyTools } from './components/integrations/EasyTools.svelte';

package/dist/server-side/auth/machine_authentication.d.ts

@@ -0,0 +1,2 @@
+import type { Handle } from "@sveltejs/kit";
+export declare const machineAuthenticationHandle: (serverUrl: string, clientId: string, clientSecret: string) => Handle;

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

@@ -0,0 +1,42 @@
+import { deleteCookie, loadCookie, saveCookie } from "../cookies";
+import { userAuthenticationProvider } from "./userAuthenticationProvider";
+const accessTokenCookie = "functionalcms_access_token";
+const idTokenCookie = "functionalcms_id_token";
+const refreshTokenCookie = "functionalcms_refresh_token";
+export const machineAuthenticationHandle = (serverUrl, clientId, clientSecret) => {
+    const provider = userAuthenticationProvider(serverUrl, clientId);
+    return async ({ event, resolve }) => {
+        try {
+            const hasCookie = event.cookies.get(accessTokenCookie);
+            if (!hasCookie) {
+                const tokens = await login(serverUrl, clientId, clientSecret);
+                event.cookies.set(accessTokenCookie, tokens.access_token, { path: "/" });
+                if (tokens.refresh_token) {
+                    event.cookies.set(refreshTokenCookie, tokens.refresh_token, { path: "/" });
+                }
+            }
+        }
+        catch (error) {
+            console.error("Authentication error:", error);
+        }
+        return resolve(event);
+    };
+};
+const login = async (serverUrl, clientId, clientSecret) => {
+    const tokenRes = await fetch(`${serverUrl}/api/login/oauth/access_token`, {
+        method: "POST",
+        headers: { "Content-Type": "application/x-www-form-urlencoded" },
+        body: new URLSearchParams({
+            grant_type: "client_credentials",
+            client_id: clientId,
+            client_secret: clientSecret,
+            scope: "profile openid  email offline_access"
+        })
+    });
+    const tokens = await tokenRes.json();
+    return {
+        access_token: tokens.access_token,
+        id_token: tokens.id_token,
+        refresh_token: tokens.refresh_token,
+    };
+};

package/dist/server-side/auth/userAuthenticationProvider.d.ts

@@ -1,2 +1,2 @@
-import type { AuthenticationProvider } from "./authentication";
+import type { AuthenticationProvider } from "./user_authentication";
 export declare const userAuthenticationProvider: (serverUrl: string, clientId: string) => AuthenticationProvider;

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

@@ -35,7 +35,6 @@ export const userAuthenticationProvider = (serverUrl, clientId) => {
             access_token: tokens.access_token,
             id_token: tokens.id_token,
             refresh_token: tokens.refresh_token,
-            redirectionUrl: callbackUrl.toString(),
         };
     };
     return {

package/dist/server-side/auth/{authentication.d.ts → user_authentication.d.ts}

@@ -3,7 +3,6 @@ export type CallbackResponse = {
     access_token: string;
     id_token?: string;
     refresh_token?: string;
-    redirectionUrl: string;
 };
 export type SigninResponse = {
     state: string;
@@ -14,4 +13,4 @@ export type AuthenticationProvider = {
     handleLogin(callbackUrl: URL): Promise<SigninResponse>;
     handleCallback: (state: string, codeVerifier: string, eventUrl: URL) => Promise<CallbackResponse>;
 };
-export declare const authenticationHandle: (secret: string, provider: AuthenticationProvider) => Handle;
+export declare const authenticationHandle: (secret: string, serverUrl: string, clientId: string) => Handle;

package/dist/server-side/auth/{authentication.js → user_authentication.js}

@@ -1,10 +1,12 @@
 import { deleteCookie, loadCookie, saveCookie } from "../cookies";
+import { userAuthenticationProvider } from "./userAuthenticationProvider";
 const pkceCookieName = "functionalcms_pkce";
 const stateCookieName = "functionalcms_state";
 const accessTokenCookie = "functionalcms_access_token";
 const idTokenCookie = "functionalcms_id_token";
 const refreshTokenCookie = "functionalcms_refresh_token";
-export const authenticationHandle = (secret, provider) => {
+export const authenticationHandle = (secret, serverUrl, clientId) => {
+    const provider = userAuthenticationProvider(serverUrl, clientId);
     return async ({ event, resolve }) => {
         try {
             if (event.url.pathname === '/auth/callback') {

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

@@ -3,15 +3,17 @@ import { loadCookie, saveCookie } from '../cookies';
 export const sessionStorageHandler = (secret, contentName) => {
     return async ({ event, resolve }) => {
         const item = event?.locals?.[contentName];
+        event.locals[contentName] = {};
         if (!item) {
             let itemContent = await loadCookie(event.cookies, secret, contentName);
-            event.locals[contentName] = JSON.parse(itemContent);
-        }
-        else {
-            event.locals[contentName] = {};
+            if (itemContent && itemContent != '') {
+                event.locals[contentName] = JSON.parse(itemContent);
+            }
         }
         const result = await resolve(event);
-        await saveCookie(result.headers, secret, contentName, JSON.stringify(event.locals[contentName]));
+        if (event.locals[contentName]) {
+            await saveCookie(result.headers, secret, contentName, JSON.stringify(event.locals[contentName]));
+        }
         return result;
     };
 };

package/package.json

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

package/dist/server-side/auth/machineAuthenticationProvider.d.ts

@@ -1,2 +0,0 @@
-import type { AuthenticationProvider } from "./authentication";
-export declare const machineAuthenticationProvider: (serverUrl: string, clientId: string, clientSecret: string, redirectUrl: string) => AuthenticationProvider;

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

@@ -1,33 +0,0 @@
-export const machineAuthenticationProvider = (serverUrl, clientId, clientSecret, redirectUrl) => {
-    const handleLogin = (callbackUrl) => {
-        const response = {
-            state: "",
-            codeVerifier: "",
-            authorisationUrl: callbackUrl.toString(),
-        };
-        return Promise.resolve(response);
-    };
-    const handleCallback = async (state, codeVerifier, eventUrl) => {
-        const tokenRes = await fetch(`${serverUrl}/api/login/oauth/access_token`, {
-            method: "POST",
-            headers: { "Content-Type": "application/x-www-form-urlencoded" },
-            body: new URLSearchParams({
-                grant_type: "client_credentials",
-                client_id: clientId,
-                client_secret: clientSecret,
-                scope: "profile openid  email offline_access"
-            })
-        });
-        const tokens = await tokenRes.json();
-        return {
-            access_token: tokens.access_token,
-            id_token: tokens.id_token,
-            refresh_token: tokens.refresh_token,
-            redirectionUrl: redirectUrl,
-        };
-    };
-    return {
-        handleLogin,
-        handleCallback,
-    };
-};