firstly 0.0.6 → 0.0.7

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # firstly
 
+## 0.0.7
+
+### Patch Changes
+
+- [#25](https://github.com/jycouet/firstly/pull/25)
+  [`54f2f6a`](https://github.com/jycouet/firstly/commit/54f2f6a833c1977c3163e91ce3172fa8edc9da47)
+  Thanks [@jycouet](https://github.com/jycouet)! - adding e2e tests for accounts
+
+- [#25](https://github.com/jycouet/firstly/pull/25)
+  [`943e9d0`](https://github.com/jycouet/firstly/commit/943e9d0b6d5d6a631dc78661d188a76f254d4632)
+  Thanks [@jycouet](https://github.com/jycouet)! - rename name to identifier in db
+
 ## 0.0.6
 
 ### Patch Changes

package/esm/ROUTES.d.ts

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

package/esm/ROUTES.js

@@ -9,12 +9,12 @@
  */
 const PAGES = {
     "/": `/`,
+    "/auth": `/auth`,
     "/mail": `/mail`,
-    "/remult": `/remult`,
-    "/remult/auth": `/remult/auth`,
-    "/remult/enum": `/remult/enum`,
-    "/remult/select": `/remult/select`,
-    "/ui": `/ui`
+    "/ui/dialog": `/ui/dialog`,
+    "/ui/enum": `/ui/enum`,
+    "/ui/fieldGroup": `/ui/fieldGroup`,
+    "/ui/select": `/ui/select`
 };
 /**
  * SERVERS

package/esm/auth/Adapter.js

@@ -7,12 +7,14 @@ export class RemultLuciaAdapter {
         if (session) {
             const user = await remult.repo(oSafe.User).findId(session.userId);
             if (user) {
+                const { identifier, ...userInfo } = user;
                 return [
                     { ...session, attributes: {} },
                     {
-                        ...user,
+                        ...userInfo,
                         attributes: {
-                            ...user,
+                            ...userInfo,
+                            name: identifier,
                             session: { id: session.id, expiresAt: session.expiresAt },
                         },
                     },

package/esm/auth/AuthController.server.js

@@ -3,7 +3,7 @@ import { DEV } from 'esm-env';
 import { generateId } from 'lucia';
 import { createDate, TimeSpan } from 'oslo';
 import { remult } from 'remult';
-import { green, yellow } from '@kitql/helpers';
+import { green, magenta, yellow } from '@kitql/helpers';
 import { AUTH_OPTIONS, getSafeOptions, logAuth, lucia } from '.';
 import { sendMail } from '../mail';
 import { FFAuthProvider } from './Entities.js';
@@ -58,11 +58,11 @@ export class AuthControllerServer {
             throw new Error(`${name} not found as demo account!`);
         }
         const oSafe = getSafeOptions();
-        let user = await remult.repo(oSafe.User).findFirst({ name });
+        let user = await remult.repo(oSafe.User).findFirst({ identifier: name });
         if (!user) {
             user = remult.repo(oSafe.User).create();
         }
-        user.name = name;
+        user.identifier = name;
         const r = mergeRoles(user.roles, account.roles);
         user.roles = r.roles;
         await remult.repo(oSafe.User).save(user);
@@ -75,22 +75,34 @@ export class AuthControllerServer {
      */
     static async invite(email) {
         const oSafe = getSafeOptions();
-        const existingUser = await remult.repo(oSafe.User).findOne({ where: { name: email } });
-        if (existingUser) {
+        const existingAccount = await remult.repo(oSafe.Account).findOne({
+            where: {
+                providerUserId: email,
+                provider: FFAuthProvider.PASSWORD.id,
+            },
+        });
+        if (existingAccount) {
             // throw Error("Already invited !")
         }
         else {
-            const user = await remult.repo(oSafe.User).insert({
-                name: email,
+            const token = generateId(40);
+            await remult.repo(oSafe.Account).insert({
+                provider: FFAuthProvider.PASSWORD.id,
+                providerUserId: email,
+                // userId: user.id,
+                // hashPassword: await passwordHash(password),
+                token: oSafe.verifiedMethod === 'auto' ? undefined : token,
+                expiresAt: createDate(new TimeSpan(AUTH_OPTIONS.providers?.password?.verifyMailExpiresIn ?? 5 * 60, 's')),
+                lastVerifiedAt: undefined,
             });
-            const url = `${remult.context.url.origin}`;
+            const url = `${remult.context.url.origin}${oSafe.firstlyData.props.ui?.paths.verify_email}?token=${token}`;
             if (AUTH_OPTIONS?.invitationSend) {
                 await AUTH_OPTIONS?.invitationSend({ email, url });
-                logAuth.success(`Done with custom ${green('invitationSend')} (${yellow(url)})`);
+                logAuth.success(`${green('[custom]')}${magenta('[invitationSend]')} (${yellow(url)})`);
                 return 'Mail sent !';
             }
             else {
-                await sendMail('invite', {
+                await sendMail('invitationSend', {
                     to: email,
                     subject: 'Invitation',
                     templateProps: {
@@ -111,7 +123,7 @@ export class AuthControllerServer {
                         ],
                     },
                 });
-                logAuth.success(`Done with ${green('sendMail')} (${url})`);
+                logAuth.success(`${magenta('[invitationSend]')} (${yellow(url)})`);
                 return 'Demo Mail sent !';
             }
         }
@@ -129,37 +141,49 @@ export class AuthControllerServer {
         if (!oSafe.password_enabled) {
             throw Error('Password is not enabled!');
         }
-        const existingUser = await remult.repo(oSafe.User).findOne({ where: { name: email } });
-        if (existingUser) {
+        const existingAccount = await remult.repo(oSafe.Account).findOne({
+            where: {
+                providerUserId: email,
+                provider: FFAuthProvider.PASSWORD.id,
+            },
+        });
+        if (existingAccount) {
             throw Error("You can't signup twice !");
         }
         checkPassword(password);
-        const user = await remult.repo(oSafe.User).insert({
-            name: email,
-        });
         const token = generateId(40);
-        await remult.repo(oSafe.Account).insert({
-            provider: FFAuthProvider.PASSWORD.id,
-            providerUserId: email,
-            userId: user.id,
-            hashPassword: await passwordHash(password),
-            token: oSafe.verifiedMethod === 'auto' ? undefined : token,
-            expiresAt: oSafe.verifiedMethod === 'auto'
-                ? undefined
-                : createDate(new TimeSpan(AUTH_OPTIONS.providers?.password?.verifyMailExpiresIn ?? 5 * 60, 's')),
-            lastVerifiedAt: oSafe.verifiedMethod === 'auto' ? new Date() : undefined,
+        await remult.dataProvider.transaction(async () => {
+            const user = await remult.repo(oSafe.User).insert({
+                identifier: email,
+            });
+            await remult.repo(oSafe.Account).insert({
+                provider: FFAuthProvider.PASSWORD.id,
+                providerUserId: email,
+                userId: user.id,
+                hashPassword: await passwordHash(password),
+                token: oSafe.verifiedMethod === 'auto' ? undefined : token,
+                expiresAt: oSafe.verifiedMethod === 'auto'
+                    ? undefined
+                    : createDate(new TimeSpan(AUTH_OPTIONS.providers?.password?.verifyMailExpiresIn ?? 5 * 60, 's')),
+                lastVerifiedAt: oSafe.verifiedMethod === 'auto' ? new Date() : undefined,
+            });
         });
         if (oSafe.verifiedMethod === 'auto') {
-            await createSession(user.id);
+            const user = await remult.repo(oSafe.User).findFirst({
+                identifier: email,
+            });
+            if (user) {
+                await createSession(user.id);
+            }
         }
         else {
             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)})`);
+                logAuth.success(`${green('[custom]')}${magenta('[verifyMailSend]')} (${yellow(url)})`);
             }
             else {
-                await sendMail('signUpPassword', {
+                await sendMail('verifyMailSend', {
                     to: email,
                     subject: 'Wecome',
                     templateProps: {
@@ -176,7 +200,7 @@ export class AuthControllerServer {
                         ],
                     },
                 });
-                logAuth.success(`Done with ${green('sendMail')} (${url})`);
+                logAuth.success(`${magenta('[verifyMailSend]')} (${yellow(url)})`);
             }
         }
         return 'ok';
@@ -190,14 +214,16 @@ export class AuthControllerServer {
         if (!oSafe.password_enabled) {
             throw Error('Password is not enabled!');
         }
-        const existingUser = await remult
-            .repo(oSafe.User)
-            .findOne({ where: { name: email }, include: { accounts: true } });
-        const accountPassword = existingUser?.accounts.find((c) => c.provider === FFAuthProvider.PASSWORD.id);
-        if (accountPassword && existingUser) {
-            const validPassword = await passwordVerify(accountPassword?.hashPassword ?? '', password ?? '');
+        const existingAccount = await remult.repo(oSafe.Account).findOne({
+            where: {
+                providerUserId: email,
+                provider: FFAuthProvider.PASSWORD.id,
+            },
+        });
+        if (existingAccount) {
+            const validPassword = await passwordVerify(existingAccount?.hashPassword ?? '', password ?? '');
             if (validPassword) {
-                await createSession(existingUser.id);
+                await createSession(existingAccount.userId);
                 return 'ok';
             }
             throw Error('Incorrect username or password');
@@ -212,29 +238,25 @@ export class AuthControllerServer {
         if (!oSafe.password_enabled) {
             throw Error('Password is not enabled!');
         }
-        const u = await remult.repo(getSafeOptions().User).findFirst({ name: email });
-        if (u) {
-            let authAccount = await remult.repo(oSafe.Account).findFirst({
-                userId: u.id,
-            });
-            if (!authAccount) {
-                authAccount = remult.repo(oSafe.Account).create();
-                authAccount.userId = u.id;
-                authAccount.provider = FFAuthProvider.PASSWORD.id;
-                authAccount.providerUserId = email;
-            }
+        const existingAccount = await remult.repo(oSafe.Account).findOne({
+            where: {
+                providerUserId: email,
+                provider: FFAuthProvider.PASSWORD.id,
+            },
+        });
+        if (existingAccount) {
             const token = generateId(40);
-            authAccount.token = token;
-            authAccount.expiresAt = createDate(new TimeSpan(AUTH_OPTIONS.providers?.password?.resetPasswordExpiresIn ?? 5 * 60, 's'));
-            await remult.repo(oSafe.Account).save(authAccount);
+            existingAccount.token = token;
+            existingAccount.expiresAt = createDate(new TimeSpan(AUTH_OPTIONS.providers?.password?.resetPasswordExpiresIn ?? 5 * 60, 's'));
+            await remult.repo(oSafe.Account).save(existingAccount);
             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)})`);
+                logAuth.success(`${green('[custom]')}${magenta('[resetPasswordSend]')} (${yellow(url)})`);
                 return 'Mail sent !';
             }
             else {
-                await sendMail('forgotPassword', {
+                await sendMail('resetPasswordSend', {
                     to: email,
                     subject: 'Reset your password',
                     templateProps: {
@@ -255,7 +277,7 @@ export class AuthControllerServer {
                         ],
                     },
                 });
-                logAuth.success(`Done with ${green('sendMail')} (${url})`);
+                logAuth.success(`${magenta('[resetPasswordSend]')} (${yellow(url)})`);
                 return 'Demo Mail sent !';
             }
         }
@@ -308,11 +330,11 @@ export class AuthControllerServer {
             const issuer = AUTH_OPTIONS.providers.otp.issuer ?? 'firstly';
             const uri = createTOTPKeyURI(issuer, email, secret);
             const oSafe = getSafeOptions();
-            let user = await remult.repo(oSafe.User).findFirst({ name: email });
+            let user = await remult.repo(oSafe.User).findFirst({ identifier: email });
             if (!user) {
                 user = remult.repo(oSafe.User).create();
             }
-            user.name = email;
+            user.identifier = email;
             user = await remult.repo(oSafe.User).save(user);
             let account = await remult
                 .repo(oSafe.Account)
@@ -347,7 +369,7 @@ export class AuthControllerServer {
         }
         const account = accounts[0];
         const user = await remult.repo(oSafe.User).findId(account.userId);
-        if (user?.name !== email) {
+        if (user?.identifier !== email) {
             throw new Error('Invalid otp.');
         }
         const { decodeHex } = await import('oslo/encoding');

package/esm/auth/Entities.d.ts

@@ -7,7 +7,7 @@ export declare class FFAuthUser {
     id: string;
     createdAt: Date;
     updatedAt?: Date;
-    name: string;
+    identifier: string;
     roles: string[];
     accounts: FFAuthAccount[];
     sessions: FFAuthUserSession[];

package/esm/auth/Entities.js

@@ -14,7 +14,7 @@ let FFAuthUser = class FFAuthUser {
     id;
     createdAt;
     updatedAt;
-    name;
+    identifier;
     roles = [];
     accounts;
     sessions;
@@ -33,12 +33,12 @@ __decorate([
         validate: [
             Validators.unique(),
             (e) => {
-                if (e.name.length < 2)
+                if (e.identifier.length < 2)
                     throw 'Must be at least 2 characters long';
             },
         ],
     })
-], FFAuthUser.prototype, "name", void 0);
+], FFAuthUser.prototype, "identifier", void 0);
 __decorate([
     Fields.object({
         valueConverter: {

package/esm/auth/RoleHelpers.js

@@ -17,13 +17,13 @@ export const mergeRoles = (existing, newOnes) => {
     return { roles: Array.from(result), changed };
 };
 export const initRoleFromEnv = async (log, userEntity, envValue, role) => {
-    const names = envValue === undefined ? [] : (envValue ?? '').split(',').map((c) => c.trim());
-    for (let i = 0; i < names.length; i++) {
-        const name = names[i].trim();
-        if (name !== '') {
-            let user = await repo(userEntity).findFirst({ name });
+    const identifiers = envValue === undefined ? [] : (envValue ?? '').split(',').map((c) => c.trim());
+    for (let i = 0; i < identifiers.length; i++) {
+        const identifier = identifiers[i].trim();
+        if (identifier !== '') {
+            let user = await repo(userEntity).findFirst({ identifier });
             if (!user) {
-                user = repo(userEntity).create({ name, roles: [role] });
+                user = repo(userEntity).create({ identifier, roles: [role] });
                 await repo(userEntity).save(user);
             }
             else {
@@ -34,8 +34,8 @@ export const initRoleFromEnv = async (log, userEntity, envValue, role) => {
             }
         }
     }
-    if (names.length > 0) {
-        log.info(`${cyan(role)}: ${names.map((c) => green(c.trim())).join(', ')} added via ${yellow(`.env`)}.`);
+    if (identifiers.length > 0) {
+        log.info(`${cyan(role)}: ${identifiers.map((c) => green(c.trim())).join(', ')} added via ${yellow(`.env`)}.`);
     }
     else {
         log.info(`${cyan(role)}: No users added via ${yellow(`.env`)}.`);

package/esm/auth/client/Auth.js

@@ -96,7 +96,7 @@ __decorate([
     BackendMethod({ allowed: true })
 ], Auth, "signInDemo", null);
 __decorate([
-    BackendMethod({ allowed: false })
+    BackendMethod({ allowed: true })
 ], Auth, "invite", null);
 __decorate([
     BackendMethod({ allowed: true })

package/esm/auth/index.js

@@ -223,7 +223,7 @@ export const auth = (o) => {
                         for (let i = 0; i < info.nameOptions.length; i++) {
                             const existingUser = await remult
                                 .repo(oSafe.User)
-                                .findOne({ where: { name: info.nameOptions[i] } });
+                                .findOne({ where: { identifier: info.nameOptions[i] } });
                             if (existingUser) {
                                 // Don't do anything
                             }
@@ -236,7 +236,7 @@ export const auth = (o) => {
                             nameToUse = `${info.nameOptions[0]}-${info.providerUserId}`;
                         }
                         const user = remult.repo(oSafe.User).create();
-                        user.name = nameToUse;
+                        user.identifier = nameToUse;
                         account = remult.repo(oSafe.Account).create();
                         account.provider = keyState;
                         account.providerUserId = info.providerUserId;

package/esm/mail/index.js

@@ -1,4 +1,4 @@
-import { render } from 'svelte-email';
+import { render } from 'svelty-email';
 import { cyan, green, Log, magenta, red, sleep, white } from '@kitql/helpers';
 import { DefaultMail } from '../';
 const log = new Log('firstly | mail');

package/esm/mail/templates/DefaultMail.svelte

@@ -1,4 +1,4 @@
-<script>import { Button, Container, Head, Heading, Html, Preview, Section, Text } from "svelte-email";
+<script>import { Button, Container, Head, Heading, Html, Preview, Section, Text } from "svelty-email";
 export let previewText;
 export let title;
 export let sections = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firstly",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "type": "module",
   "description": "Firstly, an opinionated Remult setup!",
   "repository": {
@@ -31,7 +31,7 @@
     "lucia": "^3.2.0",
     "nodemailer": "^6.9.13",
     "oslo": "^1.2.0",
-    "svelte-email": "^0.0.4",
+    "svelty-email": "^0.0.11",
     "tailwind-merge": "^2.3.0",
     "tailwindcss": "^3.4.3",
     "vite": "^5.4.1",