firstly 0.0.12 → 0.0.13

package/esm/auth/server/module.js

@@ -1,7 +1,8 @@
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 import { EntityError, remult } from 'remult';
 import { red } from '@kitql/helpers';
 import { getRelativePackagePath } from '@kitql/internals';
+import { building } from '$app/environment';
 import { AuthController } from '..';
 import { FF_Role } from '../..';
 import { Module } from '../../api';
@@ -23,42 +24,44 @@ const buildUrlOrDefault = (base, userSetting, 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 ui = AUTH_OPTIONS.ui === false
+        ? undefined
+        : {
+            paths: {
+                base,
+                sign_up: signUp ? buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.sign_up, 'sign-up') : false,
+                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: {
+                app_name: AUTH_OPTIONS.ui?.strings?.app_name ?? '',
+                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',
+                password_placeholder: AUTH_OPTIONS.ui?.strings?.password_placeholder ?? 'Your password',
+                confirm: AUTH_OPTIONS.ui?.strings?.confirm ?? 'Confirm',
+                reset: AUTH_OPTIONS.ui?.strings?.reset ?? 'Reset',
+                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',
+            },
+            images: {
+                main: AUTH_OPTIONS.ui?.images?.main ?? '',
+            },
+        };
+    if (AUTH_OPTIONS.debug && !building) {
+        authModuleRaw.log.info('ui', ui);
+    }
     const firstlyData = {
         module: 'auth',
         debug: AUTH_OPTIONS.debug,
         props: {
-            ui: AUTH_OPTIONS.ui === false
-                ? undefined
-                : {
-                    paths: {
-                        base,
-                        sign_up: signUp
-                            ? buildUrlOrDefault(base, AUTH_OPTIONS.ui?.paths?.sign_up, 'sign-up')
-                            : false,
-                        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: {
-                        app_name: AUTH_OPTIONS.ui?.strings?.app_name ?? '',
-                        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',
-                        password_placeholder: AUTH_OPTIONS.ui?.strings?.password_placeholder ?? 'Your password',
-                        confirm: AUTH_OPTIONS.ui?.strings?.confirm ?? 'Confirm',
-                        reset: AUTH_OPTIONS.ui?.strings?.reset ?? 'Reset',
-                        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',
-                    },
-                    images: {
-                        main: AUTH_OPTIONS.ui?.images?.main ?? '',
-                    },
-                },
+            ui,
         },
     };
     let uiStaticPath = AUTH_OPTIONS.uiStaticPath ?? '';
@@ -91,29 +94,33 @@ export const getSafeOptions = () => {
             };
         };
     }
-    function validatePassword(password) {
-        if (typeof password !== 'string' || password.length < 6 || password.length > 255) {
+    function validateInput({ identifier, password }) {
+        if (typeof identifier !== 'string' || identifier.length === 0) {
+            throw new EntityError({ message: 'Invalid identifier' });
+        }
+        if (typeof password !== 'string') {
             throw new EntityError({ message: 'Invalid password' });
         }
+        if (password.length < 6 || password.length > 255) {
+            throw new EntityError({ message: 'Password too short or too long!' });
+        }
     }
     function passwordHash(password) {
-        validatePassword(password);
-        return bcrypt.hashSync(password, AUTH_OPTIONS.providers?.password?.settings?.bcrypt?.saltRounds ?? 10);
+        return bcrypt.hashSync(password, AUTH_OPTIONS.providers?.password?.algo?.bcrypt?.saltRounds ?? 10);
     }
     function passwordVerify(password, hash) {
         return bcrypt.compareSync(password, hash);
     }
     return {
         User: (AUTH_OPTIONS.customEntities?.User ?? FFAuthUser),
-        Session: (AUTH_OPTIONS.customEntities?.Session ??
-            FFAuthUserSession),
+        Session: (AUTH_OPTIONS.customEntities?.Session ?? FFAuthUserSession),
         Account: (AUTH_OPTIONS.customEntities?.Account ?? FFAuthAccount),
         signUp,
         password: {
             enabled: AUTH_OPTIONS.providers?.password ? true : false,
-            validatePassword: AUTH_OPTIONS.providers?.password?.settings?.bcrypt?.validatePassword ?? validatePassword,
-            passwordHash: AUTH_OPTIONS.providers?.password?.settings?.bcrypt?.passwordHash ?? passwordHash,
-            passwordVerify: AUTH_OPTIONS.providers?.password?.settings?.bcrypt?.passwordVerify ?? passwordVerify,
+            validateInput: AUTH_OPTIONS.providers?.password?.algo?.validateInput ?? validateInput,
+            hash: AUTH_OPTIONS.providers?.password?.algo?.hash ?? passwordHash,
+            verify: AUTH_OPTIONS.providers?.password?.algo?.verify ?? passwordVerify,
         },
         otp: { enabled: AUTH_OPTIONS.providers?.otp ? true : false },
         verifiedMethod: AUTH_OPTIONS.verifiedMethod ?? 'auto',
@@ -126,6 +133,12 @@ export const getSafeOptions = () => {
             cookieName: AUTH_OPTIONS.session?.COOKIE_NAME ?? 'firstly_auth_session',
         },
         providers: AUTH_OPTIONS.providers,
+        strings: {
+            resetPasswordSend: AUTH_OPTIONS.strings?.resetPasswordSend ?? 'Mail sent ! You can now close this window.',
+            anErrorOccurred: AUTH_OPTIONS.strings?.anErrorOccurred ?? 'An error occurred, contact the administrator.',
+            cannotSignUp: AUTH_OPTIONS.strings?.cannotSignUp ??
+                "You can't signup by yourself! Contact the administrator.",
+        },
     };
 };
 export const authModuleRaw = new Module({

package/esm/auth/server/providers/github.d.ts

@@ -1,4 +1,5 @@
-import { GitHub, OAuth2Tokens } from 'arctic';
+import type { OAuth2Tokens } from 'arctic';
+import { GitHub } from 'arctic';
 import { type FFOAuth2Provider, type OAuth2UserInfo, type ProviderAuthorizationURLOptions } from '../module';
 /**
  * ## GitHub OAuth2 provider

package/esm/auth/server/providers/github.js

@@ -1,4 +1,4 @@
-import { GitHub, OAuth2Tokens } from 'arctic';
+import { GitHub } from 'arctic';
 import { remult } from 'remult';
 import { env } from '$env/dynamic/private';
 import { authModuleRaw, } from '../module';

package/esm/auth/static/assets/Page-BUfjaN-D.d.ts

@@ -0,0 +1,5 @@
+export { Ml as default };
+declare class Ml extends st {
+    constructor(e: any);
+}
+import { S as st } from "./index-D-Ztdt2o.js";