@nymphjs/tilmeld 1.0.0-beta.0 → 1.0.0-beta.10

package/src/Tilmeld.ts

@@ -6,6 +6,7 @@ import {
   TilmeldInterface,
   TilmeldAccessLevels,
 } from '@nymphjs/nymph';
+import { URL } from 'url';
 import { Request, Response } from 'express';
 import { xor } from 'lodash';
 
@@ -83,6 +84,7 @@ export default class Tilmeld implements TilmeldInterface {
 
   /**
    * This is used internally by Nymph. Don't call it yourself.
+   *
    * @returns A clone of this instance.
    */
   public clone() {
@@ -104,6 +106,7 @@ export default class Tilmeld implements TilmeldInterface {
    */
   public init(nymph: Nymph) {
     this.nymph = nymph;
+    const tilmeld = this;
 
     // Set up access control hooks when Nymph is called.
     if (this.nymph.driver == null) {
@@ -111,18 +114,18 @@ export default class Tilmeld implements TilmeldInterface {
     }
 
     // Configure the classes.
-    class NymphUser extends User {}
-    NymphUser.nymph = this.nymph;
-    NymphUser.tilmeld = this;
+    class NymphUser extends User {
+      static nymph: Nymph = nymph;
+      static tilmeld: Tilmeld = tilmeld;
+    }
     (NymphUser as any).skipOnClone = true;
-    this.User = NymphUser;
-    this.nymph.addEntityClass(NymphUser);
-    class NymphGroup extends Group {}
-    NymphGroup.nymph = this.nymph;
-    NymphGroup.tilmeld = this;
+    this.User = this.nymph.addEntityClass(NymphUser);
+    class NymphGroup extends Group {
+      static nymph: Nymph = nymph;
+      static tilmeld: Tilmeld = tilmeld;
+    }
     (NymphUser as any).skipOnClone = true;
-    this.Group = NymphGroup;
-    this.nymph.addEntityClass(NymphGroup);
+    this.Group = this.nymph.addEntityClass(NymphGroup);
 
     this.initAccessControl();
     if (this.request != null && !this.skipAuthenticate) {
@@ -190,7 +193,7 @@ export default class Tilmeld implements TilmeldInterface {
     handleQuery.skipOnClone = true;
 
     // Filter entities being deleted for user permissions.
-    const checkPermissionsDelete = function (
+    const checkPermissionsDelete = async function (
       nymph: Nymph,
       entity: EntityInterface
     ) {
@@ -209,7 +212,7 @@ export default class Tilmeld implements TilmeldInterface {
     checkPermissionsDelete.skipOnClone = true;
 
     // Filter entities being deleted for user permissions.
-    const checkPermissionsDeleteByID = function (
+    const checkPermissionsDeleteByID = async function (
       nymph: Nymph,
       guid: string,
       className?: string
@@ -226,7 +229,7 @@ export default class Tilmeld implements TilmeldInterface {
 
     // Filter entities being saved for user permissions, and filter any
     // disallowed changes to AC properties.
-    const checkPermissionsSaveAndFilterAcChanges = function (
+    const checkPermissionsSaveAndFilterAcChanges = async function (
       nymph: Nymph,
       entity: EntityInterface & AccessControlData
     ) {
@@ -393,7 +396,7 @@ export default class Tilmeld implements TilmeldInterface {
      * - acGroup = TilmeldAccessLevels.READ_ACCESS
      * - acOther = TilmeldAccessLevels.NO_ACCESS
      */
-    const addAccess = function (
+    const addAccess = async function (
       nymph: Nymph,
       entity: EntityInterface & AccessControlData
     ) {
@@ -437,7 +440,7 @@ export default class Tilmeld implements TilmeldInterface {
     };
     addAccess.skipOnClone = true;
 
-    const validate = function (
+    const validate = async function (
       _nymph: Nymph,
       entity: EntityInterface & AccessControlData
     ) {

package/src/User.ts

@@ -37,11 +37,11 @@ export type EventType =
 export type TilmeldBeforeRegisterCallback = (
   user: User & UserData,
   data: { password: string; additionalData?: { [k: string]: any } }
-) => Promise<void> | void;
+) => Promise<void>;
 export type TilmeldAfterRegisterCallback = (
   user: User & UserData,
   result: { loggedin: boolean; message: string }
-) => Promise<void> | void;
+) => Promise<void>;
 /**
  * These are run after the authentication checks, but before the login action.
  */
@@ -52,14 +52,20 @@ export type TilmeldBeforeLoginCallback = (
     password: string;
     additionalData?: { [k: string]: any };
   }
-) => void;
+) => 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) => void;
-export type TilmeldBeforeLogoutCallback = (user: User & UserData) => void;
-export type TilmeldAfterLogoutCallback = (user: User & UserData) => void;
+export type TilmeldAfterLoginCallback = (
+  user: User & UserData
+) => Promise<void>;
+export type TilmeldBeforeLogoutCallback = (
+  user: User & UserData
+) => Promise<void>;
+export type TilmeldAfterLogoutCallback = (
+  user: User & UserData
+) => Promise<void>;
 
 export type UserData = {
   /**
@@ -482,7 +488,7 @@ export default class User extends AbleObject<UserData> {
     }
     const user = await this.tilmeld.User.factoryUsername(data.username);
     const result: { result: boolean; message: string; user?: User & UserData } =
-      user.$login(data);
+      await user.$login(data);
     if (result.result) {
       user.$updateDataProtection();
       result.user = user;
@@ -490,7 +496,7 @@ export default class User extends AbleObject<UserData> {
     return result;
   }
 
-  public $login(data: {
+  public async $login(data: {
     username: string;
     password: string;
     additionalData?: { [k: string]: any };
@@ -513,7 +519,7 @@ export default class User extends AbleObject<UserData> {
       for (let callback of (this.constructor as typeof User)
         .beforeLoginCallbacks) {
         if (callback) {
-          callback(this, data);
+          await callback(this, data);
         }
       }
     } catch (e: any) {
@@ -531,7 +537,7 @@ export default class User extends AbleObject<UserData> {
     for (let callback of (this.constructor as typeof User)
       .afterLoginCallbacks) {
       if (callback) {
-        callback(this);
+        await callback(this);
       }
     }
 
@@ -543,14 +549,14 @@ export default class User extends AbleObject<UserData> {
    * Log a user out of the system.
    * @returns An object with a boolean 'result' entry and a 'message' entry.
    */
-  public $logout() {
+  public async $logout() {
     const tilmeld = this.$nymph.tilmeld as Tilmeld;
 
     try {
       for (let callback of (this.constructor as typeof User)
         .beforeLogoutCallbacks) {
         if (callback) {
-          callback(this);
+          await callback(this);
         }
       }
     } catch (e: any) {
@@ -565,7 +571,7 @@ export default class User extends AbleObject<UserData> {
     for (let callback of (this.constructor as typeof User)
       .afterLogoutCallbacks) {
       if (callback) {
-        callback(this);
+        await callback(this);
       }
     }
 
@@ -627,7 +633,8 @@ export default class User extends AbleObject<UserData> {
     this.$referenceWake();
 
     if (
-      input.data.abilities?.indexOf('system/admin') !== -1 &&
+      'abilities' in input.data &&
+      input.data.abilities.indexOf('system/admin') !== -1 &&
       this.$data.abilities?.indexOf('system/admin') === -1 &&
       tilmeld.gatekeeper('tilmeld/admin') &&
       !tilmeld.gatekeeper('system/admin')
@@ -646,7 +653,8 @@ export default class User extends AbleObject<UserData> {
     this.$referenceWake();
 
     if (
-      patch.set.abilities?.indexOf('system/admin') !== -1 &&
+      'abilities' in patch.set &&
+      patch.set.abilities.indexOf('system/admin') !== -1 &&
       this.$data.abilities?.indexOf('system/admin') === -1 &&
       tilmeld.gatekeeper('tilmeld/admin') &&
       !tilmeld.gatekeeper('system/admin')
@@ -1777,7 +1785,7 @@ export default class User extends AbleObject<UserData> {
       );
     }
     if (tilmeld.User.current(true).$is(this)) {
-      this.$logout();
+      await this.$logout();
     }
     return await super.$delete();
   }

package/src/conf/defaults.ts

@@ -1,4 +1,5 @@
 import path from 'path';
+import { URL } from 'url';
 import jwt from 'jsonwebtoken';
 import Email from 'email-templates';
 import Joi from 'joi';

package/tsconfig.json

@@ -2,6 +2,8 @@
   "extends": "@tsconfig/recommended/tsconfig.json",
 
   "compilerOptions": {
+    "lib": ["ES2021"],
+    "target": "ES2021",
     "noImplicitAny": true,
     "removeComments": true,
     "sourceMap": true,