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

package/dist/Group.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,30 +8,23 @@ const lodash_1 = require("lodash");
 const AbleObject_1 = __importDefault(require("./AbleObject"));
 const errors_1 = require("./errors");
 class Group extends AbleObject_1.default {
-    static factory(guid) {
-        const _super = Object.create(null, {
-            factory: { get: () => super.factory }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield _super.factory.call(this, guid));
-        });
+    static async factory(guid) {
+        return (await super.factory(guid));
     }
-    static factoryGroupname(groupname) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entity = new this();
-            if (groupname != null) {
-                const entity = yield this.nymph.getEntity({
-                    class: this,
-                }, {
-                    type: '&',
-                    ilike: ['groupname', groupname.replace(/([\\%_])/g, (s) => `\\${s}`)],
-                });
-                if (entity != null) {
-                    return entity;
-                }
+    static async factoryGroupname(groupname) {
+        const entity = new this();
+        if (groupname != null) {
+            const entity = await this.nymph.getEntity({
+                class: this,
+            }, {
+                type: '&',
+                ilike: ['groupname', groupname.replace(/([\\%_])/g, (s) => `\\${s}`)],
+            });
+            if (entity != null) {
+                return entity;
             }
-            return entity;
-        });
+        }
+        return entity;
     }
     static factorySync(guid) {
         return super.factorySync(guid);
@@ -67,43 +51,37 @@ class Group extends AbleObject_1.default {
             this.$updateDataProtection();
         }
     }
-    static getPrimaryGroups(options, selectors) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
-                throw new Error("You don't have permission to do that.");
-            }
-            return yield this.getAssignableGroups(this.tilmeld.config.highestPrimary, Object.assign(Object.assign({}, options), { class: this.tilmeld.Group, return: 'entity' }), [...(selectors !== null && selectors !== void 0 ? selectors : [])]);
-        });
+    static async getPrimaryGroups(options, selectors) {
+        if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
+            throw new Error("You don't have permission to do that.");
+        }
+        return await this.getAssignableGroups(this.tilmeld.config.highestPrimary, { ...options, class: this.tilmeld.Group, return: 'entity' }, [...(selectors ?? [])]);
     }
-    static getSecondaryGroups(options, selectors) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
-                throw new Error("You don't have permission to do that.");
-            }
-            return yield this.getAssignableGroups(this.tilmeld.config.highestSecondary, Object.assign(Object.assign({}, options), { class: this.tilmeld.Group, return: 'entity' }), [...(selectors !== null && selectors !== void 0 ? selectors : [])]);
-        });
+    static async getSecondaryGroups(options, selectors) {
+        if (!this.tilmeld.gatekeeper('tilmeld/admin')) {
+            throw new Error("You don't have permission to do that.");
+        }
+        return await this.getAssignableGroups(this.tilmeld.config.highestSecondary, { ...options, class: this.tilmeld.Group, return: 'entity' }, [...(selectors ?? [])]);
     }
-    static getAssignableGroups(highestParent, options, selectors) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let assignableGroups = [];
-            if (highestParent === false) {
-                return assignableGroups;
-            }
-            assignableGroups = yield this.nymph.getEntities(Object.assign(Object.assign({}, options), { class: this.tilmeld.Group }), ...selectors);
-            if (highestParent !== true) {
-                assignableGroups = assignableGroups.filter((group) => {
-                    let curGroup = group;
-                    while (curGroup.parent != null && curGroup.parent.cdate != null) {
-                        if (curGroup.parent.guid === highestParent) {
-                            return true;
-                        }
-                        curGroup = curGroup.parent;
-                    }
-                    return false;
-                });
-            }
+    static async getAssignableGroups(highestParent, options, selectors) {
+        let assignableGroups = [];
+        if (highestParent === false) {
             return assignableGroups;
-        });
+        }
+        assignableGroups = await this.nymph.getEntities({ ...options, class: this.tilmeld.Group }, ...selectors);
+        if (highestParent !== true) {
+            assignableGroups = assignableGroups.filter((group) => {
+                let curGroup = group;
+                while (curGroup.parent != null && curGroup.parent.cdate != null) {
+                    if (curGroup.parent.guid === highestParent) {
+                        return true;
+                    }
+                    curGroup = curGroup.parent;
+                }
+                return false;
+            });
+        }
+        return assignableGroups;
     }
     $getAvatar() {
         if (this.$data.avatar != null && this.$data.avatar !== '') {
@@ -117,11 +95,10 @@ class Group extends AbleObject_1.default {
             '?d=identicon&s=40');
     }
     $jsonAcceptData(input, allowConflict = false) {
-        var _a, _b;
         const tilmeld = this.$nymph.tilmeld;
         this.$referenceWake();
-        if (((_a = input.data.abilities) === null || _a === void 0 ? void 0 : _a.indexOf('system/admin')) !== -1 &&
-            ((_b = this.$data.abilities) === null || _b === void 0 ? void 0 : _b.indexOf('system/admin')) === -1 &&
+        if (input.data.abilities?.indexOf('system/admin') !== -1 &&
+            this.$data.abilities?.indexOf('system/admin') === -1 &&
             tilmeld.gatekeeper('tilmeld/admin') &&
             !tilmeld.gatekeeper('system/admin')) {
             throw new errors_1.BadDataError("You don't have the authority to make this group a system admin.");
@@ -129,11 +106,10 @@ class Group extends AbleObject_1.default {
         super.$jsonAcceptData(input, allowConflict);
     }
     $jsonAcceptPatch(patch, allowConflict = false) {
-        var _a, _b;
         const tilmeld = this.$nymph.tilmeld;
         this.$referenceWake();
-        if (((_a = patch.set.abilities) === null || _a === void 0 ? void 0 : _a.indexOf('system/admin')) !== -1 &&
-            ((_b = this.$data.abilities) === null || _b === void 0 ? void 0 : _b.indexOf('system/admin')) === -1 &&
+        if (patch.set.abilities?.indexOf('system/admin') !== -1 &&
+            this.$data.abilities?.indexOf('system/admin') === -1 &&
             tilmeld.gatekeeper('tilmeld/admin') &&
             !tilmeld.gatekeeper('system/admin')) {
             throw new errors_1.BadDataError("You don't have the authority to make this group a system admin.");
@@ -145,17 +121,16 @@ class Group extends AbleObject_1.default {
         this.$updateDataProtection();
     }
     $updateDataProtection(givenUser) {
-        var _a, _b, _c, _d;
         const tilmeld = this.$nymph.tilmeld;
-        let user = givenUser !== null && givenUser !== void 0 ? givenUser : tilmeld.User.current();
+        let user = givenUser ?? tilmeld.User.current();
         this.$privateData = [...Group.DEFAULT_PRIVATE_DATA];
         this.$allowlistData = [...Group.DEFAULT_ALLOWLIST_DATA];
         if (tilmeld.config.emailUsernames) {
             this.$privateData.push('groupname');
         }
         if (user != null &&
-            (((_b = (_a = user.abilities) === null || _a === void 0 ? void 0 : _a.indexOf('tilmeld/admin')) !== null && _b !== void 0 ? _b : -1) !== -1 ||
-                ((_d = (_c = user.abilities) === null || _c === void 0 ? void 0 : _c.indexOf('system/admin')) !== null && _d !== void 0 ? _d : -1) !== -1)) {
+            ((user.abilities?.indexOf('tilmeld/admin') ?? -1) !== -1 ||
+                (user.abilities?.indexOf('system/admin') ?? -1) !== -1)) {
             this.$privateData = [];
             this.$allowlistData = undefined;
         }
@@ -188,33 +163,29 @@ class Group extends AbleObject_1.default {
         }
         return false;
     }
-    $getChildren() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tilmeld = this.$nymph.tilmeld;
-            return yield this.$nymph.getEntities({ class: tilmeld.Group }, {
-                type: '&',
-                equal: ['enabled', true],
-                ref: ['parent', this],
-            });
+    async $getChildren() {
+        const tilmeld = this.$nymph.tilmeld;
+        return await this.$nymph.getEntities({ class: tilmeld.Group }, {
+            type: '&',
+            equal: ['enabled', true],
+            ref: ['parent', this],
         });
     }
-    $getDescendants(andSelf = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tilmeld = this.$nymph.tilmeld;
-            let groups = [];
-            const entities = yield this.$nymph.getEntities({ class: tilmeld.Group }, {
-                type: '&',
-                equal: ['enabled', true],
-                ref: ['parent', this],
-            });
-            for (let entity of entities) {
-                groups = (yield entity.$getDescendants(true)).concat(groups);
-            }
-            if (andSelf) {
-                groups.push(this);
-            }
-            return groups;
+    async $getDescendants(andSelf = false) {
+        const tilmeld = this.$nymph.tilmeld;
+        let groups = [];
+        const entities = await this.$nymph.getEntities({ class: tilmeld.Group }, {
+            type: '&',
+            equal: ['enabled', true],
+            ref: ['parent', this],
         });
+        for (let entity of entities) {
+            groups = (await entity.$getDescendants(true)).concat(groups);
+        }
+        if (andSelf) {
+            groups.push(this);
+        }
+        return groups;
     }
     $getDescendantsSync(andSelf = false) {
         const tilmeld = this.$nymph.tilmeld;
@@ -238,9 +209,8 @@ class Group extends AbleObject_1.default {
         return groups;
     }
     $getLevel() {
-        var _a;
         const tilmeld = this.$nymph.tilmeld;
-        let group = tilmeld.Group.factorySync((_a = this.guid) !== null && _a !== void 0 ? _a : undefined);
+        let group = tilmeld.Group.factorySync(this.guid ?? undefined);
         let level = 0;
         while (group.parent != null && group.parent.cdate != null && level < 1024) {
             level++;
@@ -248,228 +218,214 @@ class Group extends AbleObject_1.default {
         }
         return level;
     }
-    $getUsers(descendants = false, limit, offset) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tilmeld = this.$nymph.tilmeld;
-            let groups = [];
-            if (descendants) {
-                groups = yield this.$getDescendants();
-            }
-            return yield this.$nymph.getEntities({
-                class: tilmeld.User,
-                limit,
-                offset,
-            }, {
-                type: '&',
-                equal: ['enabled', true],
-            }, {
-                type: '|',
-                ref: [
-                    ['group', this],
-                    ['groups', this],
-                    ...groups.map((group) => [
-                        'group',
-                        group,
-                    ]),
-                    ...groups.map((group) => [
-                        'groups',
-                        group,
-                    ]),
-                ],
-            });
+    async $getUsers(descendants = false, limit, offset) {
+        const tilmeld = this.$nymph.tilmeld;
+        let groups = [];
+        if (descendants) {
+            groups = await this.$getDescendants();
+        }
+        return await this.$nymph.getEntities({
+            class: tilmeld.User,
+            limit,
+            offset,
+        }, {
+            type: '&',
+            equal: ['enabled', true],
+        }, {
+            type: '|',
+            ref: [
+                ['group', this],
+                ['groups', this],
+                ...groups.map((group) => [
+                    'group',
+                    group,
+                ]),
+                ...groups.map((group) => [
+                    'groups',
+                    group,
+                ]),
+            ],
         });
     }
-    $checkGroupname() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tilmeld = this.$nymph.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) {
-                    return {
-                        result: false,
-                        message: 'Groupnames must not exceed ' +
-                            tilmeld.config.maxUsernameLength +
-                            ' characters.',
-                    };
-                }
-                if ((0, lodash_1.difference)(this.$data.groupname.split(''), tilmeld.config.validChars.split('')).length) {
-                    return {
-                        result: false,
-                        message: tilmeld.config.validCharsNotice,
-                    };
-                }
-                if (!tilmeld.config.validRegex.test(this.$data.groupname)) {
-                    return {
-                        result: false,
-                        message: tilmeld.config.validRegexNotice,
-                    };
-                }
-                const selector = {
-                    type: '&',
-                    ilike: [
-                        'groupname',
-                        this.$data.groupname.replace(/([\\%_])/g, (s) => `\\${s}`),
-                    ],
-                };
-                if (this.guid != null) {
-                    selector['!guid'] = this.guid;
-                }
-                const test = yield this.$nymph.getEntity({ class: tilmeld.Group, skipAc: true }, selector);
-                if (test != null) {
-                    return { result: false, message: 'That groupname is taken.' };
-                }
+    async $checkGroupname() {
+        const tilmeld = this.$nymph.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) {
                 return {
-                    result: true,
-                    message: this.guid != null ? 'Groupname is valid.' : 'Groupname is available!',
+                    result: false,
+                    message: 'Groupnames must not exceed ' +
+                        tilmeld.config.maxUsernameLength +
+                        ' characters.',
                 };
             }
-            else {
-                this.$data.email = this.$data.groupname;
-                if (this.$data.groupname == null || !this.$data.groupname.length) {
-                    return { result: false, message: 'Please specify an email.' };
-                }
-                if (tilmeld.config.maxUsernameLength > 0 &&
-                    this.$data.groupname.length > tilmeld.config.maxUsernameLength) {
-                    return {
-                        result: false,
-                        message: 'Emails must not exceed ' +
-                            tilmeld.config.maxUsernameLength +
-                            ' characters.',
-                    };
-                }
-                return yield this.$checkEmail();
-            }
-        });
-    }
-    $checkEmail() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tilmeld = this.$nymph.tilmeld;
-            if (this.$data.email === '') {
-                return { result: true, message: '' };
-            }
-            if (this.$data.email == null) {
-                return { result: false, message: 'Please specify a valid email.' };
+            if ((0, lodash_1.difference)(this.$data.groupname.split(''), tilmeld.config.validChars.split('')).length) {
+                return {
+                    result: false,
+                    message: tilmeld.config.validCharsNotice,
+                };
             }
-            if (!tilmeld.config.validEmailRegex.test(this.$data.email)) {
+            if (!tilmeld.config.validRegex.test(this.$data.groupname)) {
                 return {
                     result: false,
-                    message: tilmeld.config.validEmailRegexNotice,
+                    message: tilmeld.config.validRegexNotice,
                 };
             }
             const selector = {
                 type: '&',
-                ilike: ['email', this.$data.email.replace(/([\\%_])/g, (s) => `\\${s}`)],
+                ilike: [
+                    'groupname',
+                    this.$data.groupname.replace(/([\\%_])/g, (s) => `\\${s}`),
+                ],
             };
             if (this.guid != null) {
                 selector['!guid'] = this.guid;
             }
-            const test = yield this.$nymph.getEntity({ class: tilmeld.Group, skipAc: true }, selector);
+            const test = await this.$nymph.getEntity({ class: tilmeld.Group, skipAc: true }, selector);
             if (test != null) {
+                return { result: false, message: 'That groupname is taken.' };
+            }
+            return {
+                result: true,
+                message: this.guid != null ? 'Groupname is valid.' : 'Groupname is available!',
+            };
+        }
+        else {
+            this.$data.email = this.$data.groupname;
+            if (this.$data.groupname == null || !this.$data.groupname.length) {
+                return { result: false, message: 'Please specify an email.' };
+            }
+            if (tilmeld.config.maxUsernameLength > 0 &&
+                this.$data.groupname.length > tilmeld.config.maxUsernameLength) {
                 return {
                     result: false,
-                    message: 'That email address is already registered.',
+                    message: 'Emails must not exceed ' +
+                        tilmeld.config.maxUsernameLength +
+                        ' characters.',
                 };
             }
+            return await this.$checkEmail();
+        }
+    }
+    async $checkEmail() {
+        const tilmeld = this.$nymph.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)) {
             return {
-                result: true,
-                message: this.guid != null ? 'Email is valid.' : 'Email address is valid!',
+                result: false,
+                message: tilmeld.config.validEmailRegexNotice,
             };
-        });
+        }
+        const selector = {
+            type: '&',
+            ilike: ['email', this.$data.email.replace(/([\\%_])/g, (s) => `\\${s}`)],
+        };
+        if (this.guid != null) {
+            selector['!guid'] = this.guid;
+        }
+        const test = await this.$nymph.getEntity({ class: tilmeld.Group, skipAc: true }, selector);
+        if (test != null) {
+            return {
+                result: false,
+                message: 'That email address is already registered.',
+            };
+        }
+        return {
+            result: true,
+            message: this.guid != null ? 'Email is valid.' : 'Email address is valid!',
+        };
     }
-    $save() {
-        const _super = Object.create(null, {
-            $save: { get: () => super.$save }
-        });
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            const tilmeld = this.$nymph.tilmeld;
-            if (this.$data.groupname == null || !this.$data.groupname.trim().length) {
-                return false;
-            }
-            this.$data.groupname = this.$data.groupname.trim();
-            if (tilmeld.config.emailUsernames) {
-                this.$data.email = this.$data.groupname;
-            }
-            this.$data.email = ((_a = this.$data.email) !== null && _a !== void 0 ? _a : '').trim();
-            this.$data.name = ((_b = this.$data.name) !== null && _b !== void 0 ? _b : '').trim();
-            this.$data.phone = ((_c = this.$data.phone) !== null && _c !== void 0 ? _c : '').trim();
-            this.$data.enabled = !!this.$data.enabled;
-            if (this.$data.name === '') {
-                delete this.$data.name;
-            }
-            if (this.$data.email === '') {
-                delete this.$data.email;
-            }
-            if (this.$data.avatar === '') {
-                delete this.$data.avatar;
-            }
-            if (this.$data.phone === '') {
-                delete this.$data.phone;
-            }
-            if (this.$data.parent == null) {
-                delete this.$data.parent;
-            }
-            if (this.$data.user == null) {
-                delete this.$data.user;
-            }
-            if (!this.$data.defaultPrimary) {
-                delete this.$data.defaultPrimary;
-            }
-            if (!this.$data.defaultSecondary) {
-                delete this.$data.defaultSecondary;
-            }
-            if (!this.$data.unverifiedSecondary) {
-                delete this.$data.unverifiedSecondary;
-            }
-            this.$data.abilities = (0, lodash_1.difference)((_d = this.$data.abilities) !== null && _d !== void 0 ? _d : [], [
-                'system/admin',
-                'tilmeld/admin',
-                null,
-                undefined,
-            ]);
-            const unCheck = yield this.$checkGroupname();
-            if (!unCheck.result) {
-                throw new errors_1.BadUsernameError(unCheck.message);
-            }
-            if (!tilmeld.config.emailUsernames) {
-                const emCheck = yield this.$checkEmail();
-                if (!emCheck.result) {
-                    throw new errors_1.BadEmailError(emCheck.message);
-                }
-            }
-            if (this.$data.parent &&
-                (this.$data.parent.cdate == null ||
-                    this.$is(this.$data.parent) ||
-                    this.$data.parent.$isDescendant(this))) {
-                throw new errors_1.BadDataError("Group parent can't be itself or descendant of itself.");
-            }
-            try {
-                tilmeld.config.validatorGroup(this);
-            }
-            catch (e) {
-                throw new errors_1.BadDataError(e === null || e === void 0 ? void 0 : e.message);
+    async $save() {
+        const tilmeld = this.$nymph.tilmeld;
+        if (this.$data.groupname == null || !this.$data.groupname.trim().length) {
+            return false;
+        }
+        this.$data.groupname = this.$data.groupname.trim();
+        if (tilmeld.config.emailUsernames) {
+            this.$data.email = this.$data.groupname;
+        }
+        this.$data.email = (this.$data.email ?? '').trim();
+        this.$data.name = (this.$data.name ?? '').trim();
+        this.$data.phone = (this.$data.phone ?? '').trim();
+        this.$data.enabled = !!this.$data.enabled;
+        if (this.$data.name === '') {
+            delete this.$data.name;
+        }
+        if (this.$data.email === '') {
+            delete this.$data.email;
+        }
+        if (this.$data.avatar === '') {
+            delete this.$data.avatar;
+        }
+        if (this.$data.phone === '') {
+            delete this.$data.phone;
+        }
+        if (this.$data.parent == null) {
+            delete this.$data.parent;
+        }
+        if (this.$data.user == null) {
+            delete this.$data.user;
+        }
+        if (!this.$data.defaultPrimary) {
+            delete this.$data.defaultPrimary;
+        }
+        if (!this.$data.defaultSecondary) {
+            delete this.$data.defaultSecondary;
+        }
+        if (!this.$data.unverifiedSecondary) {
+            delete this.$data.unverifiedSecondary;
+        }
+        this.$data.abilities = (0, lodash_1.difference)(this.$data.abilities ?? [], [
+            'system/admin',
+            'tilmeld/admin',
+            null,
+            undefined,
+        ]);
+        const unCheck = await this.$checkGroupname();
+        if (!unCheck.result) {
+            throw new errors_1.BadUsernameError(unCheck.message);
+        }
+        if (!tilmeld.config.emailUsernames) {
+            const emCheck = await this.$checkEmail();
+            if (!emCheck.result) {
+                throw new errors_1.BadEmailError(emCheck.message);
             }
-            if (this.$data.defaultPrimary) {
-                const currentPrimary = yield this.$nymph.getEntity({ class: tilmeld.Group }, { type: '&', truthy: 'defaultPrimary' });
-                if (currentPrimary != null && !this.$is(currentPrimary)) {
-                    currentPrimary.defaultPrimary = false;
-                    if (!(yield currentPrimary.$save())) {
-                        throw new errors_1.CouldNotChangeDefaultPrimaryGroupError('Could not change new user primary group from ' +
-                            `${currentPrimary.groupname}.`);
-                    }
+        }
+        if (this.$data.parent &&
+            (this.$data.parent.cdate == null ||
+                this.$is(this.$data.parent) ||
+                this.$data.parent.$isDescendant(this))) {
+            throw new errors_1.BadDataError("Group parent can't be itself or descendant of itself.");
+        }
+        try {
+            tilmeld.config.validatorGroup(this);
+        }
+        catch (e) {
+            throw new errors_1.BadDataError(e?.message);
+        }
+        if (this.$data.defaultPrimary) {
+            const currentPrimary = await this.$nymph.getEntity({ class: tilmeld.Group }, { type: '&', truthy: 'defaultPrimary' });
+            if (currentPrimary != null && !this.$is(currentPrimary)) {
+                currentPrimary.defaultPrimary = false;
+                if (!(await currentPrimary.$save())) {
+                    throw new errors_1.CouldNotChangeDefaultPrimaryGroupError('Could not change new user primary group from ' +
+                        `${currentPrimary.groupname}.`);
                 }
             }
-            return yield _super.$save.call(this);
-        });
+        }
+        return await super.$save();
     }
-    $saveSkipAC() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$skipAcWhenSaving = true;
-            return yield this.$save();
-        });
+    async $saveSkipAC() {
+        this.$skipAcWhenSaving = true;
+        return await this.$save();
     }
     $tilmeldSaveSkipAC() {
         if (this.$skipAcWhenSaving) {
@@ -478,69 +434,64 @@ class Group extends AbleObject_1.default {
         }
         return false;
     }
-    $delete() {
-        const _super = Object.create(null, {
-            $delete: { get: () => super.$delete }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            let tilmeld = this.$nymph.tilmeld;
-            if (!tilmeld.gatekeeper('tilmeld/admin')) {
-                throw new errors_1.BadDataError("You don't have the authority to delete groups.");
-            }
-            const transaction = 'tilmeld-delete-' + this.guid;
-            const nymph = this.$nymph;
-            const tnymph = yield nymph.startTransaction(transaction);
-            this.$nymph = tnymph;
-            tilmeld = this.$nymph.tilmeld;
-            const descendants = yield this.$getDescendants();
-            if (descendants.length) {
-                for (let curGroup of descendants) {
-                    if (!(yield curGroup.$delete())) {
-                        yield tnymph.rollback(transaction);
-                        this.$nymph = nymph;
-                        return false;
-                    }
-                }
-            }
-            const primaryUsers = yield tnymph.getEntities({
-                class: tilmeld.User,
-                skipAc: true,
-            }, {
-                type: '&',
-                ref: ['group', this],
-            });
-            for (let user of primaryUsers) {
-                delete user.group;
-                if (!(yield user.$save())) {
-                    yield tnymph.rollback(transaction);
+    async $delete() {
+        let tilmeld = this.$nymph.tilmeld;
+        if (!tilmeld.gatekeeper('tilmeld/admin')) {
+            throw new errors_1.BadDataError("You don't have the authority to delete groups.");
+        }
+        const transaction = 'tilmeld-delete-' + this.guid;
+        const nymph = this.$nymph;
+        const tnymph = await nymph.startTransaction(transaction);
+        this.$nymph = tnymph;
+        tilmeld = this.$nymph.tilmeld;
+        const descendants = await this.$getDescendants();
+        if (descendants.length) {
+            for (let curGroup of descendants) {
+                if (!(await curGroup.$delete())) {
+                    await tnymph.rollback(transaction);
                     this.$nymph = nymph;
                     return false;
                 }
             }
-            const secondaryUsers = yield tnymph.getEntities({
-                class: tilmeld.User,
-                skipAc: true,
-            }, {
-                type: '&',
-                ref: ['groups', this],
-            });
-            for (let user of secondaryUsers) {
-                user.$delGroup(this);
-                if (!(yield user.$save())) {
-                    yield tnymph.rollback(transaction);
-                    return false;
-                }
-            }
-            const success = yield _super.$delete.call(this);
-            if (success) {
-                yield tnymph.commit(transaction);
-            }
-            else {
-                yield tnymph.rollback(transaction);
+        }
+        const primaryUsers = await tnymph.getEntities({
+            class: tilmeld.User,
+            skipAc: true,
+        }, {
+            type: '&',
+            ref: ['group', this],
+        });
+        for (let user of primaryUsers) {
+            delete user.group;
+            if (!(await user.$save())) {
+                await tnymph.rollback(transaction);
+                this.$nymph = nymph;
+                return false;
             }
-            this.$nymph = nymph;
-            return success;
+        }
+        const secondaryUsers = await tnymph.getEntities({
+            class: tilmeld.User,
+            skipAc: true,
+        }, {
+            type: '&',
+            ref: ['groups', this],
         });
+        for (let user of secondaryUsers) {
+            user.$delGroup(this);
+            if (!(await user.$save())) {
+                await tnymph.rollback(transaction);
+                return false;
+            }
+        }
+        const success = await super.$delete();
+        if (success) {
+            await tnymph.commit(transaction);
+        }
+        else {
+            await tnymph.rollback(transaction);
+        }
+        this.$nymph = nymph;
+        return success;
     }
 }
 exports.default = Group;