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

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.0.0-beta.47](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.46...v1.0.0-beta.47) (2023-11-10)
+
+**Note:** Version bump only for package @nymphjs/tilmeld
+
 # [1.0.0-beta.46](https://github.com/sciactive/nymphjs/compare/v1.0.0-beta.45...v1.0.0-beta.46) (2023-08-29)
 
 ### Bug Fixes

package/README.md

@@ -38,7 +38,7 @@ const nymph = new Nymph(
   new SQLite3Driver({
     filename: ':memory:',
   }),
-  tilmeld
+  tilmeld,
 );
 
 // These are the classes specific to this instance of Tilmeld.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/tilmeld",
-  "version": "1.0.0-beta.46",
+  "version": "1.0.0-beta.47",
   "description": "Nymph.js - Tilmeld User and Group System",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -31,35 +31,35 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/guid": "^1.0.0-beta.46",
-    "@nymphjs/nymph": "^1.0.0-beta.46",
-    "crypto-js": "^4.1.1",
-    "email-templates": "^11.1.0",
+    "@nymphjs/guid": "^1.0.0-beta.47",
+    "@nymphjs/nymph": "^1.0.0-beta.47",
+    "crypto-js": "^4.2.0",
+    "email-templates": "^11.1.1",
     "express": "^4.18.2",
-    "joi": "^17.9.2",
-    "jsonwebtoken": "^9.0.0",
+    "joi": "^17.11.0",
+    "jsonwebtoken": "^9.0.2",
     "locutus": "^2.0.16",
     "lodash": "^4.17.21",
-    "otpauth": "^9.1.2",
+    "otpauth": "^9.1.5",
     "pug": "^3.0.2",
     "qrcode": "^1.5.3"
   },
   "devDependencies": {
-    "@nymphjs/client": "^1.0.0-beta.46",
-    "@nymphjs/client-node": "^1.0.0-beta.46",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.46",
-    "@tsconfig/recommended": "^1.0.2",
-    "@types/crypto-js": "^4.1.1",
-    "@types/email-templates": "^10.0.1",
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/jsonwebtoken": "^9.0.2",
-    "@types/locutus": "^0.0.6",
-    "@types/lodash": "^4.14.195",
-    "@types/qrcode": "^1.5.0",
-    "jest": "^29.5.0",
-    "ts-jest": "^29.1.0",
-    "typescript": "^5.1.3"
+    "@nymphjs/client": "^1.0.0-beta.47",
+    "@nymphjs/client-node": "^1.0.0-beta.47",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.47",
+    "@tsconfig/recommended": "^1.0.3",
+    "@types/crypto-js": "^4.2.1",
+    "@types/email-templates": "^10.0.4",
+    "@types/express": "^4.17.21",
+    "@types/jest": "^29.5.8",
+    "@types/jsonwebtoken": "^9.0.5",
+    "@types/locutus": "^0.0.8",
+    "@types/lodash": "^4.14.201",
+    "@types/qrcode": "^1.5.5",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.2.2"
   },
-  "gitHead": "25431d66afea7c1a3299b9588afdd79960d82885"
+  "gitHead": "228f0d25911d1b98859f2acf8ace3d3f251c4882"
 }

package/src/AbleObject.ts

@@ -6,7 +6,7 @@ import { Entity } from '@nymphjs/nymph';
  * Used in entities which support abilities, such as users and groups.
  */
 export default abstract class AbleObject<
-  T extends { abilities?: string[] }
+  T extends { abilities?: string[] },
 > extends Entity<T> {
   /**
    * Grant an ability.

package/src/Group.test.ts

@@ -21,7 +21,7 @@ const _nymph = new Nymph(
   new SQLite3Driver({
     filename: ':memory:',
   }),
-  tilmeld
+  tilmeld,
 );
 
 const Group = tilmeld.Group;

package/src/Group.ts

@@ -119,7 +119,7 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   static async factoryGroupname(
-    groupname?: string
+    groupname?: string,
   ): Promise<Group & GroupData> {
     const entity = new this();
     if (groupname != null) {
@@ -130,7 +130,7 @@ export default class Group extends AbleObject<GroupData> {
         {
           type: '&',
           ilike: ['groupname', groupname.replace(/([\\%_])/g, (s) => `\\${s}`)],
-        }
+        },
       );
       if (entity != null) {
         return entity;
@@ -161,7 +161,7 @@ export default class Group extends AbleObject<GroupData> {
    */
   public static async getPrimaryGroups(
     options?: Options,
-    selectors?: Selector[]
+    selectors?: Selector[],
   ) {
     const tilmeld = enforceTilmeld(this);
     if (!tilmeld.gatekeeper('tilmeld/admin')) {
@@ -171,7 +171,7 @@ export default class Group extends AbleObject<GroupData> {
     return await this.getAssignableGroups(
       tilmeld.config.highestPrimary,
       { ...options, class: tilmeld.Group, return: 'entity' },
-      [...(selectors ?? [])]
+      [...(selectors ?? [])],
     );
   }
 
@@ -184,7 +184,7 @@ export default class Group extends AbleObject<GroupData> {
    */
   public static async getSecondaryGroups(
     options?: Options,
-    selectors?: Selector[]
+    selectors?: Selector[],
   ) {
     const tilmeld = enforceTilmeld(this);
     if (!tilmeld.gatekeeper('tilmeld/admin')) {
@@ -194,14 +194,14 @@ export default class Group extends AbleObject<GroupData> {
     return await this.getAssignableGroups(
       tilmeld.config.highestSecondary,
       { ...options, class: tilmeld.Group, return: 'entity' },
-      [...(selectors ?? [])]
+      [...(selectors ?? [])],
     );
   }
 
   private static async getAssignableGroups(
     highestParent: string | boolean,
     options: Options<typeof Group>,
-    selectors: Selector[]
+    selectors: Selector[],
   ) {
     const tilmeld = enforceTilmeld(this);
     let assignableGroups: (Group & GroupData)[] = [];
@@ -212,7 +212,7 @@ export default class Group extends AbleObject<GroupData> {
 
     assignableGroups = await this.nymph.getEntities(
       { ...options, class: tilmeld.Group },
-      ...selectors
+      ...selectors,
     );
     if (highestParent !== true) {
       assignableGroups = (
@@ -230,7 +230,7 @@ export default class Group extends AbleObject<GroupData> {
               await parent?.$wake();
             }
             return null;
-          })
+          }),
         )
       ).filter((group) => group != null) as (Group & GroupData)[];
     }
@@ -263,7 +263,7 @@ export default class Group extends AbleObject<GroupData> {
         !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.",
       );
     }
 
@@ -275,7 +275,7 @@ export default class Group extends AbleObject<GroupData> {
         !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.",
       );
     }
 
@@ -287,7 +287,7 @@ export default class Group extends AbleObject<GroupData> {
         !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.",
       );
     }
 
@@ -306,7 +306,7 @@ export default class Group extends AbleObject<GroupData> {
         !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.",
       );
     }
 
@@ -318,7 +318,7 @@ export default class Group extends AbleObject<GroupData> {
         !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.",
       );
     }
 
@@ -330,7 +330,7 @@ export default class Group extends AbleObject<GroupData> {
         !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.",
       );
     }
 
@@ -383,7 +383,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns True or false.
    */
   public async $isDescendant(
-    givenGroup: (Group & GroupData) | string
+    givenGroup: (Group & GroupData) | string,
   ): Promise<boolean> {
     const tilmeld = enforceTilmeld(this);
     let group: Group & GroupData;
@@ -423,7 +423,7 @@ export default class Group extends AbleObject<GroupData> {
         type: '&',
         equal: ['enabled', true],
         ref: ['parent', this],
-      }
+      },
     );
   }
 
@@ -434,7 +434,7 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An array of groups.
    */
   public async $getDescendants(
-    andSelf = false
+    andSelf = false,
   ): Promise<(Group & GroupData)[]> {
     const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
@@ -444,7 +444,7 @@ export default class Group extends AbleObject<GroupData> {
         type: '&',
         equal: ['enabled', true],
         ref: ['parent', this],
-      }
+      },
     );
     for (let entity of entities) {
       groups = (await entity.$getDescendants(true)).concat(groups);
@@ -492,7 +492,7 @@ export default class Group extends AbleObject<GroupData> {
   public async $getUsers(
     descendants = false,
     limit?: number,
-    offset?: number
+    offset?: number,
   ): Promise<(User & UserData)[]> {
     const tilmeld = enforceTilmeld(this);
     let groups: (Group & GroupData)[] = [];
@@ -523,7 +523,7 @@ export default class Group extends AbleObject<GroupData> {
             group,
           ]),
         ],
-      }
+      },
     );
   }
 
@@ -562,7 +562,7 @@ export default class Group extends AbleObject<GroupData> {
       if (
         difference(
           this.$data.groupname.split(''),
-          tilmeld.config.validChars.split('')
+          tilmeld.config.validChars.split(''),
         ).length
       ) {
         return {
@@ -589,7 +589,7 @@ export default class Group extends AbleObject<GroupData> {
       }
       const test = await this.$nymph.getEntity(
         { class: tilmeld.Group, skipAc: true },
-        selector
+        selector,
       );
       if (test != null) {
         return { result: false, message: 'That groupname is taken.' };
@@ -656,7 +656,7 @@ export default class Group extends AbleObject<GroupData> {
     }
     const test = await this.$nymph.getEntity(
       { class: tilmeld.Group, skipAc: true },
-      selector
+      selector,
     );
     if (test != null) {
       return {
@@ -749,7 +749,7 @@ export default class Group extends AbleObject<GroupData> {
         (await parent.$isDescendant(this)))
     ) {
       throw new BadDataError(
-        "Group parent can't be itself or descendant of itself."
+        "Group parent can't be itself or descendant of itself.",
       );
     }
 
@@ -763,14 +763,14 @@ export default class Group extends AbleObject<GroupData> {
     if (this.$data.defaultPrimary) {
       const currentPrimary = await this.$nymph.getEntity(
         { class: tilmeld.Group },
-        { type: '&', truthy: 'defaultPrimary' }
+        { type: '&', truthy: 'defaultPrimary' },
       );
       if (currentPrimary != null && !this.$is(currentPrimary)) {
         currentPrimary.defaultPrimary = false;
         if (!(await currentPrimary.$save())) {
           throw new CouldNotChangeDefaultPrimaryGroupError(
             'Could not change new user primary group from ' +
-              `${currentPrimary.groupname}.`
+              `${currentPrimary.groupname}.`,
           );
         }
       }
@@ -828,7 +828,7 @@ export default class Group extends AbleObject<GroupData> {
       {
         type: '&',
         ref: ['group', this],
-      }
+      },
     );
     for (let user of primaryUsers) {
       delete user.group;
@@ -848,7 +848,7 @@ export default class Group extends AbleObject<GroupData> {
       {
         type: '&',
         ref: ['groups', this],
-      }
+      },
     );
     for (let user of secondaryUsers) {
       user.$delGroup(this);

package/src/Tilmeld.ts

@@ -183,7 +183,7 @@ export default class Tilmeld implements TilmeldInterface {
     const handleQuery = function (
       nymph: Nymph,
       options: Options,
-      selectors: FormattedSelector[]
+      selectors: FormattedSelector[],
     ) {
       const tilmeld = enforceTilmeld(nymph);
       if (
@@ -225,7 +225,7 @@ export default class Tilmeld implements TilmeldInterface {
     // Filter entities being deleted for user permissions.
     const checkPermissionsDelete = async function (
       nymph: Nymph,
-      entity: EntityInterface
+      entity: EntityInterface,
     ) {
       const tilmeld = enforceTilmeld(nymph);
       if (
@@ -245,11 +245,11 @@ export default class Tilmeld implements TilmeldInterface {
     const checkPermissionsDeleteByID = async function (
       nymph: Nymph,
       guid: string,
-      className?: string
+      className?: string,
     ) {
       const entity = await nymph.getEntity(
         { class: nymph.getEntityClass(className ?? 'Entity') },
-        { type: '&', guid: guid }
+        { type: '&', guid: guid },
       );
       if (entity != null) {
         checkPermissionsDelete(nymph, entity);
@@ -261,7 +261,7 @@ export default class Tilmeld implements TilmeldInterface {
     // disallowed changes to AC properties.
     const checkPermissionsSaveAndFilterAcChanges = async function (
       nymph: Nymph,
-      entity: EntityInterface & AccessControlData
+      entity: EntityInterface & AccessControlData,
     ) {
       const tilmeld = enforceTilmeld(nymph);
       if (!entity) {
@@ -338,12 +338,12 @@ export default class Tilmeld implements TilmeldInterface {
               entity,
               TilmeldAccessLevels.FULL_ACCESS,
               undefined,
-              originalAc
+              originalAc,
             )
           ) {
             // Only allow changes to AC properties if the user has full access.
             throw new AccessControlError(
-              'No permission to change access control properties.'
+              'No permission to change access control properties.',
             );
           }
 
@@ -354,7 +354,7 @@ export default class Tilmeld implements TilmeldInterface {
               newAc.user !== tilmeld.currentUser)
           ) {
             throw new AccessControlError(
-              'No permission to assign to another user.'
+              'No permission to assign to another user.',
             );
           }
 
@@ -366,7 +366,7 @@ export default class Tilmeld implements TilmeldInterface {
               (tilmeld.currentUser?.$getGids() ?? []).includes(newAc.group))
           ) {
             throw new AccessControlError(
-              'No permission to assign to another group.'
+              'No permission to assign to another group.',
             );
           }
         }
@@ -397,7 +397,7 @@ export default class Tilmeld implements TilmeldInterface {
      */
     const addAccess = async function (
       nymph: Nymph,
-      entity: EntityInterface & AccessControlData
+      entity: EntityInterface & AccessControlData,
     ) {
       const tilmeld = enforceTilmeld(nymph);
       const user = tilmeld.currentUser;
@@ -440,7 +440,7 @@ export default class Tilmeld implements TilmeldInterface {
 
     const validate = async function (
       _nymph: Nymph,
-      entity: EntityInterface & AccessControlData
+      entity: EntityInterface & AccessControlData,
     ) {
       if (!(entity instanceof User) && !(entity instanceof Group)) {
         const ownershipAcPropertyValidator = (prop: any) => {
@@ -450,7 +450,7 @@ export default class Tilmeld implements TilmeldInterface {
             prop > TilmeldAccessLevels.FULL_ACCESS
           ) {
             throw new AccessControlError(
-              'Invalid access control property: ' + prop
+              'Invalid access control property: ' + prop,
             );
           }
         };
@@ -458,13 +458,13 @@ export default class Tilmeld implements TilmeldInterface {
         const accessAcPropertyValidator = (prop: any) => {
           if (!Array.isArray(prop)) {
             throw new AccessControlError(
-              'Invalid access control property: ' + prop
+              'Invalid access control property: ' + prop,
             );
           }
           prop.forEach((value) => {
             if (!(value instanceof User || value instanceof Group)) {
               throw new AccessControlError(
-                'Invalid access control property: ' + prop
+                'Invalid access control property: ' + prop,
               );
             }
           });
@@ -473,7 +473,7 @@ export default class Tilmeld implements TilmeldInterface {
         if ('user' in entity) {
           if (!(entity.user instanceof User)) {
             throw new AccessControlError(
-              'Invalid access control property: user'
+              'Invalid access control property: user',
             );
           }
         }
@@ -481,7 +481,7 @@ export default class Tilmeld implements TilmeldInterface {
         if ('group' in entity) {
           if (!(entity.group instanceof Group)) {
             throw new AccessControlError(
-              'Invalid access control property: group'
+              'Invalid access control property: group',
             );
           }
         }
@@ -526,7 +526,7 @@ export default class Tilmeld implements TilmeldInterface {
    */
   public addAccessControlSelectors(
     options: Options,
-    selectors: FormattedSelector[]
+    selectors: FormattedSelector[],
   ) {
     const user = this.currentUser;
 
@@ -691,7 +691,7 @@ export default class Tilmeld implements TilmeldInterface {
     entity: EntityInterface,
     type: TilmeldAccessLevels = TilmeldAccessLevels.READ_ACCESS,
     user?: (User & UserData) | false,
-    acProperties?: ACProperties
+    acProperties?: ACProperties,
   ) {
     if (!acProperties) {
       acProperties = entity.$getCurrentAcValues() as ACProperties;
@@ -811,7 +811,7 @@ export default class Tilmeld implements TilmeldInterface {
   public async checkClientUIDPermissions(
     name: string,
     type: TilmeldAccessLevels = TilmeldAccessLevels.READ_ACCESS,
-    user?: (User & UserData) | false
+    user?: (User & UserData) | false,
   ) {
     let userOrEmpty: User & UserData = this.User.factorySync();
     // Calculate the user.
@@ -896,7 +896,7 @@ export default class Tilmeld implements TilmeldInterface {
       {
         type: '&',
         guid: guid,
-      }
+      },
     );
     if (!user || !user.guid) {
       return null;
@@ -1050,7 +1050,7 @@ export default class Tilmeld implements TilmeldInterface {
   public async login(
     user: User & UserData,
     sendAuthHeader: boolean,
-    sendCookie = true
+    sendCookie = true,
   ) {
     if (user.guid != null && user.enabled) {
       if (this.response) {
@@ -1096,7 +1096,7 @@ export default class Tilmeld implements TilmeldInterface {
   public async loginSwitch(
     user: User & UserData,
     sendAuthHeader: boolean,
-    sendCookie = true
+    sendCookie = true,
   ) {
     if (user.guid != null) {
       if (this.response) {

package/src/User.test.ts

@@ -21,7 +21,7 @@ const _nymph = new Nymph(
   new SQLite3Driver({
     filename: ':memory:',
   }),
-  tilmeld
+  tilmeld,
 );
 
 const User = tilmeld.User;

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.' };
@@ -1783,7 +1783,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['defaultPrimary', true],
-          }
+          },
         );
         if (parent != null) {
           generatedPrimaryGroup.parent = parent;
@@ -1805,7 +1805,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['defaultPrimary', true],
-          }
+          },
         );
         if (group != null) {
           this.$data.group = group;
@@ -1820,7 +1820,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['unverifiedSecondary', true],
-          }
+          },
         );
       } else {
         // Add the default secondaries.
@@ -1829,7 +1829,7 @@ export default class User extends AbleObject<UserData> {
           {
             type: '&',
             equal: ['defaultSecondary', true],
-          }
+          },
         );
       }
 
@@ -1879,7 +1879,7 @@ export default class User extends AbleObject<UserData> {
                 userPhone: this.$data.phone,
               },
             },
-            this
+            this,
           );
         }
 
@@ -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),
+    ),
   ),
 };