firstly 0.0.5 → 0.0.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # firstly
 
+## 0.0.6
+
+### Patch Changes
+
+- [#23](https://github.com/jycouet/firstly/pull/23)
+  [`c188eb3`](https://github.com/jycouet/firstly/commit/c188eb3d81a9e75b246387512621b5213bbe8dbd)
+  Thanks [@jycouet](https://github.com/jycouet)! - fix auth & mail (logs & co)
+
 ## 0.0.5
 
 ### Patch Changes

package/esm/ROUTES.d.ts

@@ -32,6 +32,7 @@ declare const AllObjs: {
         repo?: (string | number);
     }) => string;
     "/": string;
+    "/mail": string;
     "/remult": string;
     "/remult/auth": string;
     "/remult/enum": string;
@@ -40,7 +41,7 @@ declare const AllObjs: {
 };
 type AllTypes = typeof AllObjs;
 export type Routes = keyof AllTypes extends `${string}/${infer Route}` ? `/${Route}` : keyof AllTypes;
-export declare const routes: ("/" | "/remult" | "/remult/auth" | "/remult/enum" | "/remult/select" | "/ui" | "firstly_sign_in" | "remult_admin" | "github")[];
+export declare const routes: ("/" | "/mail" | "/remult" | "/remult/auth" | "/remult/enum" | "/remult/select" | "/ui" | "firstly_sign_in" | "remult_admin" | "github")[];
 /**
  * To be used like this:
  * ```ts
@@ -69,6 +70,7 @@ export declare function route<T extends NonFunctionKeys<AllTypes>>(key: T): stri
 export type KIT_ROUTES = {
     PAGES: {
         '/': never;
+        '/mail': never;
         '/remult': never;
         '/remult/auth': never;
         '/remult/enum': never;

package/esm/ROUTES.js

@@ -9,6 +9,7 @@
  */
 const PAGES = {
     "/": `/`,
+    "/mail": `/mail`,
     "/remult": `/remult`,
     "/remult/auth": `/remult/auth`,
     "/remult/enum": `/remult/enum`,

package/esm/api/index.d.ts

@@ -26,7 +26,7 @@ export type Module = {
 };
 type Options = Omit<RemultServerOptions<RequestEvent<Partial<Record<string, string>>, string | null>> & {
     modules?: Module[] | undefined;
-    mail?: MailOptions;
+    mail?: MailOptions<any>;
 }, 'entities' | 'controllers' | 'initRequest' | 'initApi'>;
 /**
  * it's basically `remultSveltekit` with the `modules` option

package/esm/auth/AuthController.server.js

@@ -93,8 +93,23 @@ export class AuthControllerServer {
                 await sendMail('invite', {
                     to: email,
                     subject: 'Invitation',
-                    text: `You were invited here: ${url}`,
-                    html: `You were invited <a href="${url}">here</a>`,
+                    templateProps: {
+                        title: 'Invitation 👋',
+                        previewText: 'This is the mail you were waiting for',
+                        sections: [
+                            {
+                                text: 'Today is your lucky day !',
+                                highlighted: true,
+                            },
+                            {
+                                text: 'You were invited to join the team',
+                                cta: {
+                                    text: 'JOIN',
+                                    link: url,
+                                },
+                            },
+                        ],
+                    },
                 });
                 logAuth.success(`Done with ${green('sendMail')} (${url})`);
                 return 'Demo Mail sent !';
@@ -138,7 +153,7 @@ export class AuthControllerServer {
             await createSession(user.id);
         }
         else {
-            const url = `${remult.context.url.origin}${oSafe.firstlyData.props.ui.providers.password.paths.verify_email}?token=${token}`;
+            const url = `${remult.context.url.origin}${oSafe.firstlyData.props.ui?.paths.verify_email}?token=${token}`;
             if (AUTH_OPTIONS.providers?.password?.verifyMailSend) {
                 await AUTH_OPTIONS.providers?.password.verifyMailSend({ email, url });
                 logAuth.success(`Done with custom ${green('verifyMailSend')} (${yellow(url)})`);
@@ -146,9 +161,20 @@ export class AuthControllerServer {
             else {
                 await sendMail('signUpPassword', {
                     to: email,
-                    subject: 'Wecome!',
-                    text: `You can validate your account here: ${url}`,
-                    html: `You can validate your account <a href="${url}">here</a>`,
+                    subject: 'Wecome',
+                    templateProps: {
+                        title: 'Wecome 👋',
+                        previewText: 'This is the mail you were waiting for',
+                        sections: [
+                            {
+                                text: 'You can validate your account',
+                                cta: {
+                                    text: 'HERE',
+                                    link: url,
+                                },
+                            },
+                        ],
+                    },
                 });
                 logAuth.success(`Done with ${green('sendMail')} (${url})`);
             }
@@ -201,7 +227,7 @@ export class AuthControllerServer {
             authAccount.token = token;
             authAccount.expiresAt = createDate(new TimeSpan(AUTH_OPTIONS.providers?.password?.resetPasswordExpiresIn ?? 5 * 60, 's'));
             await remult.repo(oSafe.Account).save(authAccount);
-            const url = `${remult.context.url.origin}${oSafe.firstlyData.props.ui.providers.password.paths.reset_password}?token=${token}`;
+            const url = `${remult.context.url.origin}${oSafe.firstlyData.props.ui?.paths.reset_password}?token=${token}`;
             if (AUTH_OPTIONS.providers?.password?.resetPasswordSend) {
                 await AUTH_OPTIONS.providers?.password.resetPasswordSend({ email, url });
                 logAuth.success(`Done with custom ${green('resetPasswordSend')} (${yellow(url)})`);
@@ -211,8 +237,23 @@ export class AuthControllerServer {
                 await sendMail('forgotPassword', {
                     to: email,
                     subject: 'Reset your password',
-                    text: `You can reset your password here: ${url}`,
-                    html: `You can reset your password <a href="${url}">here</a>`,
+                    templateProps: {
+                        title: 'Reset your password 👋',
+                        previewText: 'This is the mail you were waiting for',
+                        sections: [
+                            {
+                                text: 'Did you forgot something ?',
+                                highlighted: true,
+                            },
+                            {
+                                text: 'No worries, you can reset your password',
+                                cta: {
+                                    text: 'HERE',
+                                    link: url,
+                                },
+                            },
+                        ],
+                    },
                 });
                 logAuth.success(`Done with ${green('sendMail')} (${url})`);
                 return 'Demo Mail sent !';

package/esm/auth/index.d.ts

@@ -3,9 +3,9 @@ import { Lucia, type SessionCookieOptions } from 'lucia';
 import type { ClassType, UserInfo } from 'remult';
 import { Log } from '@kitql/helpers';
 import type { Module } from '../api';
-import type { ResolvedType } from '../utils/types';
+import type { RecursivePartial, ResolvedType } from '../utils/types';
 import { FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession } from './Entities';
-import type { firstlyData } from './types';
+import type { firstlyData, firstlyDataAuth } from './types';
 export type { firstlyData };
 export { FFAuthUser, FFAuthAccount, FFAuthProvider, FFAuthUserSession };
 export type AuthorizationURLOptions = Record<string, {
@@ -35,11 +35,8 @@ type AuthOptions<TUserEntity extends FFAuthUser = FFAuthUser, TSessionEntity ext
         Session?: ClassType<TSessionEntity>;
         Account?: ClassType<TAccountEntity>;
     };
-    ui?: {
-        paths?: {
-            base?: string;
-        };
-    } | false;
+    debug?: boolean;
+    ui?: false | RecursivePartial<firstlyDataAuth['ui']>;
     /** in secondes @default 15 days */
     sessionExpiresIn?: number;
     sessionCookie?: SessionCookieOptions;

package/esm/auth/index.js

@@ -15,43 +15,47 @@ import { initRoleFromEnv } from './RoleHelpers';
 export { FFAuthUser, FFAuthAccount, FFAuthProvider, FFAuthUserSession };
 export const logAuth = new Log('firstly | auth');
 export { FF_Auth_Role } from './Entities';
-export let AUTH_OPTIONS = {};
+export let AUTH_OPTIONS = { ui: {} };
+const buildUrlOrDefault = (base, userSetting, fallback) => {
+    if (userSetting) {
+        return `${base}/${userSetting}`;
+    }
+    return `${base}/${fallback}`;
+};
 export const getSafeOptions = () => {
     const signUp = AUTH_OPTIONS.signUp ?? true;
     const base = AUTH_OPTIONS.ui === false ? 'NO_BASE_PATH' : AUTH_OPTIONS.ui?.paths?.base ?? '/ff/auth';
-    const oAuths = AUTH_OPTIONS.providers?.oAuths?.map((o) => {
-        return o.name;
-    }) ?? [];
+    // const oAuths =
+    //   AUTH_OPTIONS.providers?.oAuths?.map((o) => {
+    //     return o.name
+    //   }) ?? []
     const firstlyData = {
         module: 'auth',
+        debug: AUTH_OPTIONS.debug,
         props: {
-            ui: {
-                paths: {
-                    base,
-                },
-                providers: {
-                    password: {
-                        dico: {
-                            email: 'Email',
-                            email_placeholder: 'Your email address',
-                            password: 'Password',
-                            btn_sign_up: 'Sign up',
-                            btn_sign_in: 'Sign in',
-                            forgot_password: 'Forgot your password?',
-                            send_password_reset_instructions: 'Send password reset instructions',
-                            back_to_sign_in: 'Back to sign in',
-                        },
-                        paths: {
-                            sign_up: signUp ? `${base}/sign-up` : false,
-                            sign_in: `${base}/sign-in`,
-                            forgot_password: `${base}/forgot-password`,
-                            reset_password: `${base}/reset-password`,
-                            verify_email: `${base}/verify-email`,
-                        },
+            ui: AUTH_OPTIONS.ui === false
+                ? undefined
+                : {
+                    paths: {
+                        base,
+                        sign_up: buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.sign_up, 'sign-up'),
+                        sign_in: buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.sign_in, 'sign-in'),
+                        forgot_password: buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.forgot_password, 'forgot-password'),
+                        reset_password: buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.reset_password, 'reset-password'),
+                        verify_email: buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.verify_email, 'verify-email'),
+                    },
+                    strings: {
+                        email: AUTH_OPTIONS.ui?.strings?.email ?? 'Email',
+                        email_placeholder: AUTH_OPTIONS.ui?.strings?.email_placeholder ?? 'Your email address',
+                        password: AUTH_OPTIONS.ui?.strings?.password ?? 'Password',
+                        btn_sign_up: AUTH_OPTIONS.ui?.strings?.btn_sign_up ?? 'Sign up',
+                        btn_sign_in: AUTH_OPTIONS.ui?.strings?.btn_sign_in ?? 'Sign in',
+                        forgot_password: AUTH_OPTIONS.ui?.strings?.forgot_password ?? 'Forgot your password?',
+                        send_password_reset_instructions: AUTH_OPTIONS.ui?.strings?.send_password_reset_instructions ??
+                            'Send password reset instructions',
+                        back_to_sign_in: AUTH_OPTIONS.ui?.strings?.back_to_sign_in ?? 'Back to sign in',
                     },
-                    oAuths,
                 },
-            },
         },
     };
     let redirectUrl = AUTH_OPTIONS.defaultRedirect ?? '/';
@@ -110,11 +114,11 @@ export const auth = (o) => {
             }
         },
         earlyReturn: async ({ event, resolve }) => {
-            if (AUTH_OPTIONS.ui === false) {
-                return { early: false };
-            }
+            // if (AUTH_OPTIONS.ui === false) {
+            //   return { early: false }
+            // }
             const oSafe = getSafeOptions();
-            if (event.url.pathname === oSafe.firstlyData.props.ui.providers.password.paths.verify_email) {
+            if (event.url.pathname === oSafe.firstlyData.props.ui?.paths?.verify_email) {
                 const token = event.url.searchParams.get('token') ?? '';
                 if (!oSafe.password_enabled) {
                     throw Error('Password is not enabled!');
@@ -144,7 +148,8 @@ export const auth = (o) => {
             if (installedFirstlyPath) {
                 staticPath = `${installedFirstlyPath}/esm/auth/static/`;
             }
-            if (event.url.pathname.startsWith(oSafe.firstlyData.props.ui.paths.base)) {
+            if (oSafe.firstlyData.props.ui?.paths?.base &&
+                event.url.pathname.startsWith(oSafe.firstlyData.props.ui.paths.base)) {
                 const content = read(`${staticPath}index.html`);
                 return {
                     early: true,

package/esm/auth/static/assets/Page-BGTO8LC5.css

@@ -0,0 +1 @@
+form.s-KT008SdmQprk,form.s-N0DaQgJ_T5_C,form.s-85Tmcm64bnMI{display:flex;flex-direction:column}.message.s-85Tmcm64bnMI:empty{display:none}.message.s-85Tmcm64bnMI{background:var(--pico-muted-border-color);padding:var(--pico-form-element-spacing-vertical) var(--pico-form-element-spacing-horizontal);border-radius:var(--pico-border-radius);margin-bottom:calc(var(--pico-typography-spacing-vertical) * 2)}.message.error.s-85Tmcm64bnMI{background:var(--pico-del-color);color:#4c1513}form.s-FRwn6sVlvC6z{display:flex;flex-direction:column}.message.s-FRwn6sVlvC6z:empty{display:none}.message.s-FRwn6sVlvC6z{background:var(--pico-muted-border-color);padding:var(--pico-form-element-spacing-vertical) var(--pico-form-element-spacing-horizontal);border-radius:var(--pico-border-radius);margin-bottom:calc(var(--pico-typography-spacing-vertical) * 2)}.message.error.s-FRwn6sVlvC6z{background:var(--pico-del-color);color:#4c1513}.wrapper.s-NO-a_LAEXXH5{min-height:100vh;display:flex;justify-content:center;align-items:center;margin:0 auto}.form.s-NO-a_LAEXXH5{padding:1rem;max-width:360px;width:100%}.form-footer.s-NO-a_LAEXXH5{margin-top:1rem;display:flex;flex-direction:column;justify-content:center;align-items:center}.fallback.s-NO-a_LAEXXH5{display:flex;justify-content:center;align-items:center}

package/esm/auth/static/assets/Page-DBWJjlEQ.d.ts

@@ -0,0 +1,4 @@
+export { v as default };
+declare class v extends l {
+}
+import { S as l } from "./index-qfq98Nyd.js";

package/esm/auth/static/assets/Page-DBWJjlEQ.js

@@ -0,0 +1 @@
+import{S as l,b as d,a as f,d as i,h as m,M as p,t as u,n as r,z as h}from"./index-qfq98Nyd.js";function c(a){let e;const n={c:function(){e=p("Hello from files")},l:function(t){throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option")},m:function(t,o){u(t,e,o)},p:r,i:r,o:r,d:function(t){t&&h(e)}};return i("SvelteRegisterBlock",{block:n,id:c.name,type:"component",source:"",ctx:a}),n}function w(a,e){let{$$slots:n={},$$scope:s}=e;m("Page",n,[]);const t=[];return Object.keys(e).forEach(o=>{!~t.indexOf(o)&&o.slice(0,2)!=="$$"&&o!=="slot"&&console.warn(`<Page> was created with unknown prop '${o}'`)}),[]}class v extends l{constructor(e){super(e),d(this,e,w,c,f,{}),i("SvelteRegisterComponent",{component:this,tagName:"Page",options:e,id:c.name})}}export{v as default};

package/esm/auth/static/assets/Page-RIbXHuZG.d.ts

@@ -0,0 +1,4 @@
+export { v as default };
+declare class v extends l {
+}
+import { S as l } from "./index-qfq98Nyd.js";

package/esm/auth/static/assets/Page-RIbXHuZG.js

@@ -0,0 +1 @@
+import{S as l,b as d,a as f,d as i,h as m,M as p,t as u,n as r,z as h}from"./index-qfq98Nyd.js";function c(s){let e;const n={c:function(){e=p("Hello from admin")},l:function(t){throw new Error("options.hydrate only works if the component was compiled with the `hydratable: true` option")},m:function(t,o){u(t,e,o)},p:r,i:r,o:r,d:function(t){t&&h(e)}};return i("SvelteRegisterBlock",{block:n,id:c.name,type:"component",source:"",ctx:s}),n}function w(s,e){let{$$slots:n={},$$scope:a}=e;m("Page",n,[]);const t=[];return Object.keys(e).forEach(o=>{!~t.indexOf(o)&&o.slice(0,2)!=="$$"&&o!=="slot"&&console.warn(`<Page> was created with unknown prop '${o}'`)}),[]}class v extends l{constructor(e){super(e),d(this,e,w,c,f,{}),i("SvelteRegisterComponent",{component:this,tagName:"Page",options:e,id:c.name})}}export{v as default};

package/esm/auth/static/assets/Page-apb_xgZT.d.ts

@@ -0,0 +1,6 @@
+export { Oa as default };
+declare class Oa extends et {
+    set firstlyData(e: void);
+    get firstlyData(): void;
+}
+import { S as et } from "./index-qfq98Nyd.js";