@nymphjs/tilmeld 1.0.0-alpha.1 → 1.0.0-alpha.5

package/dist/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = exports.Tilmeld = exports.Group = exports.AbleObject = void 0;
+exports.User = exports.tilmeldJoiProps = exports.Tilmeld = exports.Group = exports.AbleObject = void 0;
 __exportStar(require("./conf"), exports);
 __exportStar(require("./errors"), exports);
 const AbleObject_1 = __importDefault(require("./AbleObject"));
@@ -23,8 +23,9 @@ const Group_1 = __importDefault(require("./Group"));
 exports.Group = Group_1.default;
 const Tilmeld_1 = __importDefault(require("./Tilmeld"));
 exports.Tilmeld = Tilmeld_1.default;
-exports.default = Tilmeld_1.default;
 __exportStar(require("./Tilmeld.types"), exports);
+const tilmeldJoiProps_1 = __importDefault(require("./tilmeldJoiProps"));
+exports.tilmeldJoiProps = tilmeldJoiProps_1.default;
 __exportStar(require("./User"), exports);
 const User_1 = __importDefault(require("./User"));
 exports.User = User_1.default;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AAEvB,2CAAyB;AAEzB,8DAAsC;AAC7B,qBADF,oBAAU,CACE;AAEnB,0CAAwB;AACxB,oDAA4B;AACnB,gBADF,eAAK,CACE;AAEd,wDAAgC;AACvB,kBADF,iBAAO,CACE;AAChB,kBAAe,iBAAO,CAAC;AAEvB,kDAAgC;AAEhC,yCAAuB;AACvB,kDAA0B;AACjB,eADF,cAAI,CACE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AAEvB,2CAAyB;AAEzB,8DAAsC;AAC7B,qBADF,oBAAU,CACE;AAEnB,0CAAwB;AACxB,oDAA4B;AACnB,gBADF,eAAK,CACE;AAEd,wDAAgC;AACvB,kBADF,iBAAO,CACE;AAEhB,kDAAgC;AAEhC,wEAAgD;AACvC,0BADF,yBAAe,CACE;AAExB,yCAAuB;AACvB,kDAA0B;AACjB,eADF,cAAI,CACE"}

package/dist/tilmeldJoiProps.d.ts

@@ -0,0 +1,12 @@
+import Joi from 'joi';
+declare const _default: {
+    user: Joi.ObjectSchema<any>;
+    group: Joi.ObjectSchema<any>;
+    acUser: Joi.NumberSchema;
+    acGroup: Joi.NumberSchema;
+    acOther: Joi.NumberSchema;
+    acRead: Joi.ArraySchema;
+    acWrite: Joi.ArraySchema;
+    acFull: Joi.ArraySchema;
+};
+export default _default;

package/dist/tilmeldJoiProps.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const nymph_1 = require("@nymphjs/nymph");
+const joi_1 = __importDefault(require("joi"));
+const User_1 = __importDefault(require("./User"));
+const Group_1 = __importDefault(require("./Group"));
+exports.default = {
+    user: joi_1.default.object().instance(User_1.default),
+    group: joi_1.default.object().instance(Group_1.default),
+    acUser: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
+    acGroup: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
+    acOther: joi_1.default.number().valid(nymph_1.TilmeldAccessLevels.NO_ACCESS, nymph_1.TilmeldAccessLevels.READ_ACCESS, nymph_1.TilmeldAccessLevels.WRITE_ACCESS, nymph_1.TilmeldAccessLevels.FULL_ACCESS),
+    acRead: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
+    acWrite: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
+    acFull: joi_1.default.array().items(joi_1.default.alternatives().try(joi_1.default.object().instance(User_1.default), joi_1.default.object().instance(Group_1.default))),
+};
+//# sourceMappingURL=tilmeldJoiProps.js.map

package/dist/tilmeldJoiProps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tilmeldJoiProps.js","sourceRoot":"","sources":["../src/tilmeldJoiProps.ts"],"names":[],"mappings":";;;;;AAAA,0CAAqD;AACrD,8CAAsB;AAEtB,kDAA0B;AAC1B,oDAA4B;AAE5B,kBAAe;IACb,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC;IACjC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC;IACnC,MAAM,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACxB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CACzB,2BAAmB,CAAC,SAAS,EAC7B,2BAAmB,CAAC,WAAW,EAC/B,2BAAmB,CAAC,YAAY,EAChC,2BAAmB,CAAC,WAAW,CAChC;IACD,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;IACD,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACxB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;IACD,MAAM,EAAE,aAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CACvB,aAAG,CAAC,YAAY,EAAE,CAAC,GAAG,CACpB,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,cAAI,CAAC,EAC3B,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAK,CAAC,CAC7B,CACF;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/tilmeld",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.5",
   "description": "NymphJS - Tilmeld User and Group System",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/nymph": "^1.0.0-alpha.1",
+    "@nymphjs/nymph": "^1.0.0-alpha.5",
     "crypto-js": "^4.1.1",
     "email-templates": "^8.0.8",
     "express": "^4.17.1",
@@ -44,9 +44,9 @@
     "pug": "^3.0.2"
   },
   "devDependencies": {
-    "@nymphjs/client": "^1.0.0-alpha.1",
-    "@nymphjs/client-node": "^1.0.0-alpha.1",
-    "@nymphjs/driver-sqlite3": "^1.0.0-alpha.1",
+    "@nymphjs/client": "^1.0.0-alpha.5",
+    "@nymphjs/client-node": "^1.0.0-alpha.5",
+    "@nymphjs/driver-sqlite3": "^1.0.0-alpha.5",
     "@tsconfig/recommended": "^1.0.1",
     "@types/crypto-js": "^4.0.2",
     "@types/email-templates": "^8.0.4",
@@ -60,5 +60,5 @@
     "ts-jest": "^27.0.5",
     "typescript": "^4.3.5"
   },
-  "gitHead": "ab0d40a9699f3f567bc418a3404609a31b37361a"
+  "gitHead": "fdbe87041444a03a08aac11a6eef2c5f49cfa7d6"
 }

package/src/Group.test.ts

@@ -2,15 +2,9 @@ import { SQLite3Driver } from '@nymphjs/driver-sqlite3';
 import { Nymph } from '@nymphjs/nymph';
 
 import Tilmeld from './Tilmeld';
-import Group from './Group';
 import defaults from './conf/defaults';
 
-const sqliteConfig = {
-  filename: ':memory:',
-};
-
-Nymph.init({}, new SQLite3Driver(sqliteConfig), Tilmeld);
-Tilmeld.init({
+const tilmeld = new Tilmeld({
   appName: 'My App',
   appUrl: 'http://localhost:8080',
   cookieDomain: 'localhost',
@@ -22,6 +16,15 @@ Tilmeld.init({
   cancelChangeRedirect: 'http://localhost:8080',
   jwtSecret: 'shhhhh',
 });
+const _nymph = new Nymph(
+  {},
+  new SQLite3Driver({
+    filename: ':memory:',
+  }),
+  tilmeld
+);
+
+const Group = tilmeld.Group;
 
 describe('Group', () => {
   async function makeNewGroup() {
@@ -34,6 +37,14 @@ describe('Group', () => {
     return newGroup;
   }
 
+  it('new group passes validation', async () => {
+    const validGroup = await makeNewGroup();
+
+    expect(() => {
+      defaults.validatorGroup(validGroup);
+    }).not.toThrow();
+  });
+
   it("doesn't allow unknown keys", async () => {
     const invalidGroup = await makeNewGroup();
 

package/src/Group.ts

@@ -1,4 +1,4 @@
-import Nymph, {
+import {
   EntityData,
   EntityInterface,
   EntityJson,
@@ -10,6 +10,7 @@ import Nymph, {
 import md5 from 'crypto-js/md5';
 import { difference } from 'lodash';
 
+import type Tilmeld from './Tilmeld';
 import AbleObject from './AbleObject';
 import {
   BadDataError,
@@ -17,7 +18,6 @@ import {
   BadUsernameError,
   CouldNotChangeDefaultPrimaryGroupError,
 } from './errors';
-import Tilmeld from './Tilmeld';
 import User, { UserData } from './User';
 
 export type GroupData = {
@@ -72,7 +72,20 @@ export type GroupData = {
   unverifiedSecondary?: boolean;
 };
 
+/**
+ * A user group data model.
+ *
+ * Written by Hunter Perrin for SciActive.
+ *
+ * @author Hunter Perrin <hperrin@gmail.com>
+ * @copyright SciActive Inc
+ * @see http://nymph.io/
+ */
 export default class Group extends AbleObject<GroupData> {
+  /**
+   * The instance of Tilmeld to use for queries.
+   */
+  static tilmeld: Tilmeld;
   static ETYPE = 'tilmeld_group';
   static class = 'Group';
 
@@ -112,7 +125,7 @@ export default class Group extends AbleObject<GroupData> {
   ): Promise<Group & GroupData> {
     const entity = new this();
     if (groupname != null) {
-      const entity = await Nymph.getEntity(
+      const entity = await this.nymph.getEntity(
         {
           class: this,
         },
@@ -154,13 +167,13 @@ export default class Group extends AbleObject<GroupData> {
     options?: Options,
     selectors?: Selector[]
   ) {
-    if (!Tilmeld.gatekeeper('tilmeld/admin')) {
+    if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
       throw new Error("You don't have permission to do that.");
     }
 
     return await this.getAssignableGroups(
-      Tilmeld.config.highestPrimary,
-      { ...options, class: Group, return: 'entity' },
+      this.tilmeld.config.highestPrimary,
+      { ...options, class: this.tilmeld.Group, return: 'entity' },
       [...(selectors ?? [])]
     );
   }
@@ -176,13 +189,13 @@ export default class Group extends AbleObject<GroupData> {
     options?: Options,
     selectors?: Selector[]
   ) {
-    if (!Tilmeld.gatekeeper('tilmeld/admin')) {
+    if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
       throw new Error("You don't have permission to do that.");
     }
 
     return await this.getAssignableGroups(
-      Tilmeld.config.highestSecondary,
-      { ...options, class: Group, return: 'entity' },
+      this.tilmeld.config.highestSecondary,
+      { ...options, class: this.tilmeld.Group, return: 'entity' },
       [...(selectors ?? [])]
     );
   }
@@ -198,8 +211,8 @@ export default class Group extends AbleObject<GroupData> {
       return assignableGroups;
     }
 
-    assignableGroups = await Nymph.getEntities(
-      { ...options, class: Group },
+    assignableGroups = await this.nymph.getEntities(
+      { ...options, class: this.tilmeld.Group },
       ...selectors
     );
     if (highestParent !== true) {
@@ -232,13 +245,14 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public $jsonAcceptData(input: EntityJson, allowConflict = false) {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     this.$referenceWake();
 
     if (
-      input.data.abilities.indexOf('system/admin') !== -1 &&
+      input.data.abilities?.indexOf('system/admin') !== -1 &&
       this.$data.abilities?.indexOf('system/admin') === -1 &&
-      Tilmeld.gatekeeper('tilmeld/admin') &&
-      !Tilmeld.gatekeeper('system/admin')
+      tilmeld.gatekeeper('tilmeld/admin') &&
+      !tilmeld.gatekeeper('system/admin')
     ) {
       throw new BadDataError(
         "You don't have the authority to make this group a system admin."
@@ -249,13 +263,14 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public $jsonAcceptPatch(patch: EntityPatch, allowConflict = false) {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     this.$referenceWake();
 
     if (
-      patch.set.abilities.indexOf('system/admin') !== -1 &&
+      patch.set.abilities?.indexOf('system/admin') !== -1 &&
       this.$data.abilities?.indexOf('system/admin') === -1 &&
-      Tilmeld.gatekeeper('tilmeld/admin') &&
-      !Tilmeld.gatekeeper('system/admin')
+      tilmeld.gatekeeper('tilmeld/admin') &&
+      !tilmeld.gatekeeper('system/admin')
     ) {
       throw new BadDataError(
         "You don't have the authority to make this group a system admin."
@@ -276,12 +291,13 @@ export default class Group extends AbleObject<GroupData> {
    * @param givenUser User to update protection for. If undefined, will use the currently logged in user.
    */
   public $updateDataProtection(givenUser?: User & UserData) {
-    let user = givenUser ?? User.current();
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    let user = givenUser ?? tilmeld.User.current();
 
     this.$privateData = Group.DEFAULT_PRIVATE_DATA;
     this.$allowlistData = Group.DEFAULT_ALLOWLIST_DATA;
 
-    if (Tilmeld.config.emailUsernames) {
+    if (tilmeld.config.emailUsernames) {
       this.$privateData.push('groupname');
     }
 
@@ -310,9 +326,10 @@ export default class Group extends AbleObject<GroupData> {
    * @returns True or false.
    */
   public $isDescendant(givenGroup: (Group & GroupData) | string): boolean {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     let group: Group & GroupData;
     if (typeof givenGroup === 'string') {
-      group = Group.factorySync(givenGroup);
+      group = tilmeld.Group.factorySync(givenGroup);
     } else {
       group = givenGroup;
     }
@@ -338,8 +355,9 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An array of groups.
    */
   public async $getChildren() {
-    return await Nymph.getEntities(
-      { class: Group },
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    return await this.$nymph.getEntities(
+      { class: tilmeld.Group },
       {
         type: '&',
         equal: ['enabled', true],
@@ -357,9 +375,10 @@ export default class Group extends AbleObject<GroupData> {
   public async $getDescendants(
     andSelf = false
   ): Promise<(Group & GroupData)[]> {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     let groups: (Group & GroupData)[] = [];
-    const entities = await Nymph.getEntities(
-      { class: Group },
+    const entities = await this.$nymph.getEntities(
+      { class: tilmeld.Group },
       {
         type: '&',
         equal: ['enabled', true],
@@ -382,12 +401,13 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An array of groups.
    */
   public $getDescendantsSync(andSelf = false): (Group & GroupData)[] {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     let groups: (Group & GroupData)[] = [];
     let entity: EntityInterface | null;
     let offset = 0;
     do {
-      entity = Nymph.driver.getEntitySync(
-        { class: Group, offset },
+      entity = this.$nymph.driver.getEntitySync(
+        { class: tilmeld.Group, offset },
         {
           type: '&',
           equal: ['enabled', true],
@@ -417,7 +437,8 @@ export default class Group extends AbleObject<GroupData> {
    * @returns The level of the group.
    */
   public $getLevel() {
-    let group = Group.factorySync(this.guid ?? undefined);
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    let group = tilmeld.Group.factorySync(this.guid ?? undefined);
     let level = 0;
     while (group.parent != null && group.parent.cdate != null && level < 1024) {
       level++;
@@ -439,13 +460,14 @@ export default class Group extends AbleObject<GroupData> {
     limit?: number,
     offset?: number
   ): Promise<(User & UserData)[]> {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     let groups: (Group & GroupData)[] = [];
     if (descendants) {
       groups = await this.$getDescendants();
     }
-    return await Nymph.getEntities(
+    return await this.$nymph.getEntities(
       {
-        class: User,
+        class: tilmeld.User,
         limit,
         offset,
       },
@@ -480,37 +502,38 @@ export default class Group extends AbleObject<GroupData> {
     result: boolean;
     message: string;
   }> {
-    if (!Tilmeld.config.emailUsernames) {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    if (!tilmeld.config.emailUsernames) {
       if (this.$data.groupname == null || !this.$data.groupname.length) {
         return { result: false, message: 'Please specify a groupname.' };
       }
       if (
-        Tilmeld.config.maxUsernameLength > 0 &&
-        this.$data.groupname.length > Tilmeld.config.maxUsernameLength
+        tilmeld.config.maxUsernameLength > 0 &&
+        this.$data.groupname.length > tilmeld.config.maxUsernameLength
       ) {
         return {
           result: false,
           message:
             'Groupnames must not exceed ' +
-            Tilmeld.config.maxUsernameLength +
+            tilmeld.config.maxUsernameLength +
             ' characters.',
         };
       }
       if (
         difference(
           this.$data.groupname.split(''),
-          Tilmeld.config.validChars.split('')
+          tilmeld.config.validChars.split('')
         ).length
       ) {
         return {
           result: false,
-          message: Tilmeld.config.validCharsNotice,
+          message: tilmeld.config.validCharsNotice,
         };
       }
-      if (!Tilmeld.config.validRegex.test(this.$data.groupname)) {
+      if (!tilmeld.config.validRegex.test(this.$data.groupname)) {
         return {
           result: false,
-          message: Tilmeld.config.validRegexNotice,
+          message: tilmeld.config.validRegexNotice,
         };
       }
 
@@ -524,8 +547,8 @@ export default class Group extends AbleObject<GroupData> {
       if (this.guid != null) {
         selector['!guid'] = this.guid;
       }
-      const test = await Nymph.getEntity(
-        { class: Group, skipAc: true },
+      const test = await this.$nymph.getEntity(
+        { class: tilmeld.Group, skipAc: true },
         selector
       );
       if (test != null) {
@@ -543,14 +566,14 @@ export default class Group extends AbleObject<GroupData> {
         return { result: false, message: 'Please specify an email.' };
       }
       if (
-        Tilmeld.config.maxUsernameLength > 0 &&
-        this.$data.groupname.length > Tilmeld.config.maxUsernameLength
+        tilmeld.config.maxUsernameLength > 0 &&
+        this.$data.groupname.length > tilmeld.config.maxUsernameLength
       ) {
         return {
           result: false,
           message:
             'Emails must not exceed ' +
-            Tilmeld.config.maxUsernameLength +
+            tilmeld.config.maxUsernameLength +
             ' characters.',
         };
       }
@@ -565,16 +588,17 @@ export default class Group extends AbleObject<GroupData> {
    * @returns An object with a boolean 'result' entry and a 'message' entry.
    */
   public async $checkEmail(): Promise<{ result: boolean; message: string }> {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     if (this.$data.email === '') {
       return { result: true, message: '' };
     }
     if (this.$data.email == null) {
       return { result: false, message: 'Please specify a valid email.' };
     }
-    if (!Tilmeld.config.validEmailRegex.test(this.$data.email)) {
+    if (!tilmeld.config.validEmailRegex.test(this.$data.email)) {
       return {
         result: false,
-        message: Tilmeld.config.validEmailRegexNotice,
+        message: tilmeld.config.validEmailRegexNotice,
       };
     }
     const selector: Selector = {
@@ -584,8 +608,8 @@ export default class Group extends AbleObject<GroupData> {
     if (this.guid != null) {
       selector['!guid'] = this.guid;
     }
-    const test = await Nymph.getEntity(
-      { class: Group, skipAc: true },
+    const test = await this.$nymph.getEntity(
+      { class: tilmeld.Group, skipAc: true },
       selector
     );
     if (test != null) {
@@ -603,13 +627,14 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public async $save() {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
     if (this.$data.groupname == null || !this.$data.groupname.trim().length) {
       return false;
     }
 
     // Formatting.
     this.$data.groupname = this.$data.groupname.trim();
-    if (Tilmeld.config.emailUsernames) {
+    if (tilmeld.config.emailUsernames) {
       this.$data.email = this.$data.groupname;
     }
     this.$data.email = (this.$data.email ?? '').trim();
@@ -659,7 +684,7 @@ export default class Group extends AbleObject<GroupData> {
     if (!unCheck.result) {
       throw new BadUsernameError(unCheck.message);
     }
-    if (!Tilmeld.config.emailUsernames) {
+    if (!tilmeld.config.emailUsernames) {
       const emCheck = await this.$checkEmail();
       if (!emCheck.result) {
         throw new BadEmailError(emCheck.message);
@@ -679,15 +704,15 @@ export default class Group extends AbleObject<GroupData> {
     }
 
     try {
-      Tilmeld.config.validatorGroup(this);
+      tilmeld.config.validatorGroup(this);
     } catch (e: any) {
       throw new BadDataError(e?.message);
     }
 
     // Only one default primary group is allowed.
     if (this.$data.defaultPrimary) {
-      const currentPrimary = await Nymph.getEntity(
-        { class: Group },
+      const currentPrimary = await this.$nymph.getEntity(
+        { class: tilmeld.Group },
         { type: '&', truthy: 'defaultPrimary' }
       );
       if (currentPrimary != null && !this.$is(currentPrimary)) {
@@ -721,28 +746,29 @@ export default class Group extends AbleObject<GroupData> {
   }
 
   public async $delete() {
-    if (!Tilmeld.gatekeeper('tilmeld/admin')) {
+    const tilmeld = this.$nymph.tilmeld as Tilmeld;
+    if (!tilmeld.gatekeeper('tilmeld/admin')) {
       throw new BadDataError("You don't have the authority to delete groups.");
     }
 
     const transaction = 'tilmeld-delete-' + this.guid;
-    await Nymph.startTransaction(transaction);
+    const tnymph = await this.$nymph.startTransaction(transaction);
 
     // Delete descendants.
     const descendants = await this.$getDescendants();
     if (descendants.length) {
       for (let curGroup of descendants) {
         if (!(await curGroup.$delete())) {
-          await Nymph.rollback(transaction);
+          await tnymph.rollback(transaction);
           return false;
         }
       }
     }
 
     // Remove users from this primary group.
-    const primaryUsers = await Nymph.getEntities(
+    const primaryUsers = await tnymph.getEntities(
       {
-        class: User,
+        class: tilmeld.User,
         skipAc: true,
       },
       {
@@ -753,15 +779,15 @@ export default class Group extends AbleObject<GroupData> {
     for (let user of primaryUsers) {
       delete user.group;
       if (!(await user.$save())) {
-        await Nymph.rollback(transaction);
+        await tnymph.rollback(transaction);
         return false;
       }
     }
 
     // Remove users from this secondary group.
-    const secondaryUsers = await Nymph.getEntities(
+    const secondaryUsers = await tnymph.getEntities(
       {
-        class: User,
+        class: tilmeld.User,
         skipAc: true,
       },
       {
@@ -772,7 +798,7 @@ export default class Group extends AbleObject<GroupData> {
     for (let user of secondaryUsers) {
       user.$delGroup(this);
       if (!(await user.$save())) {
-        await Nymph.rollback(transaction);
+        await tnymph.rollback(transaction);
         return false;
       }
     }
@@ -780,12 +806,10 @@ export default class Group extends AbleObject<GroupData> {
     // Delete the group.
     const success = await super.$delete();
     if (success) {
-      await Nymph.commit(transaction);
+      await tnymph.commit(transaction);
     } else {
-      await Nymph.rollback(transaction);
+      await tnymph.rollback(transaction);
     }
     return success;
   }
 }
-
-Nymph.setEntityClass(Group.class, Group);