firstly 0.0.15 → 0.0.16-next.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # firstly
 
+## 0.0.16-next.0
+
+### Patch Changes
+
+- [#102](https://github.com/jycouet/firstly/pull/102)
+  [`f0effb9`](https://github.com/jycouet/firstly/commit/f0effb9e2dfa3f1c3070bc27c498d7f1e1ed877d)
+  Thanks [@jycouet](https://github.com/jycouet)! - Prepare JYC 016
+
 ## 0.0.15
 
 ### Patch Changes

package/esm/ROUTES.d.ts

@@ -33,7 +33,11 @@ declare const AllObjs: {
     }) => string;
     "/": string;
     "/auth": string;
-    "/demo/task": string;
+    "/demo/FF_Cell": string;
+    "/demo/FF_Form_Grid": string;
+    "/demo/FF_Layout": string;
+    "/demo/FF_Layout/grid": string;
+    "/demo/FF_Simple": string;
     "/mail": string;
     "/ui/dialog": string;
     "/ui/enum": string;
@@ -72,7 +76,11 @@ export type KIT_ROUTES = {
     PAGES: {
         '/': never;
         '/auth': never;
-        '/demo/task': never;
+        '/demo/FF_Cell': never;
+        '/demo/FF_Form_Grid': never;
+        '/demo/FF_Layout': never;
+        '/demo/FF_Layout/grid': never;
+        '/demo/FF_Simple': never;
         '/mail': never;
         '/ui/dialog': never;
         '/ui/enum': never;

package/esm/ROUTES.js

@@ -10,7 +10,11 @@
 const PAGES = {
     "/": `/`,
     "/auth": `/auth`,
-    "/demo/task": `/demo/task`,
+    "/demo/FF_Cell": `/demo/FF_Cell`,
+    "/demo/FF_Form_Grid": `/demo/FF_Form_Grid`,
+    "/demo/FF_Layout": `/demo/FF_Layout`,
+    "/demo/FF_Layout/grid": `/demo/FF_Layout/grid`,
+    "/demo/FF_Simple": `/demo/FF_Simple`,
     "/mail": `/mail`,
     "/ui/dialog": `/ui/dialog`,
     "/ui/enum": `/ui/enum`,

package/esm/auth/Entities.js

@@ -31,6 +31,7 @@ __decorate([
 ], FFAuthUser.prototype, "updatedAt", void 0);
 __decorate([
     Fields.string({
+        allowApiUpdate: false,
         validate: [
             Validators.unique(),
             Validators.required(),

package/esm/auth/server/handleAuth.js

@@ -31,7 +31,8 @@ export const handleAuth = async ({ event, resolve }) => {
     }
     if (oSafe.firstlyData.props.ui?.paths?.base &&
         event.url.pathname.startsWith(oSafe.firstlyData.props.ui.paths.base)) {
-        const content = read(`${oSafe.uiStaticPath}index.html`);
+        let content = read(`${oSafe.uiStaticPath}index.html`) ?? '';
+        content = content?.replaceAll('<!--PLACE_HERE_HEAD-->', oSafe.ui?.customHtmlHead ?? '');
         return new Response(content + `<script>const firstlyData = ${JSON.stringify(oSafe.firstlyData)}</script>`, {
             headers: { 'content-type': 'text/html' },
         });

package/esm/auth/server/handleGuard.d.ts

@@ -1,9 +1,15 @@
 import { type Handle } from '@sveltejs/kit';
 export type RouteGuardConfig = {
-    anonymous?: string[];
-    authenticated: string[];
-    redirectToLogin: string;
-    redirectAuthenticated: string;
+    /**
+     * Routes that require authentication (e.g. `{ path: '/app*' }`)
+     */
+    guard: {
+        path: string;
+    }[];
+    /**
+     * Where to redirect when authentication is required but user is not logged in
+     */
+    login: string;
     /**
      * We need this import
      *

package/esm/auth/server/handleGuard.js

@@ -1,67 +1,34 @@
 import {} from '@sveltejs/kit';
 import { remult } from 'remult';
-/**
- * Checks if a path matches a pattern that may include wildcards
- * @param path The actual path to check
- * @param pattern The pattern that may include wildcards (*)
- */
 function pathMatchesPattern(path, pattern) {
     // Convert the pattern to a regex
     const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*/g, '.*');
     const regex = new RegExp(`^${regexPattern}$`);
     return regex.test(path);
 }
-/**
- * Checks if a path matches any of the patterns in the array
- */
 function pathMatchesAnyPattern(path, patterns) {
-    return patterns.some((pattern) => pathMatchesPattern(path, pattern));
+    return patterns.some((pattern) => pathMatchesPattern(path, pattern.path));
 }
 /**
  * Creates a handle function with the provided route guard configuration
  */
 export function handleGuard(config) {
     return async ({ event, resolve }) => {
-        const path = event.url.pathname;
-        const fullUrl = event.url.pathname + event.url.search;
+        const pathname = event.url.pathname;
         const isAuthenticated = !!remult.user;
-        // Check if the path is in the anonymous routes
-        const isAnonymousRoute = config.anonymous ? pathMatchesAnyPattern(path, config.anonymous) : false;
-        // Check if the path is in the authenticated routes
-        const isAuthenticatedRoute = pathMatchesAnyPattern(path, config.authenticated);
-        // Check if the current path is the login page
-        const isLoginPage = path === config.redirectToLogin || path === config.redirectToLogin.replace(/\/$/, '');
-        // Create login URL with redirect parameter
-        const createLoginUrl = (returnUrl) => {
-            const encodedReturnUrl = encodeURIComponent(returnUrl);
-            const separator = config.redirectToLogin.includes('?') ? '&' : '?';
-            return `${config.redirectToLogin}${separator}redirect=${encodedReturnUrl}`;
-        };
-        // Handle root path
-        if (path === config.redirectToLogin) {
-            if (isAuthenticated) {
-                config.redirect(302, config.redirectAuthenticated);
-            }
-            else {
-                // Only redirect if we're not already on the login page
-                if (!isLoginPage) {
-                    config.redirect(302, config.redirectToLogin);
-                }
-            }
-        }
+        const isAuthenticatedRoute = pathMatchesAnyPattern(pathname, config.guard);
         // If user is not authenticated and tries to access an authenticated route
         if (!isAuthenticated && isAuthenticatedRoute) {
             // Redirect to login with the current URL as the redirect target
             // Only redirect if we're not already on the login page
+            const isLoginPage = pathname === config.login || pathname === config.login.replace(/\/$/, '');
             if (!isLoginPage) {
-                config.redirect(302, createLoginUrl(fullUrl));
+                const encodedReturnUrl = encodeURIComponent(pathname + event.url.search);
+                const separator = config.login.includes('?') ? '&' : '?';
+                const loginUrl = `${config.login}${separator}redirect=${encodedReturnUrl}`;
+                config.redirect(302, loginUrl);
             }
         }
-        // If user is authenticated and tries to access an anonymous-only route
-        // Only check if anonymous routes are defined
-        if (config.anonymous && isAuthenticated && isAnonymousRoute) {
-            config.redirect(302, config.redirectAuthenticated);
-        }
         return resolve(event);
     };
 }

package/esm/auth/server/module.d.ts

@@ -236,6 +236,34 @@ export declare const getSafeOptions: <TUserEntity extends FFAuthUser = FFAuthUse
         anErrorOccurred: string;
         cannotSignUp: string;
     };
+    ui: {
+        readonly paths: {
+            readonly base: string;
+            readonly sign_up: string | false;
+            readonly sign_in: string | false;
+            readonly forgot_password: string | false;
+            readonly reset_password: string | false;
+            readonly verify_email: string | false;
+        };
+        readonly strings: {
+            readonly app_name: string;
+            readonly email: string;
+            readonly email_placeholder: string;
+            readonly password: string;
+            readonly password_placeholder: string;
+            readonly confirm: string;
+            readonly reset: string;
+            readonly btn_sign_up: string;
+            readonly btn_sign_in: string;
+            readonly forgot_password: string;
+            readonly send_password_reset_instructions: string;
+            readonly back_to_sign_in: string;
+        };
+        readonly images: {
+            readonly main: string;
+        };
+        readonly customHtmlHead: string;
+    } | undefined;
 };
 export declare const authModuleRaw: Module;
 /**

package/esm/auth/server/module.js

@@ -53,6 +53,8 @@ export const getSafeOptions = () => {
             images: {
                 main: AUTH_OPTIONS.ui?.images?.main ?? '',
             },
+            customHtmlHead: AUTH_OPTIONS.ui?.customHtmlHead ??
+                '<title>Auth</title><link rel="icon" href="https://firstly.fun/favicon.svg" />',
         };
     if (AUTH_OPTIONS.debug && !building) {
         authModuleRaw.log.info('ui', ui);
@@ -139,6 +141,7 @@ export const getSafeOptions = () => {
             cannotSignUp: AUTH_OPTIONS.strings?.cannotSignUp ??
                 "You can't signup by yourself! Contact the administrator.",
         },
+        ui,
     };
 };
 export const authModuleRaw = new Module({

package/esm/auth/static/assets/{Page-B1GE_oYi.d.ts → Page-BgIgl-Te.d.ts}

@@ -1,6 +1,6 @@
 export { a as default };
 declare function a(e: any, s: any): any;
 declare namespace a {
-    let ______13020: string;
-    export { ______13020 as __@$@13020 };
+    let ______17210: string;
+    export { ______17210 as __@$@17210 };
 }

package/esm/auth/static/assets/{Page-CDHFtYuN.js → Page-BgIgl-Te.js}

@@ -1 +1 @@
-import{v as r,x as l,aa as o,J as m,K as p,M as u,O as d,P as f,R as g}from"./index-7Nh2ct-y.js";d();a[f]="src/lib/modules/storage/Page.svelte";function a(e,s){r(new.target),l(s,!1,a);var t=o("Hello from files");return m(e,t),p({...u()})}g(a);export{a as default};
+import{v as r,x as l,aa as o,J as m,K as p,M as u,O as d,P as f,R as g}from"./index-DAjei0Ie.js";d();a[f]="src/lib/modules/storage/Page.svelte";function a(e,s){r(new.target),l(s,!1,a);var t=o("Hello from files");return m(e,t),p({...u()})}g(a);export{a as default};

package/esm/auth/static/assets/{Page-Dh8pvAo6.d.ts → Page-HDnoBhpE.d.ts}

@@ -1,6 +1,6 @@
 export { Q as default };
 declare function Q(n: any, e: any): any;
 declare namespace Q {
-    let ______13020: string;
-    export { ______13020 as __@$@13020 };
+    let ______17210: string;
+    export { ______17210 as __@$@17210 };
 }