@nymphjs/tilmeld 1.0.0-beta.46 → 1.0.0-beta.48

package/src/User.ts

@@ -40,7 +40,7 @@ export type EventType =
  */
 export type TilmeldCheckUsernameCallback = (
   user: User & UserData,
-  data: { username: string }
+  data: { username: string },
 ) => Promise<{ result: boolean; message?: string }>;
 /**
  * Theses are run before the user data checks, so the only checks before are
@@ -48,11 +48,11 @@ export type TilmeldCheckUsernameCallback = (
  */
 export type TilmeldBeforeRegisterCallback = (
   user: User & UserData,
-  data: { password: string; additionalData?: { [k: string]: any } }
+  data: { password: string; additionalData?: { [k: string]: any } },
 ) => Promise<void>;
 export type TilmeldAfterRegisterCallback = (
   user: User & UserData,
-  result: { loggedin: boolean; message: string }
+  result: { loggedin: boolean; message: string },
 ) => Promise<void>;
 /**
  * These are run after the authentication checks, but before the login action.
@@ -63,20 +63,20 @@ export type TilmeldBeforeLoginCallback = (
     username: string;
     password: string;
     additionalData?: { [k: string]: any };
-  }
+  },
 ) => Promise<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
+  user: User & UserData,
 ) => Promise<void>;
 export type TilmeldBeforeLogoutCallback = (
-  user: User & UserData
+  user: User & UserData,
 ) => Promise<void>;
 export type TilmeldAfterLogoutCallback = (
-  user: User & UserData
+  user: User & UserData,
 ) => Promise<void>;
 
 export type UserData = {
@@ -303,7 +303,7 @@ export default class User extends AbleObject<UserData> {
         {
           type: '&',
           ilike: ['username', username.replace(/([\\%_])/g, (s) => `\\${s}`)],
-        }
+        },
       );
       if (entity != null) {
         return entity;
@@ -329,10 +329,10 @@ export default class User extends AbleObject<UserData> {
 
   public static current(returnObjectIfNotExist: true): User & UserData;
   public static current(
-    returnObjectIfNotExist?: false
+    returnObjectIfNotExist?: false,
   ): (User & UserData) | null;
   public static current(
-    returnObjectIfNotExist?: boolean
+    returnObjectIfNotExist?: boolean,
   ): (User & UserData) | null {
     const tilmeld = enforceTilmeld(this);
     if (tilmeld.currentUser == null) {
@@ -370,7 +370,7 @@ export default class User extends AbleObject<UserData> {
         {
           type: '&',
           ilike: ['email', data.account.replace(/([\\%_])/g, (s) => `\\${s}`)],
-        }
+        },
       );
 
       if (getUser == null) {
@@ -466,7 +466,7 @@ export default class User extends AbleObject<UserData> {
       data.secret !== user.recoverSecret ||
       strtotime(
         '+' + tilmeld.config.pwRecoveryTimeLimit,
-        Math.floor((user.recoverSecretDate ?? 0) / 1000)
+        Math.floor((user.recoverSecretDate ?? 0) / 1000),
       ) *
         1000 <
         Date.now()
@@ -745,7 +745,7 @@ export default class User extends AbleObject<UserData> {
       await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
       for (let curGroup of this.$data.groups ?? []) {
         this.$descendantGroups = this.$descendantGroups?.concat(
-          await curGroup.$getDescendants()
+          await curGroup.$getDescendants(),
         );
       }
     }
@@ -764,7 +764,7 @@ export default class User extends AbleObject<UserData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke system/admin."
+        "You don't have the authority to grant or revoke system/admin.",
       );
     }
 
@@ -776,7 +776,7 @@ export default class User extends AbleObject<UserData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/admin."
+        "You don't have the authority to grant or revoke tilmeld/admin.",
       );
     }
 
@@ -788,7 +788,7 @@ export default class User extends AbleObject<UserData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/switch."
+        "You don't have the authority to grant or revoke tilmeld/switch.",
       );
     }
 
@@ -808,7 +808,7 @@ export default class User extends AbleObject<UserData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke system/admin."
+        "You don't have the authority to grant or revoke system/admin.",
       );
     }
 
@@ -820,7 +820,7 @@ export default class User extends AbleObject<UserData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/admin."
+        "You don't have the authority to grant or revoke tilmeld/admin.",
       );
     }
 
@@ -832,7 +832,7 @@ export default class User extends AbleObject<UserData> {
         !tilmeld.currentUser.abilities?.includes('system/admin'))
     ) {
       throw new BadDataError(
-        "You don't have the authority to grant or revoke tilmeld/switch."
+        "You don't have the authority to grant or revoke tilmeld/switch.",
       );
     }
 
@@ -1015,7 +1015,7 @@ export default class User extends AbleObject<UserData> {
       }
     }
     return Object.fromEntries(
-      abilities.map((ability) => [ability, true as true])
+      abilities.map((ability) => [ability, true as true]),
     );
   }
 
@@ -1044,7 +1044,7 @@ export default class User extends AbleObject<UserData> {
 
     if (this.$data.secret != null) {
       const link = `${verifyUrl}?action=verify&id=${encodeURIComponent(
-        this.guid
+        this.guid,
       )}&secret=${encodeURIComponent(this.$data.secret)}`;
       success =
         success &&
@@ -1062,13 +1062,13 @@ export default class User extends AbleObject<UserData> {
               verifyLink: link,
             },
           },
-          this
+          this,
         ));
     }
 
     if (this.$data.newEmailSecret != null) {
       const link = `${verifyUrl}?action=verifychange&id=${encodeURIComponent(
-        this.guid
+        this.guid,
       )}&secret=${encodeURIComponent(this.$data.newEmailSecret)}`;
       success =
         success &&
@@ -1088,13 +1088,13 @@ export default class User extends AbleObject<UserData> {
               newEmail: this.$data.newEmailAddress,
             },
           },
-          this
+          this,
         ));
     }
 
     if (this.$data.cancelEmailSecret != null) {
       const link = `${verifyUrl}?action=cancelchange&id=${encodeURIComponent(
-        this.guid
+        this.guid,
       )}&secret=${encodeURIComponent(this.$data.cancelEmailSecret)}`;
       success =
         success &&
@@ -1114,7 +1114,7 @@ export default class User extends AbleObject<UserData> {
               newEmail: this.$data.newEmailAddress ?? this.$data.email,
             },
           },
-          this
+          this,
         ));
     }
 
@@ -1286,7 +1286,7 @@ export default class User extends AbleObject<UserData> {
       default:
         this.$data.salt = nanoid();
         this.$data.password = sha256(password + this.$data.salt).toString(
-          Base64
+          Base64,
         );
         break;
     }
@@ -1536,7 +1536,7 @@ export default class User extends AbleObject<UserData> {
       if (
         difference(
           this.$data.username.split(''),
-          tilmeld.config.validChars.split('')
+          tilmeld.config.validChars.split(''),
         ).length
       ) {
         return {
@@ -1563,7 +1563,7 @@ export default class User extends AbleObject<UserData> {
       }
       const test = await this.$nymph.getEntity(
         { class: tilmeld.User, skipAc: true },
-        selector
+        selector,
       );
       if (test != null) {
         return { result: false, message: 'That username is taken.' };
@@ -1643,7 +1643,7 @@ export default class User extends AbleObject<UserData> {
     }
     const test = await this.$nymph.getEntity(
       { class: tilmeld.User, skipAc: true },
-      selector
+      selector,
     );
     if (test != null) {
       return {
@@ -1687,7 +1687,7 @@ export default class User extends AbleObject<UserData> {
     }
     const test = await this.$nymph.getEntity(
       { class: tilmeld.User, skipAc: true },
-      selector
+      selector,
     );
     if (test != null) {
       return { result: false, message: 'Phone number is in use.' };
@@ -1768,6 +1768,9 @@ export default class User extends AbleObject<UserData> {
     this.$nymph = tnymph;
     tilmeld = enforceTilmeld(this);
 
+    let message = '';
+    let loggedin = false;
+
     try {
       // Add primary group.
       let generatedPrimaryGroup: (Group & GroupData) | null = null;
@@ -1783,7 +1786,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['defaultPrimary', true],
-          }
+          },
         );
         if (parent != null) {
           generatedPrimaryGroup.parent = parent;
@@ -1805,7 +1808,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['defaultPrimary', true],
-          }
+          },
         );
         if (group != null) {
           this.$data.group = group;
@@ -1820,7 +1823,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['unverifiedSecondary', true],
-          }
+          },
         );
       } else {
         // Add the default secondaries.
@@ -1829,7 +1832,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['defaultSecondary', true],
-          }
+          },
         );
       }
 
@@ -1879,13 +1882,10 @@ export default class User extends AbleObject<UserData> {
                 userPhone: this.$data.phone,
               },
             },
-            this
+            this,
           );
         }
 
-        let message = '';
-        let loggedin = false;
-
         // Save the primary group.
         if (generatedPrimaryGroup != null) {
           generatedPrimaryGroup.user = this;
@@ -1940,20 +1940,6 @@ export default class User extends AbleObject<UserData> {
             });
           }
         }
-
-        try {
-          await tnymph.commit(transaction);
-          this.$nymph = nymph;
-          await this.$nymph.tilmeld?.fillSession(this);
-        } catch (e: any) {
-          throw e;
-        }
-
-        return {
-          result: true,
-          loggedin,
-          message,
-        };
       } else {
         await tnymph.rollback(transaction);
         this.$nymph = nymph;
@@ -1968,6 +1954,20 @@ export default class User extends AbleObject<UserData> {
       this.$nymph = nymph;
       throw e;
     }
+
+    try {
+      await tnymph.commit(transaction);
+      this.$nymph = nymph;
+      await this.$nymph.tilmeld?.fillSession(this);
+    } catch (e: any) {
+      throw e;
+    }
+
+    return {
+      result: true,
+      loggedin,
+      message,
+    };
   }
 
   public async $save() {
@@ -1982,7 +1982,7 @@ export default class User extends AbleObject<UserData> {
       this.$data.abilities?.includes('system/admin')
     ) {
       throw new BadDataError(
-        "You don't have the authority to modify system admins."
+        "You don't have the authority to modify system admins.",
       );
     }
 
@@ -2100,10 +2100,10 @@ export default class User extends AbleObject<UserData> {
                 new Date(
                   strtotime(
                     '+' + tilmeld.config.emailRateLimit,
-                    Math.floor(this.$data.emailChangeDate / 1000)
-                  ) * 1000
+                    Math.floor(this.$data.emailChangeDate / 1000),
+                  ) * 1000,
                 ).toString() +
-                ' to change your email address again.'
+                ' to change your email address again.',
             );
           } else {
             if (
@@ -2258,7 +2258,7 @@ export default class User extends AbleObject<UserData> {
       this.$data.abilities?.includes('system/admin')
     ) {
       throw new BadDataError(
-        "You don't have the authority to delete system admins."
+        "You don't have the authority to delete system admins.",
       );
     }
     if (tilmeld.User.current(true).$is(this)) {
@@ -2283,7 +2283,7 @@ export default class User extends AbleObject<UserData> {
       ? TilmeldBeforeLogoutCallback
       : T extends 'afterLogout'
       ? TilmeldAfterLogoutCallback
-      : never
+      : never,
   ) {
     const prop = (event + 'Callbacks') as T extends 'checkUsername'
       ? 'checkUsernameCallbacks'
@@ -2324,7 +2324,7 @@ export default class User extends AbleObject<UserData> {
       ? TilmeldBeforeLogoutCallback
       : T extends 'afterLogout'
       ? TilmeldAfterLogoutCallback
-      : never
+      : never,
   ) {
     const prop = (event + 'Callbacks') as T extends 'checkUsername'
       ? 'checkUsernameCallbacks'

package/src/conf/d.ts

@@ -237,7 +237,7 @@ export interface Config {
   jwtBuilder: (
     config: Config,
     user: User & UserData,
-    switchToken?: boolean
+    switchToken?: boolean,
   ) => string;
   /**
    * Function to verify that a JWT was signed with the secret key, validate its
@@ -251,7 +251,7 @@ export interface Config {
   jwtExtract: (
     config: Config,
     token: string,
-    xsrfToken?: string
+    xsrfToken?: string,
   ) => { guid: string; issued: Date; expire: Date } | null;
   /**
    * The absolute path to the email template directory. Used by the default
@@ -268,7 +268,7 @@ export interface Config {
   configEmail: (
     tilmeld: Tilmeld,
     options: EmailOptions,
-    user: User & UserData
+    user: User & UserData,
   ) => Promise<EmailConfig>;
   /**
    * Send an email to a user. Uses `email-templates` by default.
@@ -298,7 +298,7 @@ export interface Config {
   sendEmail: (
     tilmeld: Tilmeld,
     options: EmailOptions,
-    user: User & UserData
+    user: User & UserData,
   ) => Promise<boolean>;
   /**
    * The address you'd like to receive a notification of registered users, if

package/src/conf/defaults.ts

@@ -69,7 +69,7 @@ export default {
         xsrfToken: 'TILMELDXSRF-' + nanoid(),
       },
       secret,
-      { expiresIn: switchToken ? config.jwtSwitchExpire : config.jwtExpire }
+      { expiresIn: switchToken ? config.jwtSwitchExpire : config.jwtExpire },
     );
   },
   jwtExtract: (config, token, xsrfToken?) => {
@@ -129,14 +129,14 @@ export default {
   },
   sendEmail: async (tilmeld, options, user) => {
     const email = new Email(
-      await tilmeld.config.configEmail(tilmeld, options, user)
+      await tilmeld.config.configEmail(tilmeld, options, user),
     );
     try {
       const result = await email.send({
         ...options,
         template: path.join(
           tilmeld.config.emailTemplateDir,
-          options.template ?? '.'
+          options.template ?? '.',
         ),
         locals: {
           // System
@@ -206,13 +206,13 @@ export default {
               name: 'control characters',
               invert: true,
             })
-            .max(256)
+            .max(256),
         ),
         defaultPrimary: Joi.boolean(),
         defaultSecondary: Joi.boolean(),
         unverifiedSecondary: Joi.boolean(),
       }),
-      'Invalid Group: '
+      'Invalid Group: ',
     );
   },
   validatorUser: (user) => {
@@ -275,7 +275,7 @@ export default {
               name: 'control characters',
               invert: true,
             })
-            .max(256)
+            .max(256),
         ),
         inheritAbilities: Joi.boolean(),
         secret: Joi.string()
@@ -323,7 +323,7 @@ export default {
           .max(40)
           .pattern(/^[A-Z234567]+$/, 'base32 encoded unpadded'),
       }),
-      'Invalid User: '
+      'Invalid User: ',
     );
   },
 } as Config;

package/src/tilmeldJoiProps.ts

@@ -11,36 +11,36 @@ export default {
     TilmeldAccessLevels.NO_ACCESS,
     TilmeldAccessLevels.READ_ACCESS,
     TilmeldAccessLevels.WRITE_ACCESS,
-    TilmeldAccessLevels.FULL_ACCESS
+    TilmeldAccessLevels.FULL_ACCESS,
   ),
   acGroup: Joi.number().valid(
     TilmeldAccessLevels.NO_ACCESS,
     TilmeldAccessLevels.READ_ACCESS,
     TilmeldAccessLevels.WRITE_ACCESS,
-    TilmeldAccessLevels.FULL_ACCESS
+    TilmeldAccessLevels.FULL_ACCESS,
   ),
   acOther: Joi.number().valid(
     TilmeldAccessLevels.NO_ACCESS,
     TilmeldAccessLevels.READ_ACCESS,
     TilmeldAccessLevels.WRITE_ACCESS,
-    TilmeldAccessLevels.FULL_ACCESS
+    TilmeldAccessLevels.FULL_ACCESS,
   ),
   acRead: Joi.array().items(
     Joi.alternatives().try(
       Joi.object().instance(User),
-      Joi.object().instance(Group)
-    )
+      Joi.object().instance(Group),
+    ),
   ),
   acWrite: Joi.array().items(
     Joi.alternatives().try(
       Joi.object().instance(User),
-      Joi.object().instance(Group)
-    )
+      Joi.object().instance(Group),
+    ),
   ),
   acFull: Joi.array().items(
     Joi.alternatives().try(
       Joi.object().instance(User),
-      Joi.object().instance(Group)
-    )
+      Joi.object().instance(Group),
+    ),
   ),
 };