@nymphjs/tilmeld 1.0.0-beta.6 → 1.0.0-beta.61

package/dist/User.js

@@ -3,18 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const guid_1 = require("@nymphjs/guid");
 const strtotime_1 = __importDefault(require("locutus/php/datetime/strtotime"));
 const enc_base64_1 = __importDefault(require("crypto-js/enc-base64"));
 const sha256_1 = __importDefault(require("crypto-js/sha256"));
 const md5_1 = __importDefault(require("crypto-js/md5"));
 const lodash_1 = require("lodash");
-const guid_1 = require("@nymphjs/guid");
+const otpauth_1 = require("otpauth");
+const qrcode_1 = require("qrcode");
+const enforceTilmeld_1 = require("./enforceTilmeld");
 const AbleObject_1 = __importDefault(require("./AbleObject"));
 const errors_1 = require("./errors");
+/**
+ * A user data model.
+ *
+ * Written by Hunter Perrin for SciActive.
+ *
+ * @author Hunter Perrin <hperrin@gmail.com>
+ * @copyright SciActive Inc
+ * @see http://nymph.io/
+ */
 class User extends AbleObject_1.default {
-    static async factory(guid) {
-        return (await super.factory(guid));
-    }
     static async factoryUsername(username) {
         const entity = new this();
         if (username != null) {
@@ -30,32 +39,39 @@ class User extends AbleObject_1.default {
         }
         return entity;
     }
-    static factorySync(guid) {
-        return super.factorySync(guid);
-    }
-    constructor(guid) {
-        super(guid);
+    constructor() {
+        super();
         this.$clientEnabledMethods = [...User.DEFAULT_CLIENT_ENABLED_METHODS];
         this.$privateData = [...User.DEFAULT_PRIVATE_DATA];
         this.$allowlistData = [...User.DEFAULT_ALLOWLIST_DATA];
         this.$allowlistTags = [];
+        /**
+         * This is explicitly used only during the registration proccess.
+         */
         this.$skipAcWhenSaving = false;
-        if (this.guid == null) {
-            this.$data.enabled = true;
-            this.$data.abilities = [];
-            this.$data.groups = [];
-            this.$data.inheritAbilities = true;
-            this.$updateDataProtection();
-        }
+        // Defaults.
+        this.$data.enabled = true;
+        this.$data.abilities = [];
+        this.$data.groups = [];
+        this.$data.inheritAbilities = true;
+        this.$updateDataProtection();
     }
     static current(returnObjectIfNotExist) {
-        if (this.tilmeld.currentUser == null) {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        if (tilmeld.currentUser == null) {
             return returnObjectIfNotExist ? this.factorySync() : null;
         }
-        return this.tilmeld.currentUser;
+        return tilmeld.currentUser;
     }
+    /**
+     * Send an account recovery link.
+     *
+     * @param data The input data from the client.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     static async sendRecovery(data) {
-        if (!this.tilmeld.config.pwRecovery) {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        if (!tilmeld.config.pwRecovery) {
             return {
                 result: false,
                 message: 'Account recovery is not allowed.',
@@ -63,9 +79,9 @@ class User extends AbleObject_1.default {
         }
         let user;
         const options = {};
-        if (!this.tilmeld.config.emailUsernames &&
-            data.recoveryType === 'username') {
-            const getUser = await this.nymph.getEntity({ class: this.tilmeld.User, skipAc: true }, {
+        if (!tilmeld.config.emailUsernames && data.recoveryType === 'username') {
+            // Create a username recovery email.
+            const getUser = await this.nymph.getEntity({ class: tilmeld.User, skipAc: true }, {
                 type: '&',
                 ilike: ['email', data.account.replace(/([\\%_])/g, (s) => `\\${s}`)],
             });
@@ -75,6 +91,7 @@ class User extends AbleObject_1.default {
                     message: 'Requested account is not accessible.',
                 };
             }
+            // Send the recovery email.
             user = getUser;
             options.template = 'RecoverUsername';
             options.message = {
@@ -86,18 +103,21 @@ class User extends AbleObject_1.default {
             options.locals = {};
         }
         else if (data.recoveryType === 'password') {
-            const getUser = await this.tilmeld.User.factoryUsername(data.account);
+            // Create a password recovery email.
+            const getUser = await tilmeld.User.factoryUsername(data.account);
             if (getUser.guid == null) {
                 return {
                     result: false,
                     message: 'Requested account is not accessible.',
                 };
             }
+            // Create a unique secret.
             getUser.recoverSecret = (0, guid_1.humanSecret)();
             getUser.recoverSecretDate = Date.now();
             if (!(await getUser.$saveSkipAC())) {
                 return { result: false, message: "Couldn't save recovery secret." };
             }
+            // Send the recovery email.
             user = getUser;
             options.template = 'RecoverPassword';
             options.message = {
@@ -108,13 +128,15 @@ class User extends AbleObject_1.default {
             };
             options.locals = {
                 recoverCode: getUser.recoverSecret,
-                timeLimit: this.tilmeld.config.pwRecoveryTimeLimit,
+                timeLimit: tilmeld.config.pwRecoveryTimeLimit,
             };
         }
         else {
             return { result: false, message: 'Invalid recovery type.' };
         }
-        if (await this.tilmeld.config.sendEmail(this.tilmeld, options, user)) {
+        this.nymph.config.debugLog('tilmeld', `User account recovery (${options.template}) request for "${user.username}".`);
+        // Send the email.
+        if (await tilmeld.config.sendEmail(tilmeld, options, user)) {
             return {
                 result: true,
                 message: "We've sent an email to your registered address. Please " +
@@ -125,18 +147,25 @@ class User extends AbleObject_1.default {
             return { result: false, message: "Couldn't send recovery email." };
         }
     }
+    /**
+     * Recover account details.
+     *
+     * @param data The input data from the client.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     static async recover(data) {
-        if (!this.tilmeld.config.pwRecovery) {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        if (!tilmeld.config.pwRecovery) {
             return {
                 result: false,
                 message: 'Account recovery is not allowed.',
             };
         }
-        const user = await this.tilmeld.User.factoryUsername(data.username);
+        const user = await tilmeld.User.factoryUsername(data.username);
         if (user.guid == null ||
             user.recoverSecret == null ||
             data.secret !== user.recoverSecret ||
-            (0, strtotime_1.default)('+' + this.tilmeld.config.pwRecoveryTimeLimit, Math.floor((user.recoverSecretDate ?? 0) / 1000)) *
+            (0, strtotime_1.default)('+' + tilmeld.config.pwRecoveryTimeLimit, Math.floor((user.recoverSecretDate ?? 0) / 1000)) *
                 1000 <
                 Date.now()) {
             return {
@@ -147,6 +176,7 @@ class User extends AbleObject_1.default {
         if (!('password' in data) || !data.password.length) {
             return { result: false, message: 'Password cannot be empty.' };
         }
+        this.nymph.config.debugLog('tilmeld', `User account recovery for "${user.username}".`);
         user.$password(data.password);
         delete user.recoverSecret;
         delete user.recoverSecretDate;
@@ -161,22 +191,24 @@ class User extends AbleObject_1.default {
         }
     }
     static getClientConfig() {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         return {
-            regFields: this.tilmeld.config.regFields,
-            userFields: this.tilmeld.config.userFields,
-            emailUsernames: this.tilmeld.config.emailUsernames,
-            allowRegistration: this.tilmeld.config.allowRegistration,
-            allowUsernameChange: this.tilmeld.config.allowUsernameChange,
-            pwRecovery: this.tilmeld.config.pwRecovery,
-            verifyEmail: this.tilmeld.config.verifyEmail,
-            unverifiedAccess: this.tilmeld.config.unverifiedAccess,
+            regFields: tilmeld.config.regFields,
+            userFields: tilmeld.config.userFields,
+            emailUsernames: tilmeld.config.emailUsernames,
+            allowRegistration: tilmeld.config.allowRegistration,
+            allowUsernameChange: tilmeld.config.allowUsernameChange,
+            pwRecovery: tilmeld.config.pwRecovery,
+            verifyEmail: tilmeld.config.verifyEmail,
+            unverifiedAccess: tilmeld.config.unverifiedAccess,
         };
     }
     static async loginUser(data) {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (!('username' in data) || !data.username.length) {
             return { result: false, message: 'Incorrect login/password.' };
         }
-        const user = await this.tilmeld.User.factoryUsername(data.username);
+        const user = await tilmeld.User.factoryUsername(data.username);
         const result = await user.$login(data);
         if (result.result) {
             user.$updateDataProtection();
@@ -185,19 +217,33 @@ class User extends AbleObject_1.default {
         return result;
     }
     async $login(data) {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (this.guid == null) {
             return { result: false, message: 'Incorrect login/password.' };
         }
         if (!this.$data.enabled) {
             return { result: false, message: 'This user is disabled.' };
         }
-        if (this.$gatekeeper()) {
+        if (await this.$gatekeeper()) {
             return { result: true, message: 'You are already logged in.' };
         }
         if (!this.$checkPassword(data.password)) {
             return { result: false, message: 'Incorrect login/password.' };
         }
+        if (this.$data.totpSecret != null) {
+            if (data.code == null ||
+                typeof data.code !== 'string' ||
+                data.code.length !== 6) {
+                return {
+                    result: false,
+                    needTOTP: true,
+                    message: 'You need to provide a 2FA code.',
+                };
+            }
+            if (!this.$checkTOTPCode(data.code)) {
+                return { result: false, message: 'Incorrect 2FA code.' };
+            }
+        }
         try {
             for (let callback of this.constructor
                 .beforeLoginCallbacks) {
@@ -212,7 +258,67 @@ class User extends AbleObject_1.default {
                 message: e.message,
             };
         }
-        if (!tilmeld.login(this, true)) {
+        this.$nymph.config.debugLog('tilmeld', `User login for "${this.$data.username}".`);
+        // Authentication was successful, attempt to login.
+        if (!(await tilmeld.login(this, true))) {
+            return { result: false, message: 'Incorrect login/password.' };
+        }
+        for (let callback of this.constructor
+            .afterLoginCallbacks) {
+            if (callback) {
+                await callback(this);
+            }
+        }
+        // Login was successful.
+        return { result: true, message: 'You are logged in.' };
+    }
+    async $switchUser(data) {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        if (this.guid == null) {
+            return { result: false, message: 'Incorrect login/password.' };
+        }
+        let user = tilmeld.User.current();
+        if (!user || user.guid == null) {
+            return { result: false, message: "You're not logged in." };
+        }
+        const isCurrentUser = user != null && user.$is(this);
+        if (isCurrentUser) {
+            return { result: false, message: "You can't switch to yourself." };
+        }
+        const toAbilities = this.$data.abilities || [];
+        const fromAbilities = user.abilities || [];
+        if (!fromAbilities.includes('tilmeld/switch') &&
+            !fromAbilities.includes('system/admin')) {
+            return {
+                result: false,
+                message: "You don't have permission to switch users.",
+            };
+        }
+        if (toAbilities.includes('system/admin') ||
+            toAbilities.includes('tilmeld/admin')) {
+            return { result: false, message: "You can't switch to an admin." };
+        }
+        try {
+            for (let callback of this.constructor
+                .beforeLoginCallbacks) {
+                if (callback) {
+                    await callback(this, {
+                        username: this.$data.username || '',
+                        password: '',
+                        ...(data || {}),
+                    });
+                }
+            }
+        }
+        catch (e) {
+            return {
+                result: false,
+                message: e.message,
+            };
+        }
+        this.$nymph.config.debugLog('tilmeld', `User login switch for "${user.username}" to "${this.$data.username}".`);
+        // Authentication was successful, attempt to login.
+        if (!(await tilmeld.loginSwitch(this, true))) {
             return { result: false, message: 'Incorrect login/password.' };
         }
         for (let callback of this.constructor
@@ -221,10 +327,15 @@ class User extends AbleObject_1.default {
                 await callback(this);
             }
         }
+        // Login was successful.
         return { result: true, message: 'You are logged in.' };
     }
+    /**
+     * Log a user out of the system.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     async $logout() {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         try {
             for (let callback of this.constructor
                 .beforeLogoutCallbacks) {
@@ -239,7 +350,8 @@ class User extends AbleObject_1.default {
                 message: e.message,
             };
         }
-        tilmeld.logout();
+        this.$nymph.config.debugLog('tilmeld', `User logout for "${this.$data.username}".`);
+        await tilmeld.logout();
         for (let callback of this.constructor
             .afterLogoutCallbacks) {
             if (callback) {
@@ -259,52 +371,87 @@ class User extends AbleObject_1.default {
             (0, md5_1.default)(this.$data.email.trim().toLowerCase()).toString() +
             '?d=identicon&s=40');
     }
+    $getGid() {
+        if (this.$data.group) {
+            return this.$data.group.guid;
+        }
+        return null;
+    }
+    $getGids() {
+        if (this.$data.groups) {
+            return this.$data.groups
+                .map((group) => group.guid)
+                .filter((guid) => guid != null);
+        }
+        return null;
+    }
+    /**
+     * Get the user's group descendants.
+     */
     async $getDescendantGroups() {
         if (this.$descendantGroups == null) {
             this.$descendantGroups = [];
             if (this.$data.group != null) {
+                await this.$data.group.$wake();
                 this.$descendantGroups = await this.$data.group.$getDescendants();
             }
+            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());
             }
         }
         return this.$descendantGroups;
     }
-    $getDescendantGroupsSync() {
-        if (this.$descendantGroups == null) {
-            this.$descendantGroups = [];
-            if (this.$data.group != null) {
-                this.$descendantGroups = this.$data.group.$getDescendantsSync();
-            }
-            for (let curGroup of this.$data.groups ?? []) {
-                this.$descendantGroups = this.$descendantGroups?.concat(curGroup.$getDescendantsSync());
-            }
-        }
-        return this.$descendantGroups;
-    }
     $jsonAcceptData(input, allowConflict = false) {
-        const tilmeld = this.$nymph.tilmeld;
-        this.$referenceWake();
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        this.$check();
+        if ('abilities' in input.data &&
+            input.data.abilities?.includes('system/admin') !==
+                this.$data.abilities?.includes('system/admin') &&
+            (!tilmeld.currentUser ||
+                !tilmeld.currentUser.abilities?.includes('system/admin'))) {
+            throw new errors_1.BadDataError("You don't have the authority to grant or revoke system/admin.");
+        }
         if ('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')) {
-            throw new errors_1.BadDataError("You don't have the authority to make this user a system admin.");
+            input.data.abilities?.includes('tilmeld/admin') !==
+                this.$data.abilities?.includes('tilmeld/admin') &&
+            (!tilmeld.currentUser ||
+                !tilmeld.currentUser.abilities?.includes('system/admin'))) {
+            throw new errors_1.BadDataError("You don't have the authority to grant or revoke tilmeld/admin.");
+        }
+        if ('abilities' in input.data &&
+            input.data.abilities?.includes('tilmeld/switch') !==
+                this.$data.abilities?.includes('tilmeld/switch') &&
+            (!tilmeld.currentUser ||
+                !tilmeld.currentUser.abilities?.includes('system/admin'))) {
+            throw new errors_1.BadDataError("You don't have the authority to grant or revoke tilmeld/switch.");
         }
         this.$originalEmail = this.$data.email;
         super.$jsonAcceptData(input, allowConflict);
     }
     $jsonAcceptPatch(patch, allowConflict = false) {
-        const tilmeld = this.$nymph.tilmeld;
-        this.$referenceWake();
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        this.$check();
+        if ('abilities' in patch.set &&
+            patch.set.abilities?.includes('system/admin') !==
+                this.$data.abilities?.includes('system/admin') &&
+            (!tilmeld.currentUser ||
+                !tilmeld.currentUser.abilities?.includes('system/admin'))) {
+            throw new errors_1.BadDataError("You don't have the authority to grant or revoke system/admin.");
+        }
         if ('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')) {
-            throw new errors_1.BadDataError("You don't have the authority to make this user a system admin.");
+            patch.set.abilities?.includes('tilmeld/admin') !==
+                this.$data.abilities?.includes('tilmeld/admin') &&
+            (!tilmeld.currentUser ||
+                !tilmeld.currentUser.abilities?.includes('system/admin'))) {
+            throw new errors_1.BadDataError("You don't have the authority to grant or revoke tilmeld/admin.");
+        }
+        if ('abilities' in patch.set &&
+            patch.set.abilities?.includes('tilmeld/switch') !==
+                this.$data.abilities?.includes('tilmeld/switch') &&
+            (!tilmeld.currentUser ||
+                !tilmeld.currentUser.abilities?.includes('system/admin'))) {
+            throw new errors_1.BadDataError("You don't have the authority to grant or revoke tilmeld/switch.");
         }
         this.$originalEmail = this.$data.email;
         super.$jsonAcceptPatch(patch, allowConflict);
@@ -313,8 +460,13 @@ class User extends AbleObject_1.default {
         super.$putData(data, sdata);
         this.$updateDataProtection();
     }
+    /**
+     * Update the data protection arrays for a user.
+     *
+     * @param givenUser User to update protection for. If undefined, will use the currently logged in user.
+     */
     $updateDataProtection(givenUser) {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         let user = givenUser ?? tilmeld.User.current();
         this.$clientEnabledMethods = [...User.DEFAULT_CLIENT_ENABLED_METHODS];
         this.$privateData = [...User.DEFAULT_PRIVATE_DATA];
@@ -323,75 +475,146 @@ class User extends AbleObject_1.default {
             this.$privateData.push('username');
         }
         const isCurrentUser = user != null && user.$is(this);
+        // While loading, accessing abilities on the current user will infinitely
+        // loop, but if this is the current user, we can use its abilities.
         const abilities = (isCurrentUser || user == null
             ? this.$data.abilities
             : user?.abilities) ?? [];
         const isNewUser = this.guid == null;
         if (isCurrentUser) {
+            // Users can check to see what abilities they have.
             this.$clientEnabledMethods.push('$gatekeeper');
             this.$clientEnabledMethods.push('$changePassword');
+            this.$clientEnabledMethods.push('$revokeCurrentTokens');
             this.$clientEnabledMethods.push('$logout');
             this.$clientEnabledMethods.push('$sendEmailVerification');
+            this.$clientEnabledMethods.push('$hasTOTPSecret');
+            this.$clientEnabledMethods.push('$getNewTOTPSecret');
+            this.$clientEnabledMethods.push('$saveTOTPSecret');
+            this.$clientEnabledMethods.push('$removeTOTPSecret');
         }
         if (user != null &&
-            (abilities.indexOf('tilmeld/admin') !== -1 ||
-                abilities.indexOf('system/admin') !== -1)) {
-            this.$privateData = ['password', 'salt'];
+            (abilities.includes('tilmeld/admin') ||
+                abilities.includes('system/admin'))) {
+            // Users who can edit other users can see most of their data.
+            this.$privateData = ['password', 'salt', 'totpSecret'];
+            this.$clientEnabledMethods.push('$hasTOTPSecret');
+            this.$clientEnabledMethods.push('$removeTOTPSecret');
             this.$allowlistData = undefined;
         }
         else if (isCurrentUser || isNewUser) {
+            // Users can see their own data, and edit some of it.
             if (tilmeld.config.allowUsernameChange || isNewUser) {
                 this.$allowlistData.push('username');
             }
             this.$allowlistData.push('avatar');
-            if (tilmeld.config.userFields.indexOf('name') !== -1) {
+            if (tilmeld.config.userFields.includes('name')) {
                 this.$allowlistData.push('nameFirst');
                 this.$allowlistData.push('nameMiddle');
                 this.$allowlistData.push('nameLast');
                 this.$allowlistData.push('name');
             }
-            if (tilmeld.config.userFields.indexOf('email') !== -1) {
+            if (tilmeld.config.userFields.includes('email')) {
                 this.$allowlistData.push('email');
             }
-            if (tilmeld.config.userFields.indexOf('phone') !== -1) {
+            if (tilmeld.config.userFields.includes('phone')) {
                 this.$allowlistData.push('phone');
             }
             this.$privateData = [
+                // The things that are commented are there to show what is _not_ private.
+                // 'abilities',
+                // 'username',
+                // 'nameFirst',
+                // 'nameMiddle',
+                // 'nameLast',
+                // 'name',
+                // 'email',
+                // 'avatar',
+                // 'phone',
+                // 'group',
+                // 'groups',
+                // 'inheritAbilities',
+                'enabled',
                 'secret',
+                'emailChangeDate',
                 'newEmailSecret',
-                'cancelEmailAddress',
+                // 'newEmailAddress',
                 'cancelEmailSecret',
-                'emailChangeDate',
+                'cancelEmailAddress',
                 'recoverSecret',
                 'recoverSecretDate',
-                'password',
                 'salt',
+                'password',
+                'passwordTemp',
+                // 'revokeTokenDate',
+                'totpSecret',
             ];
         }
+        if (user != null &&
+            !isCurrentUser &&
+            (abilities.includes('tilmeld/switch') ||
+                abilities.includes('system/admin'))) {
+            // Users with this ability can switch to other users.
+            this.$clientEnabledMethods.push('$switchUser');
+        }
     }
-    $gatekeeper(ability) {
-        const tilmeld = this.$nymph.tilmeld;
+    $updateGroupDataProtection() {
+        if (this.$data.group != null && !this.$data.group.$asleep()) {
+            this.$data.group.$updateDataProtection();
+        }
+        for (let group of this.$data.groups ?? []) {
+            if (!group.$asleep()) {
+                group.$updateDataProtection();
+            }
+        }
+    }
+    /**
+     * Check to see if a user has an ability.
+     *
+     * This function will check both user and group abilities, if the user is
+     * marked to inherit the abilities of its group.
+     *
+     * If `ability` is undefined, it will check to see if the user is currently
+     * logged in.
+     *
+     * If the user has the "system/admin" ability, this function will return true.
+     *
+     * @param ability The ability.
+     * @returns True or false.
+     */
+    async $gatekeeper(ability) {
+        await this.$wake();
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (ability == null) {
             return tilmeld.User.current()?.$is(this) ?? false;
         }
+        // Check the cache to see if we've already checked this user.
         if (this.$gatekeeperCache == null) {
-            let abilities = this.$data.abilities ?? [];
-            if (this.$data.inheritAbilities) {
-                for (let curGroup of this.$data.groups ?? []) {
-                    if (curGroup.enabled) {
-                        abilities = abilities.concat(curGroup.abilities ?? []);
-                    }
-                }
-                if (this.$data.group != null &&
-                    this.$data.group.cdate != null &&
-                    this.$data.group.enabled) {
-                    abilities = abilities.concat(this.$data.group.abilities ?? []);
+            this.$gatekeeperCache = await this.$getGatekeeperCache();
+        }
+        return ((ability in this.$gatekeeperCache && !!this.$gatekeeperCache[ability]) ||
+            !!this.$data.abilities?.includes('system/admin'));
+    }
+    /**
+     * Build a gatekeeper cache object.
+     */
+    async $getGatekeeperCache() {
+        await this.$wake();
+        let abilities = this.$data.abilities ?? [];
+        if (this.$data.inheritAbilities) {
+            await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
+            for (let curGroup of this.$data.groups ?? []) {
+                if (curGroup.enabled) {
+                    abilities = abilities.concat(curGroup.abilities ?? []);
                 }
             }
-            this.$gatekeeperCache = Object.fromEntries(abilities.map((ability) => [ability, true]));
+            await this.$data.group?.$wake();
+            const group = this.$data.group;
+            if (group != null && group.cdate != null && group.enabled) {
+                abilities = abilities.concat(group.abilities ?? []);
+            }
         }
-        return ((ability in this.$gatekeeperCache && !!this.$gatekeeperCache[ability]) ||
-            !!this.$gatekeeperCache['system/admin']);
+        return Object.fromEntries(abilities.map((ability) => [ability, true]));
     }
     $clearCache() {
         const ret = super.$clearCache();
@@ -399,8 +622,13 @@ class User extends AbleObject_1.default {
         this.$gatekeeperCache = undefined;
         return ret;
     }
+    /**
+     * Send the user email verification/change/cancellation links.
+     *
+     * @returns True on success, false on failure.
+     */
     async $sendEmailVerification() {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (this.guid == null) {
             return false;
         }
@@ -463,18 +691,33 @@ class User extends AbleObject_1.default {
         }
         return success;
     }
-    $addGroup(group) {
-        if (this.$data.groups == null) {
-            this.$data.groups = [];
-        }
-        if (!group.$inArray(this.$data.groups)) {
-            this.$data.groups.push(group);
-            return this.$data.groups;
+    /**
+     * Add the user to a (secondary) group.
+     *
+     * @param group The group.
+     * @returns True if the user is already in the group. The resulting array of groups if the user was not.
+     */
+    async $addGroup(group) {
+        await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
+        let groups = this.$data.groups;
+        if (groups == null) {
+            groups = [];
+        }
+        if (!group.$inArray(groups)) {
+            groups.push(group);
+            this.$data.groups = groups;
+            return groups;
         }
         return true;
     }
+    /**
+     * Check the given password against the user's.
+     *
+     * @param password The password in question.
+     * @returns True if the passwords match, otherwise false.
+     */
     $checkPassword(password) {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         switch (tilmeld.config.pwMethod) {
             case 'plain':
                 return this.$data.password === password;
@@ -486,10 +729,18 @@ class User extends AbleObject_1.default {
                     (0, sha256_1.default)(password + this.$data.salt).toString(enc_base64_1.default));
         }
     }
-    $delGroup(group) {
-        if (this.$data.groups != null && group.$inArray(this.$data.groups)) {
+    /**
+     * Remove the user from a (secondary) group.
+     *
+     * @param group The group.
+     * @returns True if the user wasn't in the group. The resulting array of groups if the user was.
+     */
+    async $delGroup(group) {
+        await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
+        let groups = this.$data.groups || [];
+        if (this.$data.groups != null && group.$inArray(groups)) {
             const newGroups = [];
-            for (let curGroup of this.$data.groups) {
+            for (let curGroup of groups) {
                 if (!group.$is(curGroup)) {
                     newGroups.push(curGroup);
                 }
@@ -499,7 +750,13 @@ class User extends AbleObject_1.default {
         }
         return true;
     }
-    $inGroup(group) {
+    /**
+     * Check whether the user is in a (primary or secondary) group.
+     *
+     * @param group The group, or the group's GUID.
+     * @returns True or false.
+     */
+    async $inGroup(group) {
         if (typeof group === 'string') {
             if (this.$data.group?.guid === group) {
                 return true;
@@ -513,35 +770,66 @@ class User extends AbleObject_1.default {
         }
         return (group.$is(this.$data.group) || group.$inArray(this.$data.groups ?? []));
     }
-    $isDescendant(group) {
-        if (this.$data.group?.cdate != null &&
-            this.$data.group.$isDescendant(group)) {
+    /**
+     * Check whether the user is a descendant of a group.
+     *
+     * @param group The group, or the group's GUID.
+     * @returns True or false.
+     */
+    async $isDescendant(group) {
+        // Check to see if the user is in a descendant group of the given group.
+        await this.$data.group?.$wake();
+        if (this.$data.group != null &&
+            this.$data.group?.cdate != null &&
+            (await this.$data.group?.$isDescendant(group))) {
             return true;
         }
+        await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
         for (let curGroup of this.$data.groups ?? []) {
-            if (curGroup.$isDescendant(group)) {
+            if (await curGroup.$isDescendant(group)) {
                 return true;
             }
         }
         return false;
     }
+    /**
+     * A frontend accessible method to change the user's password.
+     *
+     * @param data The input data from the client.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     async $changePassword(data) {
+        this.$nymph.config.debugLog('tilmeld', `Password change request for "${this.$data.username}".`);
         if (!('newPassword' in data) || !data.newPassword.length) {
             return { result: false, message: 'Please specify a password.' };
         }
         if (!this.$checkPassword(data.currentPassword ?? '')) {
+            this.$nymph.config.debugLog('tilmeld', `Incorrect password for change request for "${this.$data.username}".`);
             return { result: false, message: 'Incorrect password.' };
         }
         this.$data.passwordTemp = data.newPassword;
+        if (data.revokeCurrentTokens) {
+            this.$data.revokeTokenDate = Date.now();
+        }
         if (await this.$save()) {
+            if (data.revokeCurrentTokens) {
+                const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+                await tilmeld.login(this, true);
+            }
             return { result: true, message: 'Your password has been changed.' };
         }
         else {
             return { result: false, message: "Couldn't save new password." };
         }
     }
+    /**
+     * Change the user's password.
+     *
+     * @param password The new password.
+     * @returns The resulting password or hash which is stored in the entity.
+     */
     $password(password) {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         switch (tilmeld.config.pwMethod) {
             case 'plain':
                 delete this.$data.salt;
@@ -559,14 +847,194 @@ class User extends AbleObject_1.default {
         }
         return this.$data.password;
     }
+    /**
+     * A frontend accessible method to revoke all currently issued tokens.
+     *
+     * @param data The input data from the client.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
+    async $revokeCurrentTokens(data) {
+        if (!this.$checkPassword(data.password ?? '')) {
+            return { result: false, message: 'Incorrect password.' };
+        }
+        this.$data.revokeTokenDate = Date.now();
+        if (await this.$save()) {
+            const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+            await tilmeld.login(this, true);
+            return {
+                result: true,
+                message: 'You have logged out of all other sessions.',
+            };
+        }
+        else {
+            return { result: false, message: "Couldn't save revocation date." };
+        }
+    }
+    async $hasTOTPSecret() {
+        return this.$data.totpSecret != null;
+    }
+    /**
+     * Check the given code against the user's TOTP secret.
+     *
+     * @param code The code in question.
+     * @returns True if the code is valid, otherwise false.
+     */
+    $checkTOTPCode(code) {
+        if (this.$data.totpSecret == null) {
+            return false;
+        }
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        const totp = new otpauth_1.TOTP({
+            issuer: tilmeld.config.appName,
+            label: this.$data.username,
+            algorithm: 'SHA1',
+            digits: 6,
+            period: 30,
+            secret: this.$data.totpSecret,
+        });
+        return totp.validate({ token: code, window: 2 }) != null;
+    }
+    /**
+     * A frontend accessible method to generate a new TOTP secret.
+     *
+     * @returns An object with 'uri', 'qrcode', and 'secret'.
+     */
+    async $getNewTOTPSecret() {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        if (this.$data.totpSecret != null) {
+            throw new errors_1.BadDataError('You already have a 2FA secret.');
+        }
+        const secret = new otpauth_1.Secret();
+        const totp = new otpauth_1.TOTP({
+            issuer: tilmeld.config.appName,
+            label: this.$data.username,
+            algorithm: 'SHA1',
+            digits: 6,
+            period: 30,
+            secret,
+        });
+        const uri = totp.toString();
+        const qrcode = await (0, qrcode_1.toDataURL)(uri);
+        return {
+            uri,
+            qrcode,
+            secret: secret.base32,
+        };
+    }
+    /**
+     * A frontend accessible method to save a TOTP secret into the user's account.
+     *
+     * @param data The input data from the client.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
+    async $saveTOTPSecret(data) {
+        if (!this.$checkPassword(data.password ?? '')) {
+            return { result: false, message: 'Incorrect password.' };
+        }
+        if (this.$data.totpSecret != null) {
+            return { result: false, message: 'You already have a 2FA secret.' };
+        }
+        if (data.secret == null ||
+            typeof data.secret !== 'string' ||
+            data.secret === '') {
+            return { result: false, message: '2FA secret is invalid.' };
+        }
+        if (data.code == null ||
+            typeof data.code !== 'string' ||
+            data.code.length !== 6) {
+            return { result: false, message: '2FA code is invalid.' };
+        }
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        const totp = new otpauth_1.TOTP({
+            issuer: tilmeld.config.appName,
+            label: this.$data.username,
+            algorithm: 'SHA1',
+            digits: 6,
+            period: 30,
+            secret: data.secret,
+        });
+        if (totp.validate({ token: data.code, window: 2 }) == null) {
+            return { result: false, message: '2FA code is incorrect.' };
+        }
+        this.$data.totpSecret = data.secret;
+        if (await this.$save()) {
+            return { result: true, message: 'Your two factor secret is now set.' };
+        }
+        else {
+            return { result: false, message: "Couldn't save two factor secret." };
+        }
+    }
+    /**
+     * A frontend accessible method to remove the TOTP secret from the user's
+     * account.
+     *
+     * @param data The input data from the client.
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
+    async $removeTOTPSecret(data) {
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        if (data) {
+            if (!this.$checkPassword(data.password ?? '')) {
+                return { result: false, message: 'Incorrect password.' };
+            }
+            if (data.code == null ||
+                typeof data.code !== 'string' ||
+                data.code.length !== 6) {
+                return { result: false, message: '2FA code is invalid.' };
+            }
+            if (this.$data.totpSecret == null) {
+                return { result: false, message: "You don't have a 2FA secret." };
+            }
+            const totp = new otpauth_1.TOTP({
+                issuer: tilmeld.config.appName,
+                label: this.$data.username,
+                algorithm: 'SHA1',
+                digits: 6,
+                period: 30,
+                secret: this.$data.totpSecret,
+            });
+            if (totp.validate({ token: data.code, window: 2 }) == null) {
+                return { result: false, message: '2FA code is incorrect.' };
+            }
+        }
+        else if (!tilmeld.gatekeeper('tilmeld/admin')) {
+            return {
+                result: false,
+                message: 'You must provide your password and 2FA code.',
+            };
+        }
+        delete this.$data.totpSecret;
+        if (await this.$save()) {
+            return {
+                result: true,
+                message: 'Two factor secret has been removed.',
+            };
+        }
+        else {
+            return { result: false, message: "Couldn't remove two factor secret." };
+        }
+    }
+    /**
+     * Check that a username is valid.
+     *
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     async $checkUsername() {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        this.$nymph.config.debugLog('tilmeld', `Username check "${this.$data.username}".`);
         if (!tilmeld.config.emailUsernames) {
             if (this.$data.username == null || !this.$data.username.length) {
                 return { result: false, message: 'Please specify a username.' };
             }
-            if (tilmeld.config.maxUsernameLength > 0 &&
-                this.$data.username.length > tilmeld.config.maxUsernameLength) {
+            if (this.$data.username.length < tilmeld.config.minUsernameLength) {
+                return {
+                    result: false,
+                    message: 'Usernames must be at least ' +
+                        tilmeld.config.minUsernameLength +
+                        ' characters.',
+                };
+            }
+            if (this.$data.username.length > tilmeld.config.maxUsernameLength) {
                 return {
                     result: false,
                     message: 'Usernames must not exceed ' +
@@ -600,6 +1068,17 @@ class User extends AbleObject_1.default {
             if (test != null) {
                 return { result: false, message: 'That username is taken.' };
             }
+            for (let callback of this.constructor
+                .checkUsernameCallbacks) {
+                if (callback) {
+                    const result = await callback(this, {
+                        username: this.$data.username,
+                    });
+                    if (!result.result) {
+                        return { message: 'Username is not available.', ...result };
+                    }
+                }
+            }
             return {
                 result: true,
                 message: this.guid != null ? 'Username is valid.' : 'Username is available!',
@@ -610,8 +1089,15 @@ class User extends AbleObject_1.default {
             if (this.$data.username == null || !this.$data.username.length) {
                 return { result: false, message: 'Please specify an email.' };
             }
-            if (tilmeld.config.maxUsernameLength > 0 &&
-                this.$data.username.length > tilmeld.config.maxUsernameLength) {
+            if (this.$data.username.length < tilmeld.config.minUsernameLength) {
+                return {
+                    result: false,
+                    message: 'Emails must be at least ' +
+                        tilmeld.config.minUsernameLength +
+                        ' characters.',
+                };
+            }
+            if (this.$data.username.length > tilmeld.config.maxUsernameLength) {
                 return {
                     result: false,
                     message: 'Emails must not exceed ' +
@@ -622,8 +1108,14 @@ class User extends AbleObject_1.default {
             return await this.$checkEmail();
         }
     }
+    /**
+     * Check that an email is unique.
+     *
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     async $checkEmail() {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        this.$nymph.config.debugLog('tilmeld', `Email check "${this.$data.email}".`);
         if (this.$data.email == null || !this.$data.email.length) {
             if (tilmeld.config.verifyEmail) {
                 return { result: false, message: 'Please specify an email.' };
@@ -657,8 +1149,14 @@ class User extends AbleObject_1.default {
             message: this.guid != null ? 'Email is valid.' : 'Email address is valid!',
         };
     }
+    /**
+     * Check that a phone number is unique.
+     *
+     * @returns An object with a boolean 'result' entry and a 'message' entry.
+     */
     async $checkPhone() {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        this.$nymph.config.debugLog('tilmeld', `Phone check "${this.$data.phone}".`);
         if (this.$data.phone == null || !this.$data.phone.length) {
             return { result: false, message: 'Please specify a phone number.' };
         }
@@ -686,7 +1184,7 @@ class User extends AbleObject_1.default {
         };
     }
     async $register(data) {
-        let tilmeld = this.$nymph.tilmeld;
+        let tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (!tilmeld.config.allowRegistration) {
             return {
                 result: false,
@@ -701,21 +1199,6 @@ class User extends AbleObject_1.default {
                 message: 'This is already a registered user.',
             };
         }
-        try {
-            for (let callback of this.constructor
-                .beforeRegisterCallbacks) {
-                if (callback) {
-                    await callback(this, data);
-                }
-            }
-        }
-        catch (e) {
-            return {
-                result: false,
-                loggedin: false,
-                message: e.message,
-            };
-        }
         if (!('password' in data) || !data.password.length) {
             return {
                 result: false,
@@ -728,7 +1211,7 @@ class User extends AbleObject_1.default {
             return { ...unCheck, loggedin: false };
         }
         this.$password(data.password);
-        if (tilmeld.config.regFields.indexOf('name') !== -1) {
+        if (tilmeld.config.regFields.includes('name')) {
             this.$data.name =
                 this.$data.nameFirst +
                     (this.$data.nameMiddle == null ? '' : ' ' + this.$data.nameMiddle) +
@@ -740,19 +1223,45 @@ class User extends AbleObject_1.default {
         if (tilmeld.config.emailUsernames) {
             this.$data.email = this.$data.username;
         }
+        // Start transaction.
         const transaction = 'tilmeld-register-' + (0, guid_1.nanoid)();
         const nymph = this.$nymph;
         const tnymph = await this.$nymph.startTransaction(transaction);
         this.$nymph = tnymph;
-        tilmeld = this.$nymph.tilmeld;
+        tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        let message = '';
+        let loggedin = false;
         try {
+            try {
+                for (let callback of this.constructor
+                    .beforeRegisterCallbacks) {
+                    if (callback) {
+                        await callback(this, data);
+                    }
+                }
+            }
+            catch (e) {
+                await tnymph.rollback(transaction);
+                this.$nymph = nymph;
+                return {
+                    result: false,
+                    loggedin: false,
+                    message: e.message,
+                };
+            }
+            // Add primary group.
             let generatedPrimaryGroup = null;
             if (tilmeld.config.generatePrimary) {
+                // Generate a new primary group for the user.
                 generatedPrimaryGroup = await tilmeld.Group.factory();
                 generatedPrimaryGroup.groupname = this.$data.username;
                 generatedPrimaryGroup.avatar = this.$data.avatar;
-                generatedPrimaryGroup.name = this.$data.name;
-                generatedPrimaryGroup.email = this.$data.email;
+                if (tilmeld.config.userFields.includes('name')) {
+                    generatedPrimaryGroup.name = this.$data.name;
+                }
+                if (tilmeld.config.userFields.includes('email')) {
+                    generatedPrimaryGroup.email = this.$data.email;
+                }
                 const parent = await tnymph.getEntity({ class: tilmeld.Group }, {
                     type: '&',
                     equal: ['defaultPrimary', true],
@@ -772,6 +1281,7 @@ class User extends AbleObject_1.default {
                 this.$data.group = generatedPrimaryGroup;
             }
             else {
+                // Add the default primary.
                 const group = await tnymph.getEntity({ class: tilmeld.Group }, {
                     type: '&',
                     equal: ['defaultPrimary', true],
@@ -780,19 +1290,26 @@ class User extends AbleObject_1.default {
                     this.$data.group = group;
                 }
             }
-            if (tilmeld.config.verifyEmail && tilmeld.config.unverifiedAccess) {
+            // Add secondary groups.
+            if (tilmeld.config.userFields.includes('email') &&
+                tilmeld.config.verifyEmail &&
+                tilmeld.config.unverifiedAccess) {
+                // Add the default secondaries for unverified users.
                 this.$data.groups = await tnymph.getEntities({ class: tilmeld.Group }, {
                     type: '&',
                     equal: ['unverifiedSecondary', true],
                 });
             }
             else {
+                // Add the default secondaries.
                 this.$data.groups = await tnymph.getEntities({ class: tilmeld.Group }, {
                     type: '&',
                     equal: ['defaultSecondary', true],
                 });
             }
-            if (tilmeld.config.verifyEmail) {
+            if (tilmeld.config.userFields.includes('email') &&
+                tilmeld.config.verifyEmail) {
+                // The user will be enabled after verifying their e-mail address.
                 if (!tilmeld.config.unverifiedAccess) {
                     this.$data.enabled = false;
                 }
@@ -800,6 +1317,8 @@ class User extends AbleObject_1.default {
             else {
                 this.$data.enabled = true;
             }
+            // If create_admin is true and there are no other users, grant
+            // "system/admin".
             let madeAdmin = false;
             if (tilmeld.config.createAdmin) {
                 const otherUsers = await tnymph.getEntities({
@@ -808,13 +1327,17 @@ class User extends AbleObject_1.default {
                     limit: 1,
                     return: 'guid',
                 });
+                // Make sure it's not just null, cause that means an error.
                 if (!otherUsers.length) {
                     this.$grant('system/admin');
                     this.$data.enabled = true;
                     madeAdmin = true;
                 }
             }
+            this.$nymph.config.debugLog('tilmeld', `Registering new user "${this.$data.username}".`);
             if (await this.$saveSkipAC()) {
+                this.$nymph.config.debugLog('tilmeld', `New user registered "${this.$data.username}".`);
+                // Send the new user registered email.
                 if (tilmeld.config.userRegisteredRecipient != null) {
                     await tilmeld.config.sendEmail(tilmeld, {
                         template: 'UserRegistered',
@@ -831,8 +1354,7 @@ class User extends AbleObject_1.default {
                         },
                     }, this);
                 }
-                let message = '';
-                let loggedin = false;
+                // Save the primary group.
                 if (generatedPrimaryGroup != null) {
                     generatedPrimaryGroup.user = this;
                     if (!(await generatedPrimaryGroup.$saveSkipAC())) {
@@ -845,17 +1367,20 @@ class User extends AbleObject_1.default {
                         };
                     }
                 }
+                // Finish up.
                 if (tilmeld.config.verifyEmail &&
                     !tilmeld.config.unverifiedAccess &&
-                    !madeAdmin) {
+                    !madeAdmin &&
+                    tilmeld.config.userFields.includes('email')) {
                     message +=
                         `Almost there. An email has been sent to ${this.$data.email} ` +
                             'with a verification link for you to finish registration.';
                 }
                 else if (tilmeld.config.verifyEmail &&
                     tilmeld.config.unverifiedAccess &&
-                    !madeAdmin) {
-                    if (!tilmeld.login(this, true)) {
+                    !madeAdmin &&
+                    tilmeld.config.userFields.includes('email')) {
+                    if (!(await tilmeld.login(this, true))) {
                         throw new Error('An error occurred trying to log you in.');
                     }
                     message +=
@@ -865,7 +1390,7 @@ class User extends AbleObject_1.default {
                     loggedin = true;
                 }
                 else {
-                    if (!tilmeld.login(this, true)) {
+                    if (!(await tilmeld.login(this, true))) {
                         throw new Error('An error occurred trying to log you in.');
                     }
                     message += "You're now registered and logged in!";
@@ -880,21 +1405,9 @@ class User extends AbleObject_1.default {
                         });
                     }
                 }
-                try {
-                    await tnymph.commit(transaction);
-                    this.$nymph = nymph;
-                    this.$nymph.tilmeld?.fillSession(this);
-                }
-                catch (e) {
-                    throw e;
-                }
-                return {
-                    result: true,
-                    loggedin,
-                    message,
-                };
             }
             else {
+                this.$nymph.config.debugError('tilmeld', `Error registering new user "${this.$data.username}".`);
                 await tnymph.rollback(transaction);
                 this.$nymph = nymph;
                 return {
@@ -905,22 +1418,37 @@ class User extends AbleObject_1.default {
             }
         }
         catch (e) {
+            this.$nymph.config.debugError('tilmeld', `Error registering new user "${this.$data.username}": ${e}`);
             await tnymph.rollback(transaction);
             this.$nymph = nymph;
             throw e;
         }
+        try {
+            await tnymph.commit(transaction);
+            this.$nymph = nymph;
+            await this.$nymph.tilmeld?.fillSession(this);
+        }
+        catch (e) {
+            throw e;
+        }
+        return {
+            result: true,
+            loggedin,
+            message,
+        };
     }
     async $save() {
-        let tilmeld = this.$nymph.tilmeld;
+        let tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (this.$data.username == null || !this.$data.username.trim().length) {
             return false;
         }
         if (tilmeld.gatekeeper('tilmeld/admin') &&
             !tilmeld.gatekeeper('system/admin') &&
-            this.$gatekeeper('system/admin')) {
+            this.$data.abilities?.includes('system/admin')) {
             throw new errors_1.BadDataError("You don't have the authority to modify system admins.");
         }
         let sendVerification = false;
+        // Formatting.
         this.$data.username = this.$data.username.trim();
         if (tilmeld.config.emailUsernames) {
             this.$data.email = this.$data.username;
@@ -934,49 +1462,63 @@ class User extends AbleObject_1.default {
                 (this.$data.nameMiddle ? ' ' + this.$data.nameMiddle : '') +
                 (this.$data.nameLast ? ' ' + this.$data.nameLast : '');
         this.$data.enabled = !!this.$data.enabled;
-        if (this.$data.nameFirst === '') {
+        // Clear empty values.
+        if (this.$data.nameFirst === '' ||
+            !tilmeld.config.userFields.includes('name')) {
             delete this.$data.nameFirst;
         }
-        if (this.$data.nameMiddle === '') {
+        if (this.$data.nameMiddle === '' ||
+            !tilmeld.config.userFields.includes('name')) {
             delete this.$data.nameMiddle;
         }
-        if (this.$data.nameLast === '') {
+        if (this.$data.nameLast === '' ||
+            !tilmeld.config.userFields.includes('name')) {
             delete this.$data.nameLast;
         }
-        if (this.$data.name === '') {
+        if (this.$data.name === '' || !tilmeld.config.userFields.includes('name')) {
             delete this.$data.name;
         }
-        if (this.$data.email === '') {
+        if (this.$data.email === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.email;
         }
         if (this.$data.avatar === '') {
             delete this.$data.avatar;
         }
-        if (this.$data.phone === '') {
+        if (this.$data.phone === '' ||
+            !tilmeld.config.userFields.includes('phone')) {
             delete this.$data.phone;
         }
-        if (this.$data.secret === '') {
+        if (this.$data.secret === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.secret;
         }
-        if (this.$data.emailChangeDate === 0) {
+        if (this.$data.emailChangeDate === 0 ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.emailChangeDate;
         }
-        if (this.$data.newEmailSecret === '') {
+        if (this.$data.newEmailSecret === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.newEmailSecret;
         }
-        if (this.$data.newEmailAddress === '') {
+        if (this.$data.newEmailAddress === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.newEmailAddress;
         }
-        if (this.$data.cancelEmailSecret === '') {
+        if (this.$data.cancelEmailSecret === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.cancelEmailSecret;
         }
-        if (this.$data.cancelEmailAddress === '') {
+        if (this.$data.cancelEmailAddress === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.cancelEmailAddress;
         }
-        if (this.$data.recoverSecret === '') {
+        if (this.$data.recoverSecret === '' ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.recoverSecret;
         }
-        if (this.$data.recoverSecretDate === 0) {
+        if (this.$data.recoverSecretDate === 0 ||
+            !tilmeld.config.userFields.includes('email')) {
             delete this.$data.recoverSecretDate;
         }
         if (this.$data.password === '') {
@@ -988,26 +1530,36 @@ class User extends AbleObject_1.default {
         if (this.$data.inheritAbilities === false) {
             delete this.$data.inheritAbilities;
         }
+        // Verification.
         const unCheck = await this.$checkUsername();
         if (!unCheck.result) {
             throw new errors_1.BadUsernameError(unCheck.message);
         }
-        if (!tilmeld.config.emailUsernames) {
+        if (!tilmeld.config.emailUsernames &&
+            tilmeld.config.userFields.includes('email')) {
             const emCheck = await this.$checkEmail();
             if (!emCheck.result) {
                 throw new errors_1.BadEmailError(emCheck.message);
             }
         }
-        if (!tilmeld.gatekeeper('tilmeld/admin')) {
+        // Email changes.
+        if (!tilmeld.gatekeeper('tilmeld/admin') &&
+            tilmeld.config.userFields.includes('email')) {
+            // The user isn't an admin, so email address changes should contain some
+            // security measures.
             if (tilmeld.config.verifyEmail) {
+                // The user needs to verify this new email address.
                 if (this.guid == null) {
-                    if ((this.$data.abilities?.indexOf('system/admin') ?? -1) === -1) {
+                    // If this is the first user, they'll be made an admin, so they don't
+                    // need to verify.
+                    if (!this.$data.abilities?.includes('system/admin')) {
                         this.$data.secret = (0, guid_1.nanoid)();
                         sendVerification = true;
                     }
                 }
                 else if (this.$originalEmail != null &&
                     this.$originalEmail !== this.$data.email) {
+                    // The user already has an old email address.
                     if (tilmeld.config.emailRateLimit !== '' &&
                         this.$data.emailChangeDate != null &&
                         this.$data.emailChangeDate >=
@@ -1019,13 +1571,18 @@ class User extends AbleObject_1.default {
                     else {
                         if (this.$data.newEmailSecret == null &&
                             tilmeld.config.emailRateLimit !== '' &&
+                            // Make sure the user has at least the rate limit time to cancel
+                            // an email change.
                             (this.$data.emailChangeDate == null ||
                                 this.$data.emailChangeDate <
                                     (0, strtotime_1.default)('-' + tilmeld.config.emailRateLimit) * 1000)) {
+                            // Save the old email in case the cancel change link is clicked.
                             this.$data.cancelEmailAddress = this.$originalEmail;
                             this.$data.cancelEmailSecret = (0, guid_1.nanoid)();
                             this.$data.emailChangeDate = Date.now();
                         }
+                        // Save the new address and reset to the old one (until they verify
+                        // it).
                         this.$data.newEmailAddress = this.$data.email;
                         this.$data.email = this.$originalEmail;
                         if (tilmeld.config.emailUsernames) {
@@ -1039,9 +1596,13 @@ class User extends AbleObject_1.default {
             else if (this.guid != null &&
                 this.$originalEmail != null &&
                 this.$originalEmail !== this.$data.email &&
+                // Make sure the user has at least the rate limit time to cancel an
+                // email change.
                 (this.$data.emailChangeDate == null ||
                     this.$data.emailChangeDate <
                         (0, strtotime_1.default)('-' + tilmeld.config.emailRateLimit) * 1000)) {
+                // The user doesn't need to verify their new email address, but should
+                // be able to cancel the email change from their old address.
                 this.$data.cancelEmailAddress = this.$originalEmail;
                 this.$data.cancelEmailSecret = (0, guid_1.nanoid)();
                 sendVerification = true;
@@ -1055,26 +1616,35 @@ class User extends AbleObject_1.default {
             throw new errors_1.BadDataError('A password is required.');
         }
         try {
-            tilmeld.config.validatorUser(this);
+            tilmeld.config.validatorUser(tilmeld, this);
         }
         catch (e) {
             throw new errors_1.BadDataError(e?.message);
         }
+        // Start transaction.
         const transaction = 'tilmeld-save-' + (0, guid_1.nanoid)();
         const nymph = this.$nymph;
         const tnymph = await this.$nymph.startTransaction(transaction);
         this.$nymph = tnymph;
-        tilmeld = this.$nymph.tilmeld;
-        if (this.$data.group != null &&
-            this.$data.group.user != null &&
-            this.$is(this.$data.group.user)) {
+        tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
+        const group = this.$data.group;
+        await group?.$wake();
+        if (group != null && group.user != null && this.$is(group.user)) {
             try {
-                this.$data.group.groupname = this.$data.username;
-                this.$data.group.avatar = this.$data.avatar;
-                this.$data.group.email = this.$data.email;
-                this.$data.group.name = this.$data.name;
-                this.$data.group.phone = this.$data.phone;
-                await this.$data.group.$saveSkipAC();
+                // Update the user's generated primary group.
+                group.groupname = this.$data.username;
+                group.avatar = this.$data.avatar;
+                if (tilmeld.config.userFields.includes('email')) {
+                    group.email = this.$data.email;
+                }
+                if (tilmeld.config.userFields.includes('name')) {
+                    group.name = this.$data.name;
+                }
+                if (tilmeld.config.userFields.includes('phone')) {
+                    group.phone = this.$data.phone;
+                }
+                await group.$saveSkipAC();
+                this.$data.group = group;
             }
             catch (e) {
                 await tnymph.rollback(transaction);
@@ -1096,6 +1666,7 @@ class User extends AbleObject_1.default {
         }
         if (ret) {
             if (sendVerification) {
+                // The email has changed, so send a new verification email.
                 if (!(await this.$sendEmailVerification())) {
                     await tnymph.rollback(transaction);
                     this.guid = preGuid;
@@ -1108,8 +1679,10 @@ class User extends AbleObject_1.default {
             this.$descendantGroups = undefined;
             this.$gatekeeperCache = undefined;
             await tnymph.commit(transaction);
-            if (nymph.tilmeld.User.current(true).$is(this)) {
-                nymph.tilmeld.fillSession(this);
+            const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(nymph);
+            if (tilmeld.User.current(true).$is(this)) {
+                // Update the user in the session cache.
+                await tilmeld.fillSession(this);
             }
         }
         else {
@@ -1118,6 +1691,9 @@ class User extends AbleObject_1.default {
         this.$nymph = nymph;
         return ret;
     }
+    /**
+     * This should *never* be accessible on the client.
+     */
     async $saveSkipAC() {
         this.$skipAcWhenSaving = true;
         return await this.$save();
@@ -1130,12 +1706,12 @@ class User extends AbleObject_1.default {
         return false;
     }
     async $delete() {
-        const tilmeld = this.$nymph.tilmeld;
+        const tilmeld = (0, enforceTilmeld_1.enforceTilmeld)(this);
         if (!tilmeld.gatekeeper('tilmeld/admin')) {
             throw new errors_1.BadDataError("You don't have the authority to delete users.");
         }
         if (!tilmeld.gatekeeper('system/admin') &&
-            this.$gatekeeper('system/admin')) {
+            this.$data.abilities?.includes('system/admin')) {
             throw new errors_1.BadDataError("You don't have the authority to delete system admins.");
         }
         if (tilmeld.User.current(true).$is(this)) {
@@ -1148,6 +1724,7 @@ class User extends AbleObject_1.default {
         if (!(prop in this)) {
             throw new Error('Invalid event type.');
         }
+        // @ts-ignore: The callback should always be the right type here.
         this[prop].push(callback);
         return () => this.off(event, callback);
     }
@@ -1156,16 +1733,21 @@ class User extends AbleObject_1.default {
         if (!(prop in this)) {
             return false;
         }
+        // @ts-ignore: The callback should always be the right type here.
         const i = this[prop].indexOf(callback);
         if (i > -1) {
+            // @ts-ignore: The callback should always be the right type here.
             this[prop].splice(i, 1);
         }
         return true;
     }
 }
-exports.default = User;
+/**
+ * The instance of Tilmeld to use for queries.
+ */
 User.ETYPE = 'tilmeld_user';
 User.class = 'User';
+User.checkUsernameCallbacks = [];
 User.beforeRegisterCallbacks = [];
 User.afterRegisterCallbacks = [];
 User.beforeLoginCallbacks = [];
@@ -1180,23 +1762,33 @@ User.DEFAULT_CLIENT_ENABLED_METHODS = [
     '$register',
 ];
 User.DEFAULT_PRIVATE_DATA = [
+    // The things that are commented are there to show what is _not_ private.
+    'abilities',
+    // 'username',
+    // 'nameFirst',
+    // 'nameMiddle',
+    // 'nameLast',
+    // 'name',
     'email',
-    'originalEmail',
+    // 'avatar',
     'phone',
     'group',
     'groups',
-    'abilities',
     'inheritAbilities',
-    'recoverSecret',
-    'recoverSecretDate',
-    'password',
-    'salt',
+    'enabled',
     'secret',
-    'newEmailAddress',
+    'emailChangeDate',
     'newEmailSecret',
-    'cancelEmailAddress',
+    'newEmailAddress',
     'cancelEmailSecret',
-    'emailChangeDate',
+    'cancelEmailAddress',
+    'recoverSecret',
+    'recoverSecretDate',
+    'salt',
+    'password',
+    'passwordTemp',
+    'revokeTokenDate',
+    'totpSecret',
 ];
 User.DEFAULT_ALLOWLIST_DATA = [];
 User.clientEnabledStaticMethods = [
@@ -1207,4 +1799,5 @@ User.clientEnabledStaticMethods = [
     'getClientConfig',
 ];
 User.searchRestrictedData = [...User.DEFAULT_PRIVATE_DATA];
+exports.default = User;
 //# sourceMappingURL=User.js.map