firstly 0.0.16-next.1 → 0.0.16-next.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # firstly
 
+## 0.0.16-next.2
+
+### Patch Changes
+
+- [#110](https://github.com/jycouet/firstly/pull/110)
+  [`0c66f11`](https://github.com/jycouet/firstly/commit/0c66f114dd95f65c0407abddbd647a66769142eb)
+  Thanks [@jycouet](https://github.com/jycouet)! - add github in default ui (if configured)
+
 ## 0.0.16-next.1
 
 ### Patch Changes

package/esm/auth/Entities.d.ts

@@ -1,5 +1,7 @@
+import type { OAuth2Tokens } from 'arctic';
 import { BaseEnum } from '..';
 import type { BaseEnumOptions } from '..';
+import type { OAuth2UserInfo } from './types';
 export declare const FF_Role_Auth: {
     readonly FF_Role_Auth_Admin: "FF_Role_Auth.Admin";
     readonly FF_Role_Auth_Invite: "FF_Role_Auth.Invite";
@@ -25,6 +27,9 @@ export declare class FFAuthAccount {
     token?: string;
     expiresAt?: Date;
     lastVerifiedAt?: Date;
+    metadata?: OAuth2UserInfo & {
+        tokens_data: OAuth2Tokens['data'];
+    };
 }
 export declare class FFAuthUserSession {
     id: string;

package/esm/auth/Entities.js

@@ -84,6 +84,7 @@ let FFAuthAccount = class FFAuthAccount {
     token;
     expiresAt;
     lastVerifiedAt;
+    metadata;
 };
 __decorate([
     Fields.cuid()
@@ -118,6 +119,9 @@ __decorate([
 __decorate([
     Fields.date({ includeInApi: false, allowNull: true })
 ], FFAuthAccount.prototype, "lastVerifiedAt", void 0);
+__decorate([
+    Fields.json({ includeInApi: false, allowNull: true })
+], FFAuthAccount.prototype, "metadata", void 0);
 FFAuthAccount = __decorate([
     FF_Entity('ff_auth.accounts', {
         allowApiCrud: [FF_Role_Auth.FF_Role_Auth_Admin, FF_Role.FF_Role_Admin],

package/esm/auth/server/AuthController.server.js

@@ -170,22 +170,23 @@ export class AuthControllerServer {
             throw new EntityError({ message: "You can't signup twice !" });
         }
         const token = generateAndEncodeToken();
-        await remult.dataProvider.transaction(async () => {
-            const user = await repo(oSafe.User).insert({
-                identifier: email,
-            });
-            await repo(oSafe.Account).insert({
-                provider: FFAuthProvider.PASSWORD.id,
-                providerUserId: email,
-                userId: user.id,
-                hashPassword: await oSafe.password.hash(password),
-                token: oSafe.verifiedMethod === 'auto' ? undefined : token,
-                expiresAt: oSafe.verifiedMethod === 'auto'
-                    ? undefined
-                    : createDate(AUTH_OPTIONS.providers?.password?.mail?.verify?.expiresIn ?? 5 * 60),
-                lastVerifiedAt: oSafe.verifiedMethod === 'auto' ? new Date() : undefined,
-            });
+        // REMULT: Do not put it in a transaction, as it will be called from a backendmethod that is already in a transaction! And nested transactions not allowed.
+        // await remult.dataProvider.transaction(async () => {
+        const user = await repo(oSafe.User).insert({
+            identifier: email,
+        });
+        await repo(oSafe.Account).insert({
+            provider: FFAuthProvider.PASSWORD.id,
+            providerUserId: email,
+            userId: user.id,
+            hashPassword: await oSafe.password.hash(password),
+            token: oSafe.verifiedMethod === 'auto' ? undefined : token,
+            expiresAt: oSafe.verifiedMethod === 'auto'
+                ? undefined
+                : createDate(AUTH_OPTIONS.providers?.password?.mail?.verify?.expiresIn ?? 5 * 60),
+            lastVerifiedAt: oSafe.verifiedMethod === 'auto' ? new Date() : undefined,
         });
+        // })
         if (oSafe.verifiedMethod === 'auto') {
             const user = await repo(oSafe.User).findFirst({
                 identifier: email,
@@ -198,7 +199,7 @@ export class AuthControllerServer {
                 };
             }
         }
-        else {
+        else if (oSafe.verifiedMethod === 'email') {
             const url = `${remult.context.request.url.origin}${oSafe.firstlyData.props.ui?.paths.verify_email}?token=${token}`;
             if (AUTH_OPTIONS.providers?.password?.mail?.verify?.send) {
                 await AUTH_OPTIONS.providers?.password.mail.verify.send({ email, url });
@@ -225,10 +226,14 @@ export class AuthControllerServer {
                 });
                 authModuleRaw.log.success(`${magenta('[verifyMailSend]')} (${yellow(url)})`);
             }
+            return {
+                message: 'We sent you a mail to verify your account.',
+                user: undefined,
+            };
         }
         return {
-            message: 'ok',
-            user: remult.user,
+            message: 'Someone needs to validate your account.',
+            user: undefined,
         };
     }
     /**
@@ -488,7 +493,9 @@ export class AuthControllerServer {
             catch (error) {
                 // display error for the server only
                 authModuleRaw.log.error(error);
-                throw new EntityError({ message: `${selectedOAuth.name} not well configured!` });
+                throw new EntityError({
+                    message: `${selectedOAuth.name} not well configured! Check server logs for more details.`,
+                });
             }
         }
         throw new EntityError({

package/esm/auth/server/handleAuth.js

@@ -118,19 +118,16 @@ export const handleAuth = async ({ event, resolve }) => {
                 }
                 const user = repo(oSafe.User).create();
                 user.identifier = nameToUse;
+                await repo(oSafe.User).save(user);
                 account = repo(oSafe.Account).create();
                 account.provider = keyState;
                 account.providerUserId = info.providerUserId;
-                account.token = tokens.accessToken();
                 account.userId = user.id;
-                account.lastVerifiedAt = new Date();
-                await repo(oSafe.User).save(user);
-                await repo(oSafe.Account).save(account);
-            }
-            else {
-                account.token = tokens.accessToken();
-                await repo(oSafe.Account).save(account);
             }
+            account.lastVerifiedAt = new Date();
+            account.token = tokens.accessToken();
+            account.metadata = { ...info, tokens_data: tokens.data };
+            await repo(oSafe.Account).save(account);
             await ff_createSession(account.userId);
             event.cookies.delete(`${keyState}_oauth_state`, { path: '/' });
             event.cookies.delete(`code_verifier`, { path: '/' });

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

@@ -3,16 +3,12 @@ import type { ClassType, UserInfo } from 'remult';
 import { Module } from '../../server';
 import type { RecursivePartial } from '../../utils/types';
 import { FFAuthAccount, FFAuthUser, FFAuthUserSession } from '../Entities';
-import type { FirstlyData, FirstlyDataAuth, ProviderAuthorizationURLOptions } from '../types';
+import type { FirstlyData, FirstlyDataAuth, OAuth2UserInfo, ProviderAuthorizationURLOptions } from '../types';
 import { initRoleFromEnv } from './helperRole';
-export type OAuth2UserInfo = {
-    raw?: any;
-    providerUserId: string;
-    /** Will take the first option available */
-    nameOptions: string[];
-};
 export type FFOAuth2Provider<T = any, LitName extends string = string> = {
     name: LitName;
+    caption: string;
+    raw_svg?: string;
     getArcticProvider: () => T;
     authorizationURLOptions: () => ProviderAuthorizationURLOptions;
     getUserInfo(tokens: OAuth2Tokens): Promise<OAuth2UserInfo>;
@@ -47,7 +43,7 @@ type AuthOptions<TUserEntity extends FFAuthUser = FFAuthUser, TSessionEntity ext
     /**
      * To be able to sign in user needs to be verified or not?
      * ```
-     *  `Auto` =>  noting will be checked
+     *  `Auto` => noting will be checked
      *  `Email` => users needs to click a link in an email
      *  `Manual` => an admin needs to verify the user and set verifiedAt in the database
      * ```

package/esm/auth/server/module.js

@@ -59,11 +59,27 @@ export const getSafeOptions = () => {
     if (AUTH_OPTIONS.debug && !building) {
         authModuleRaw.log.info('ui', ui);
     }
+    const getProviderIcon = (name) => {
+        switch (name) {
+            case 'github':
+                return `<svg viewBox="0 0 24 24" fill="currentColor"><path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/></svg>`;
+            case 'google':
+                return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><!-- Icon from Devicon by konpa - https://github.com/devicons/devicon/blob/master/LICENSE --><path fill="#fff" d="M44.59 4.21a63.28 63.28 0 0 0 4.33 120.9a67.6 67.6 0 0 0 32.36.35a57.13 57.13 0 0 0 25.9-13.46a57.44 57.44 0 0 0 16-26.26a74.3 74.3 0 0 0 1.61-33.58H65.27v24.69h34.47a29.72 29.72 0 0 1-12.66 19.52a36.2 36.2 0 0 1-13.93 5.5a41.3 41.3 0 0 1-15.1 0A37.2 37.2 0 0 1 44 95.74a39.3 39.3 0 0 1-14.5-19.42a38.3 38.3 0 0 1 0-24.63a39.25 39.25 0 0 1 9.18-14.91A37.17 37.17 0 0 1 76.13 27a34.3 34.3 0 0 1 13.64 8q5.83-5.8 11.64-11.63c2-2.09 4.18-4.08 6.15-6.22A61.2 61.2 0 0 0 87.2 4.59a64 64 0 0 0-42.61-.38"/><path fill="#e33629" d="M44.59 4.21a64 64 0 0 1 42.61.37a61.2 61.2 0 0 1 20.35 12.62c-2 2.14-4.11 4.14-6.15 6.22Q95.58 29.23 89.77 35a34.3 34.3 0 0 0-13.64-8a37.17 37.17 0 0 0-37.46 9.74a39.25 39.25 0 0 0-9.18 14.91L8.76 35.6A63.53 63.53 0 0 1 44.59 4.21"/><path fill="#f8bd00" d="M3.26 51.5a63 63 0 0 1 5.5-15.9l20.73 16.09a38.3 38.3 0 0 0 0 24.63q-10.36 8-20.73 16.08a63.33 63.33 0 0 1-5.5-40.9"/><path fill="#587dbd" d="M65.27 52.15h59.52a74.3 74.3 0 0 1-1.61 33.58a57.44 57.44 0 0 1-16 26.26c-6.69-5.22-13.41-10.4-20.1-15.62a29.72 29.72 0 0 0 12.66-19.54H65.27c-.01-8.22 0-16.45 0-24.68"/><path fill="#319f43" d="M8.75 92.4q10.37-8 20.73-16.08A39.3 39.3 0 0 0 44 95.74a37.2 37.2 0 0 0 14.08 6.08a41.3 41.3 0 0 0 15.1 0a36.2 36.2 0 0 0 13.93-5.5c6.69 5.22 13.41 10.4 20.1 15.62a57.13 57.13 0 0 1-25.9 13.47a67.6 67.6 0 0 1-32.36-.35a63 63 0 0 1-23-11.59A63.7 63.7 0 0 1 8.75 92.4"/></svg>`;
+            default:
+                return '';
+        }
+    };
+    const providers = AUTH_OPTIONS.providers?.oAuths?.map((o) => ({
+        name: o.name,
+        label: o.caption,
+        raw_svg: o.raw_svg ?? getProviderIcon(o.name),
+    })) ?? [];
     const firstlyData = {
         module: 'auth',
         debug: AUTH_OPTIONS.debug,
         props: {
             ui,
+            providers,
         },
     };
     let uiStaticPath = AUTH_OPTIONS.uiStaticPath ?? '';

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

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

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

@@ -38,6 +38,7 @@ export function github(options) {
     checkOAuthConfig(name, clientID, secret, urlForKeys, false);
     return {
         name,
+        caption: 'GitHub',
         getArcticProvider: () => {
             const redirectURI = options?.GITHUB_REDIRECT_URI ??
                 env.GITHUB_REDIRECT_URI ??

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

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

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

@@ -0,0 +1 @@
+import{D as r,E as m,am as l,S as o,T as d,U as n,V as p,W as u,Y as i}from"./index-Borxa2ns.js";p();a[u]="src/lib/modules/admin/Page.svelte";function a(e,s){r(new.target),m(s,!1,a);var t=l("Hello from admin");return o(e,t),d({...n()})}i(a);export{a as default};

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

@@ -0,0 +1,6 @@
+export { re as default };
+declare function re(n: any, e: any): any;
+declare namespace re {
+    let ____A_17224: string;
+    export { ____A_17224 as __@A@17224 };
+}