@nymphjs/tilmeld 1.0.0-alpha.4 → 1.0.0-alpha.42

package/src/User.ts

@@ -24,6 +24,44 @@ import {
   EmailChangeRateLimitExceededError,
 } from './errors';
 
+export type EventType =
+  | 'beforeRegister'
+  | 'afterRegister'
+  | 'beforeLogin'
+  | 'afterLogin'
+  | 'beforeLogout'
+  | 'afterLogout';
+/**
+ * Theses are run before the user data checks, so the only checks before are
+ * whether registration is allowed and whether the user is already registered.
+ */
+export type TilmeldBeforeRegisterCallback = (
+  user: User & UserData,
+  data: { password: string; additionalData?: { [k: string]: any } }
+) => Promise<void> | void;
+export type TilmeldAfterRegisterCallback = (
+  user: User & UserData,
+  result: { loggedin: boolean; message: string }
+) => Promise<void> | void;
+/**
+ * These are run after the authentication checks, but before the login action.
+ */
+export type TilmeldBeforeLoginCallback = (
+  user: User & UserData,
+  data: {
+    username: string;
+    password: string;
+    additionalData?: { [k: string]: any };
+  }
+) => void;
+/**
+ * This is run before the transaction is committed, and you can perform
+ * additional functions on the transaction, which is available in `user.$nymph`.
+ */
+export type TilmeldAfterLoginCallback = (user: User & UserData) => void;
+export type TilmeldBeforeLogoutCallback = (user: User & UserData) => void;
+export type TilmeldAfterLogoutCallback = (user: User & UserData) => void;
+
 export type UserData = {
   /**
    * The abilities granted to the user.
@@ -142,6 +180,12 @@ export default class User extends AbleObject<UserData> {
   static tilmeld: Tilmeld;
   static ETYPE = 'tilmeld_user';
   static class = 'User';
+  private static beforeRegisterCallbacks: TilmeldBeforeRegisterCallback[] = [];
+  private static afterRegisterCallbacks: TilmeldAfterRegisterCallback[] = [];
+  private static beforeLoginCallbacks: TilmeldBeforeLoginCallback[] = [];
+  private static afterLoginCallbacks: TilmeldAfterLoginCallback[] = [];
+  private static beforeLogoutCallbacks: TilmeldBeforeLogoutCallback[] = [];
+  private static afterLogoutCallbacks: TilmeldAfterLogoutCallback[] = [];
 
   private static DEFAULT_CLIENT_ENABLED_METHODS = [
     '$checkUsername',
@@ -171,7 +215,7 @@ export default class User extends AbleObject<UserData> {
   ];
   private static DEFAULT_ALLOWLIST_DATA: string[] = [];
 
-  protected $clientEnabledMethods = User.DEFAULT_CLIENT_ENABLED_METHODS;
+  protected $clientEnabledMethods = [...User.DEFAULT_CLIENT_ENABLED_METHODS];
   public static clientEnabledStaticMethods = [
     'current',
     'loginUser',
@@ -179,9 +223,9 @@ export default class User extends AbleObject<UserData> {
     'recover',
     'getClientConfig',
   ];
-  protected $privateData = User.DEFAULT_PRIVATE_DATA;
-  public static searchRestrictedData = User.DEFAULT_PRIVATE_DATA;
-  protected $allowlistData? = User.DEFAULT_ALLOWLIST_DATA;
+  protected $privateData = [...User.DEFAULT_PRIVATE_DATA];
+  public static searchRestrictedData = [...User.DEFAULT_PRIVATE_DATA];
+  protected $allowlistData? = [...User.DEFAULT_ALLOWLIST_DATA];
   protected $allowlistTags?: string[] = [];
 
   /**
@@ -429,7 +473,11 @@ export default class User extends AbleObject<UserData> {
     };
   }
 
-  public static async loginUser(data: { username: string; password: string }) {
+  public static async loginUser(data: {
+    username: string;
+    password: string;
+    additionalData?: { [k: string]: any };
+  }) {
     if (!('username' in data) || !data.username.length) {
       return { result: false, message: 'Incorrect login/password.' };
     }
@@ -443,7 +491,11 @@ export default class User extends AbleObject<UserData> {
     return result;
   }
 
-  public $login(data: { username: string; password: string }) {
+  public $login(data: {
+    username: string;
+    password: string;
+    additionalData?: { [k: string]: any };
+  }) {
     const tilmeld = this.$nymph.tilmeld as Tilmeld;
     if (this.guid == null) {
       return { result: false, message: 'Incorrect login/password.' };
@@ -458,11 +510,32 @@ export default class User extends AbleObject<UserData> {
       return { result: false, message: 'Incorrect login/password.' };
     }
 
+    try {
+      for (let callback of (this.constructor as typeof User)
+        .beforeLoginCallbacks) {
+        if (callback) {
+          callback(this, data);
+        }
+      }
+    } catch (e: any) {
+      return {
+        result: false,
+        message: e.message,
+      };
+    }
+
     // Authentication was successful, attempt to login.
     if (!tilmeld.login(this, true)) {
       return { result: false, message: 'Incorrect login/password.' };
     }
 
+    for (let callback of (this.constructor as typeof User)
+      .afterLoginCallbacks) {
+      if (callback) {
+        callback(this);
+      }
+    }
+
     // Login was successful.
     return { result: true, message: 'You are logged in.' };
   }
@@ -473,7 +546,30 @@ export default class User extends AbleObject<UserData> {
    */
   public $logout() {
     const tilmeld = this.$nymph.tilmeld as Tilmeld;
+
+    try {
+      for (let callback of (this.constructor as typeof User)
+        .beforeLogoutCallbacks) {
+        if (callback) {
+          callback(this);
+        }
+      }
+    } catch (e: any) {
+      return {
+        result: false,
+        message: e.message,
+      };
+    }
+
     tilmeld.logout();
+
+    for (let callback of (this.constructor as typeof User)
+      .afterLogoutCallbacks) {
+      if (callback) {
+        callback(this);
+      }
+    }
+
     return { result: true, message: 'You have been logged out.' };
   }
 
@@ -579,9 +675,9 @@ export default class User extends AbleObject<UserData> {
     const tilmeld = this.$nymph.tilmeld as Tilmeld;
     let user = givenUser ?? tilmeld.User.current();
 
-    this.$clientEnabledMethods = User.DEFAULT_CLIENT_ENABLED_METHODS;
-    this.$privateData = User.DEFAULT_PRIVATE_DATA;
-    this.$allowlistData = User.DEFAULT_ALLOWLIST_DATA;
+    this.$clientEnabledMethods = [...User.DEFAULT_CLIENT_ENABLED_METHODS];
+    this.$privateData = [...User.DEFAULT_PRIVATE_DATA];
+    this.$allowlistData = [...User.DEFAULT_ALLOWLIST_DATA];
 
     if (tilmeld.config.emailUsernames) {
       this.$privateData.push('username');
@@ -1123,8 +1219,9 @@ export default class User extends AbleObject<UserData> {
 
   public async $register(data: {
     password: string;
+    additionalData?: { [k: string]: any };
   }): Promise<{ result: boolean; loggedin: boolean; message: string }> {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    let tilmeld = this.$nymph.tilmeld as Tilmeld;
     if (!tilmeld.config.allowRegistration) {
       return {
         result: false,
@@ -1139,6 +1236,22 @@ export default class User extends AbleObject<UserData> {
         message: 'This is already a registered user.',
       };
     }
+
+    try {
+      for (let callback of (this.constructor as typeof User)
+        .beforeRegisterCallbacks) {
+        if (callback) {
+          await callback(this, data);
+        }
+      }
+    } catch (e: any) {
+      return {
+        result: false,
+        loggedin: false,
+        message: e.message,
+      };
+    }
+
     if (!('password' in data) || !data.password.length) {
       return {
         result: false,
@@ -1167,7 +1280,10 @@ export default class User extends AbleObject<UserData> {
 
     // Start transaction.
     const transaction = 'tilmeld-register-' + nanoid();
+    const nymph = this.$nymph;
     const tnymph = await this.$nymph.startTransaction(transaction);
+    this.$nymph = tnymph;
+    tilmeld = this.$nymph.tilmeld as Tilmeld;
 
     try {
       // Add primary group.
@@ -1191,6 +1307,7 @@ export default class User extends AbleObject<UserData> {
         }
         if (!(await generatedPrimaryGroup.$saveSkipAC())) {
           await tnymph.rollback(transaction);
+          this.$nymph = nymph;
           return {
             result: false,
             loggedin: false,
@@ -1291,6 +1408,7 @@ export default class User extends AbleObject<UserData> {
           generatedPrimaryGroup.user = this;
           if (!(await generatedPrimaryGroup.$saveSkipAC())) {
             await tnymph.rollback(transaction);
+            this.$nymph = nymph;
             return {
               result: false,
               loggedin: false,
@@ -1314,18 +1432,40 @@ export default class User extends AbleObject<UserData> {
           tilmeld.config.unverifiedAccess &&
           !madeAdmin
         ) {
-          tilmeld.login(this, true);
+          if (!tilmeld.login(this, true)) {
+            throw new Error('An error occurred trying to log you in.');
+          }
           message +=
             "You're now logged in! An email has been sent to " +
             `${this.$data.email} with a verification link for you to finish ` +
             'registration.';
           loggedin = true;
         } else {
-          tilmeld.login(this, true);
+          if (!tilmeld.login(this, true)) {
+            throw new Error('An error occurred trying to log you in.');
+          }
           message += "You're now registered and logged in!";
           loggedin = true;
         }
-        await tnymph.commit(transaction);
+
+        for (let callback of (this.constructor as typeof User)
+          .afterRegisterCallbacks) {
+          if (callback) {
+            await callback(this, {
+              loggedin,
+              message,
+            });
+          }
+        }
+
+        try {
+          await tnymph.commit(transaction);
+          this.$nymph = nymph;
+          this.$nymph.tilmeld?.fillSession(this);
+        } catch (e: any) {
+          throw e;
+        }
+
         return {
           result: true,
           loggedin,
@@ -1333,6 +1473,7 @@ export default class User extends AbleObject<UserData> {
         };
       } else {
         await tnymph.rollback(transaction);
+        this.$nymph = nymph;
         return {
           result: false,
           loggedin: false,
@@ -1341,12 +1482,13 @@ export default class User extends AbleObject<UserData> {
       }
     } catch (e: any) {
       await tnymph.rollback(transaction);
+      this.$nymph = nymph;
       throw e;
     }
   }
 
   public async $save() {
-    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    let tilmeld = this.$nymph.tilmeld as Tilmeld;
     if (this.$data.username == null || !this.$data.username.trim().length) {
       return false;
     }
@@ -1541,7 +1683,10 @@ export default class User extends AbleObject<UserData> {
 
     // Start transaction.
     const transaction = 'tilmeld-save-' + nanoid();
+    const nymph = this.$nymph;
     const tnymph = await this.$nymph.startTransaction(transaction);
+    this.$nymph = tnymph;
+    tilmeld = this.$nymph.tilmeld as Tilmeld;
 
     if (
       this.$data.group != null &&
@@ -1558,6 +1703,7 @@ export default class User extends AbleObject<UserData> {
         await this.$data.group.$saveSkipAC();
       } catch (e: any) {
         await tnymph.rollback(transaction);
+        this.$nymph = nymph;
         throw e;
       }
     }
@@ -1571,6 +1717,7 @@ export default class User extends AbleObject<UserData> {
       ret = await super.$save();
     } catch (e: any) {
       await tnymph.rollback(transaction);
+      this.$nymph = nymph;
       throw e;
     }
     if (ret) {
@@ -1581,21 +1728,23 @@ export default class User extends AbleObject<UserData> {
           this.guid = preGuid;
           this.cdate = preCdate;
           this.mdate = preMdate;
+          this.$nymph = nymph;
           throw new Error("Couldn't send verification email.");
         }
       }
 
-      if (tilmeld.User.current(true).$is(this)) {
-        // Update the user in the session cache.
-        tilmeld.fillSession(this);
-      }
-
       this.$descendantGroups = undefined;
       this.$gatekeeperCache = undefined;
       await tnymph.commit(transaction);
+
+      if ((nymph.tilmeld as Tilmeld).User.current(true).$is(this)) {
+        // Update the user in the session cache.
+        (nymph.tilmeld as Tilmeld).fillSession(this);
+      }
     } else {
       await tnymph.rollback(transaction);
     }
+    this.$nymph = nymph;
     return ret;
   }
 
@@ -1633,4 +1782,82 @@ export default class User extends AbleObject<UserData> {
     }
     return await super.$delete();
   }
+
+  public static on<T extends EventType>(
+    event: T,
+    callback: T extends 'beforeRegister'
+      ? TilmeldBeforeRegisterCallback
+      : T extends 'afterRegister'
+      ? TilmeldAfterRegisterCallback
+      : T extends 'beforeLogin'
+      ? TilmeldBeforeLoginCallback
+      : T extends 'afterLogin'
+      ? TilmeldAfterLoginCallback
+      : T extends 'beforeLogout'
+      ? TilmeldBeforeLogoutCallback
+      : T extends 'afterLogout'
+      ? TilmeldAfterLogoutCallback
+      : never
+  ) {
+    const prop = (event + 'Callbacks') as T extends 'beforeRegister'
+      ? 'beforeRegisterCallbacks'
+      : T extends 'afterRegister'
+      ? 'afterRegisterCallbacks'
+      : T extends 'beforeLogin'
+      ? 'beforeLoginCallbacks'
+      : T extends 'afterLogin'
+      ? 'afterLoginCallbacks'
+      : T extends 'beforeLogout'
+      ? 'beforeLogoutCallbacks'
+      : T extends 'afterLogout'
+      ? 'afterLogoutCallbacks'
+      : never;
+    if (!(prop in this)) {
+      throw new Error('Invalid event type.');
+    }
+    // @ts-ignore: The callback should always be the right type here.
+    this[prop].push(callback);
+    return () => this.off(event, callback);
+  }
+
+  public static off<T extends EventType>(
+    event: T,
+    callback: T extends 'beforeRegister'
+      ? TilmeldBeforeRegisterCallback
+      : T extends 'afterRegister'
+      ? TilmeldAfterRegisterCallback
+      : T extends 'beforeLogin'
+      ? TilmeldBeforeLoginCallback
+      : T extends 'afterLogin'
+      ? TilmeldAfterLoginCallback
+      : T extends 'beforeLogout'
+      ? TilmeldBeforeLogoutCallback
+      : T extends 'afterLogout'
+      ? TilmeldAfterLogoutCallback
+      : never
+  ) {
+    const prop = (event + 'Callbacks') as T extends 'beforeRegister'
+      ? 'beforeRegisterCallbacks'
+      : T extends 'afterRegister'
+      ? 'afterRegisterCallbacks'
+      : T extends 'beforeLogin'
+      ? 'beforeLoginCallbacks'
+      : T extends 'afterLogin'
+      ? 'afterLoginCallbacks'
+      : T extends 'beforeLogout'
+      ? 'beforeLogoutCallbacks'
+      : T extends 'afterLogout'
+      ? 'afterLogoutCallbacks'
+      : never;
+    if (!(prop in this)) {
+      return false;
+    }
+    // @ts-ignore: The callback should always be the right type here.
+    const i = this[prop].indexOf(callback);
+    if (i > -1) {
+      // @ts-ignore: The callback should always be the right type here.
+      this[prop].splice(i, 1);
+    }
+    return true;
+  }
 }

package/src/conf/d.ts

@@ -1,4 +1,5 @@
 import { EmailOptions } from 'email-templates';
+
 import type Tilmeld from '../Tilmeld';
 import Group, { GroupData } from '../Group';
 import User, { UserData } from '../User';

package/src/conf/defaults.ts

@@ -1,3 +1,4 @@
+import { nymphJoiProps } from '@nymphjs/nymph';
 import path from 'path';
 import jwt from 'jsonwebtoken';
 import { nanoid } from 'nanoid';
@@ -157,29 +158,8 @@ export default {
     Joi.attempt(
       group.$getValidatable(),
       Joi.object().keys({
-        guid: Joi.alternatives()
-          .try(
-            Joi.any().only().allow(null),
-            Joi.string().trim(false).length(24).hex()
-          )
-          .required(),
-        cdate: Joi.alternatives()
-          .try(Joi.any().only().allow(null), Joi.number())
-          .required(),
-        mdate: Joi.alternatives()
-          .try(Joi.any().only().allow(null), Joi.number())
-          .required(),
-        tags: Joi.array()
-          .items(
-            Joi.string()
-              .pattern(/[\x01-\x1F\x7F]/, {
-                name: 'control characters',
-                invert: true,
-              })
-              .min(1)
-          )
-          .required(),
-        groupname: Joi.string().trim(false).min(1).required(),
+        ...nymphJoiProps,
+        groupname: Joi.string().trim(false).required(),
         enabled: Joi.boolean().required(),
         email: Joi.string()
           .trim(false)
@@ -191,7 +171,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(512)
           .required(),
         avatar: Joi.string()
@@ -201,7 +180,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(1024),
         phone: Joi.string()
           .trim(false)
@@ -214,7 +192,6 @@ export default {
               name: 'control characters',
               invert: true,
             })
-            .min(1)
             .max(256)
         ),
         defaultPrimary: Joi.boolean(),
@@ -228,29 +205,8 @@ export default {
     Joi.attempt(
       user.$getValidatable(),
       Joi.object().keys({
-        guid: Joi.alternatives()
-          .try(
-            Joi.any().only().allow(null),
-            Joi.string().trim(false).length(24).hex()
-          )
-          .required(),
-        cdate: Joi.alternatives()
-          .try(Joi.any().only().allow(null), Joi.number())
-          .required(),
-        mdate: Joi.alternatives()
-          .try(Joi.any().only().allow(null), Joi.number())
-          .required(),
-        tags: Joi.array()
-          .items(
-            Joi.string()
-              .pattern(/[\x01-\x1F\x7F]/, {
-                name: 'control characters',
-                invert: true,
-              })
-              .min(1)
-          )
-          .required(),
-        username: Joi.string().trim(false).min(1).required(),
+        ...nymphJoiProps,
+        username: Joi.string().trim(false).required(),
         enabled: Joi.boolean().required(),
         email: Joi.string()
           .trim(false)
@@ -262,7 +218,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(512)
           .required(),
         nameMiddle: Joi.string()
@@ -271,7 +226,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(512),
         nameLast: Joi.string()
           .trim(false)
@@ -279,7 +233,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(512),
         name: Joi.string()
           .trim(false)
@@ -287,7 +240,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(512)
           .required(),
         avatar: Joi.string()
@@ -297,7 +249,6 @@ export default {
             name: 'control characters',
             invert: true,
           })
-          .min(1)
           .max(1024),
         phone: Joi.string()
           .trim(false)
@@ -310,7 +261,6 @@ export default {
               name: 'control characters',
               invert: true,
             })
-            .min(1)
             .max(256)
         ),
         inheritAbilities: Joi.boolean(),
@@ -350,8 +300,8 @@ export default {
           })
           .length(10),
         recoverSecretDate: Joi.number(),
-        salt: Joi.string().trim(false).min(1),
-        password: Joi.string().trim(false).min(1).required(),
+        salt: Joi.string().trim(false),
+        password: Joi.string().trim(false).required(),
       }),
       'Invalid User: '
     );

package/src/index.ts

@@ -14,6 +14,9 @@ export { Tilmeld };
 
 export * from './Tilmeld.types';
 
+import tilmeldJoiProps from './tilmeldJoiProps';
+export { tilmeldJoiProps };
+
 export * from './User';
 import User from './User';
 export { User };

package/src/tilmeldJoiProps.ts

@@ -0,0 +1,46 @@
+import { TilmeldAccessLevels } from '@nymphjs/nymph';
+import Joi from 'joi';
+
+import User from './User';
+import Group from './Group';
+
+export default {
+  user: Joi.object().instance(User),
+  group: Joi.object().instance(Group),
+  acUser: Joi.number().valid(
+    TilmeldAccessLevels.NO_ACCESS,
+    TilmeldAccessLevels.READ_ACCESS,
+    TilmeldAccessLevels.WRITE_ACCESS,
+    TilmeldAccessLevels.FULL_ACCESS
+  ),
+  acGroup: Joi.number().valid(
+    TilmeldAccessLevels.NO_ACCESS,
+    TilmeldAccessLevels.READ_ACCESS,
+    TilmeldAccessLevels.WRITE_ACCESS,
+    TilmeldAccessLevels.FULL_ACCESS
+  ),
+  acOther: Joi.number().valid(
+    TilmeldAccessLevels.NO_ACCESS,
+    TilmeldAccessLevels.READ_ACCESS,
+    TilmeldAccessLevels.WRITE_ACCESS,
+    TilmeldAccessLevels.FULL_ACCESS
+  ),
+  acRead: Joi.array().items(
+    Joi.alternatives().try(
+      Joi.object().instance(User),
+      Joi.object().instance(Group)
+    )
+  ),
+  acWrite: Joi.array().items(
+    Joi.alternatives().try(
+      Joi.object().instance(User),
+      Joi.object().instance(Group)
+    )
+  ),
+  acFull: Joi.array().items(
+    Joi.alternatives().try(
+      Joi.object().instance(User),
+      Joi.object().instance(Group)
+    )
+  ),
+};