@nymphjs/tilmeld 1.0.0-beta.131 → 1.0.0-beta.133

package/dist/User.js

@@ -41,9 +41,18 @@ import { TOTP, Secret } from 'otpauth';
 import { toDataURL } from 'qrcode';
 import { splitn } from '@sciactive/splitn';
 import { enforceTilmeld } from './enforceTilmeld.js';
-import AbleObject from './AbleObject.js';
-import GroupClass from './Group.js';
+import { AbleObject } from './AbleObject.js';
+import { Group as GroupClass } from './Group.js';
 import { AccessControlError, BadDataError, BadEmailError, BadUsernameError, EmailChangeRateLimitExceededError, } from './errors/index.js';
+/**
+ * A user data model.
+ *
+ * Written by Hunter Perrin for SciActive.
+ *
+ * @author Hunter Perrin <hperrin@port87.com>
+ * @copyright SciActive Inc
+ * @see http://nymph.io/
+ */
 let User = (() => {
     let _classSuper = AbleObject;
     let _instanceExtraInitializers = [];
@@ -369,20 +378,20 @@ let User = (() => {
         constructor() {
             super();
             // Defaults.
-            this.$data.enabled = true;
-            this.$data.abilities = [];
-            this.$data.groups = [];
-            this.$data.inheritAbilities = true;
+            this.enabled = true;
+            this.abilities = [];
+            this.groups = [];
+            this.inheritAbilities = true;
             this.$updateDataProtection();
         }
         async $getUniques() {
             const tilmeld = enforceTilmeld(this);
-            const uniques = [`u:${this.$data.username}`];
+            const uniques = [`u:${this.username}`];
             if (!tilmeld.config.emailUsernames &&
                 tilmeld.config.userFields.includes('email')) {
-                uniques.push(`e:${this.$data.email}`);
-                if (this.$data.newEmailAddress != null) {
-                    uniques.push(`e:${this.$data.newEmailAddress}`);
+                uniques.push(`e:${this.email}`);
+                if (this.newEmailAddress != null) {
+                    uniques.push(`e:${this.newEmailAddress}`);
                 }
             }
             return uniques;
@@ -397,13 +406,13 @@ let User = (() => {
                 await tilmeld.config.failedLoginAttempt(this, data);
                 return { result: false, message: 'Incorrect login/password.' };
             }
-            if (!this.$data.enabled) {
+            if (!this.enabled) {
                 return { result: false, message: 'Your account is disabled.' };
             }
             if (await this.$gatekeeper()) {
                 return { result: true, message: 'You are already logged in.' };
             }
-            if (this.$data.totpSecret != null) {
+            if (this.totpSecret != null) {
                 if (data.code == null ||
                     typeof data.code !== 'string' ||
                     data.code.length !== 6) {
@@ -429,7 +438,7 @@ let User = (() => {
             catch (e) {
                 return { result: false, message: e.message };
             }
-            this.$nymph.config.debugLog('tilmeld', `User login for "${this.$data.username}".`);
+            this.$nymph.config.debugLog('tilmeld', `User login for "${this.username}".`);
             // Authentication was successful, attempt to login.
             if (!(await tilmeld.login(this, true))) {
                 return { result: false, message: 'Incorrect login/password.' };
@@ -437,7 +446,7 @@ let User = (() => {
             for (let callback of this.constructor
                 .afterLoginCallbacks) {
                 if (callback) {
-                    await callback(this.$proxy());
+                    await callback(this);
                 }
             }
             // Login was successful.
@@ -456,7 +465,7 @@ let User = (() => {
             if (isCurrentUser) {
                 return { result: false, message: "You can't switch to yourself." };
             }
-            const toAbilities = this.$data.abilities || [];
+            const toAbilities = this.abilities || [];
             const fromAbilities = user.abilities || [];
             if (!fromAbilities.includes('tilmeld/switch') &&
                 !fromAbilities.includes('system/admin')) {
@@ -474,7 +483,7 @@ let User = (() => {
                     .beforeLoginCallbacks) {
                     if (callback) {
                         await callback(this, {
-                            username: this.$data.username || '',
+                            username: this.username || '',
                             password: '',
                             ...(data || {}),
                         });
@@ -484,7 +493,7 @@ let User = (() => {
             catch (e) {
                 return { result: false, message: e.message };
             }
-            this.$nymph.config.debugLog('tilmeld', `User login switch for "${user.username}" to "${this.$data.username}".`);
+            this.$nymph.config.debugLog('tilmeld', `User login switch for "${user.username}" to "${this.username}".`);
             // Authentication was successful, attempt to login.
             if (!(await tilmeld.loginSwitch(this, true))) {
                 return { result: false, message: 'Incorrect login/password.' };
@@ -492,7 +501,7 @@ let User = (() => {
             for (let callback of this.constructor
                 .afterLoginCallbacks) {
                 if (callback) {
-                    await callback(this.$proxy());
+                    await callback(this);
                 }
             }
             // Login was successful.
@@ -508,47 +517,47 @@ let User = (() => {
                 for (let callback of this.constructor
                     .beforeLogoutCallbacks) {
                     if (callback) {
-                        await callback(this.$proxy());
+                        await callback(this);
                     }
                 }
             }
             catch (e) {
                 return { result: false, message: e.message };
             }
-            this.$nymph.config.debugLog('tilmeld', `User logout for "${this.$data.username}".`);
+            this.$nymph.config.debugLog('tilmeld', `User logout for "${this.username}".`);
             await tilmeld.logout();
             for (let callback of this.constructor
                 .afterLogoutCallbacks) {
                 if (callback) {
-                    await callback(this.$proxy());
+                    await callback(this);
                 }
             }
             return { result: true, message: 'You have been logged out.' };
         }
         $getAvatar() {
-            if (this.$data.avatar != null && this.$data.avatar !== '') {
-                return this.$data.avatar;
+            if (this.avatar != null && this.avatar !== '') {
+                return this.avatar;
             }
-            if (this.$data.email == null || this.$data.email === '') {
+            if (this.email == null || this.email === '') {
                 return 'https://secure.gravatar.com/avatar/?d=mm&s=40';
             }
             return ('https://secure.gravatar.com/avatar/' +
                 crypto
                     .createHash('sha256')
-                    .update(this.$data.email.trim().toLowerCase())
+                    .update(this.email.trim().toLowerCase())
                     .digest('hex')
                     .toLowerCase() +
                 '?d=identicon&s=40');
         }
         $getGid() {
-            if (this.$data.group) {
-                return this.$data.group.guid;
+            if (this.group) {
+                return this.group.guid;
             }
             return null;
         }
         $getGids() {
-            if (this.$data.groups) {
-                return this.$data.groups
+            if (this.groups) {
+                return this.groups
                     .map((group) => group.guid)
                     .filter((guid) => guid != null);
             }
@@ -560,12 +569,12 @@ let User = (() => {
         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();
+                if (this.group != null) {
+                    await this.group.$wake();
+                    this.$descendantGroups = await this.group.$getDescendants();
                 }
-                await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
-                for (let curGroup of this.$data.groups ?? []) {
+                await Promise.all(this.groups?.map((e) => e.$wake()) || []);
+                for (let curGroup of this.groups ?? []) {
                     this.$descendantGroups = this.$descendantGroups?.concat(await curGroup.$getDescendants());
                 }
             }
@@ -591,9 +600,8 @@ let User = (() => {
                 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 abilities = (isCurrentUser || user == null ? this.abilities : user?.abilities) ??
+                    [];
                 const isNewUser = input.guid == null;
                 const isDomainUser = !isCurrentUser &&
                     user != null &&
@@ -622,24 +630,24 @@ let User = (() => {
                 throw new BadDataError('Abilities must be an array of strings.');
             }
             if (incoming.includes('system/admin') !==
-                this.$data.abilities?.includes('system/admin') &&
+                this.abilities?.includes('system/admin') &&
                 (!tilmeld.currentUser ||
                     !tilmeld.currentUser.abilities?.includes('system/admin'))) {
                 throw new BadDataError("You don't have the authority to grant or revoke system/admin.");
             }
             if (incoming.includes('tilmeld/admin') !==
-                this.$data.abilities?.includes('tilmeld/admin') &&
+                this.abilities?.includes('tilmeld/admin') &&
                 (!tilmeld.currentUser ||
                     !tilmeld.currentUser.abilities?.includes('system/admin'))) {
                 throw new BadDataError("You don't have the authority to grant or revoke tilmeld/admin.");
             }
             if (incoming.includes('tilmeld/switch') !==
-                this.$data.abilities?.includes('tilmeld/switch') &&
+                this.abilities?.includes('tilmeld/switch') &&
                 (!tilmeld.currentUser ||
                     !tilmeld.currentUser.abilities?.includes('system/admin'))) {
                 throw new BadDataError("You don't have the authority to grant or revoke tilmeld/switch.");
             }
-            if (xor(incoming.filter((ability) => ability.startsWith('tilmeld/')), this.$data.abilities?.filter((ability) => ability.startsWith('tilmeld/')) ?? []).length &&
+            if (xor(incoming.filter((ability) => ability.startsWith('tilmeld/')), this.abilities?.filter((ability) => ability.startsWith('tilmeld/')) ?? []).length &&
                 (!tilmeld.currentUser ||
                     (!tilmeld.currentUser.abilities?.includes('system/admin') &&
                         !tilmeld.currentUser.abilities?.includes('tilmeld/admin')))) {
@@ -650,14 +658,14 @@ let User = (() => {
             super.$putData(data, sdata, source);
             // TODO: Fix these being added by the drivers.
             // @ts-ignore
-            delete this.$data.acRead;
+            delete this.acRead;
             // @ts-ignore
-            delete this.$data.acWrite;
+            delete this.acWrite;
             // @ts-ignore
-            delete this.$data.acFull;
+            delete this.acFull;
             if (source === 'server') {
-                this.$originalEmail = this.$data.email;
-                this.$originalUsername = this.$data.username;
+                this.$originalEmail = this.email;
+                this.$originalUsername = this.username;
             }
             this.$updateDataProtection();
         }
@@ -670,8 +678,8 @@ let User = (() => {
             const tilmeld = enforceTilmeld(this);
             let user = givenUser ?? tilmeld.User.current();
             let [_username, domain] = tilmeld.config.domainSupport
-                ? splitn(this.$originalUsername ?? this.$data.username ?? '', '@', 2)
-                : [this.$originalUsername ?? this.$data.username, null];
+                ? splitn(this.$originalUsername ?? this.username ?? '', '@', 2)
+                : [this.$originalUsername ?? this.username, null];
             // Lowercase the domain part.
             if (domain) {
                 domain = domain.toLowerCase();
@@ -685,9 +693,7 @@ let User = (() => {
             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 abilities = (isCurrentUser || user == null ? this.abilities : user?.abilities) ?? [];
             const isNewUser = this.guid == null;
             const isDomainUser = tilmeld.config.domainSupport &&
                 !isCurrentUser &&
@@ -831,10 +837,10 @@ let User = (() => {
             }
         }
         $updateGroupDataProtection() {
-            if (this.$data.group != null && !this.$data.group.$asleep()) {
-                this.$data.group.$updateDataProtection();
+            if (this.group != null && !this.group.$asleep()) {
+                this.group.$updateDataProtection();
             }
-            for (let group of this.$data.groups ?? []) {
+            for (let group of this.groups ?? []) {
                 if (!group.$asleep()) {
                     group.$updateDataProtection();
                 }
@@ -865,23 +871,23 @@ let User = (() => {
                 this.$gatekeeperCache = await this.$getGatekeeperCache();
             }
             return ((ability in this.$gatekeeperCache && !!this.$gatekeeperCache[ability]) ||
-                !!this.$data.abilities?.includes('system/admin'));
+                !!this.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 ?? []) {
+            let abilities = this.abilities ?? [];
+            if (this.inheritAbilities) {
+                await Promise.all(this.groups?.map((e) => e.$wake()) || []);
+                for (let curGroup of this.groups ?? []) {
                     if (curGroup.enabled) {
                         abilities = abilities.concat(curGroup.abilities ?? []);
                     }
                 }
-                await this.$data.group?.$wake();
-                const group = this.$data.group;
+                await this.group?.$wake();
+                const group = this.group;
                 if (group != null && group.cdate != null && group.enabled) {
                     abilities = abilities.concat(group.abilities ?? []);
                 }
@@ -906,56 +912,56 @@ let User = (() => {
             }
             let success = true;
             const verifyUrl = `${tilmeld.config.appUrl.replace(/\/$/, () => '')}${tilmeld.config.setupPath}/verify`;
-            if (this.$data.secret != null) {
-                const link = `${verifyUrl}?action=verify&id=${encodeURIComponent(this.guid)}&secret=${encodeURIComponent(this.$data.secret)}`;
+            if (this.secret != null) {
+                const link = `${verifyUrl}?action=verify&id=${encodeURIComponent(this.guid)}&secret=${encodeURIComponent(this.secret)}`;
                 success =
                     success &&
                         (await tilmeld.config.sendEmail(tilmeld, {
                             template: 'VerifyEmail',
                             message: {
                                 to: {
-                                    name: this.$data.name ?? '',
-                                    address: this.$data.email ?? '',
+                                    name: this.name ?? '',
+                                    address: this.email ?? '',
                                 },
                             },
                             locals: { verifyLink: link },
                         }, this));
             }
-            if (this.$data.newEmailSecret != null) {
-                const link = `${verifyUrl}?action=verifychange&id=${encodeURIComponent(this.guid)}&secret=${encodeURIComponent(this.$data.newEmailSecret)}`;
+            if (this.newEmailSecret != null) {
+                const link = `${verifyUrl}?action=verifychange&id=${encodeURIComponent(this.guid)}&secret=${encodeURIComponent(this.newEmailSecret)}`;
                 success =
                     success &&
                         (await tilmeld.config.sendEmail(tilmeld, {
                             template: 'VerifyEmailChange',
                             message: {
                                 to: {
-                                    name: this.$data.name ?? '',
-                                    address: this.$data.newEmailAddress ?? '',
+                                    name: this.name ?? '',
+                                    address: this.newEmailAddress ?? '',
                                 },
                             },
                             locals: {
                                 verifyLink: link,
-                                oldEmail: this.$data.cancelEmailAddress,
-                                newEmail: this.$data.newEmailAddress,
+                                oldEmail: this.cancelEmailAddress,
+                                newEmail: this.newEmailAddress,
                             },
                         }, this));
             }
-            if (this.$data.cancelEmailSecret != null) {
-                const link = `${verifyUrl}?action=cancelchange&id=${encodeURIComponent(this.guid)}&secret=${encodeURIComponent(this.$data.cancelEmailSecret)}`;
+            if (this.cancelEmailSecret != null) {
+                const link = `${verifyUrl}?action=cancelchange&id=${encodeURIComponent(this.guid)}&secret=${encodeURIComponent(this.cancelEmailSecret)}`;
                 success =
                     success &&
                         (await tilmeld.config.sendEmail(tilmeld, {
                             template: 'CancelEmailChange',
                             message: {
                                 to: {
-                                    name: this.$data.name ?? '',
-                                    address: this.$data.cancelEmailAddress ?? '',
+                                    name: this.name ?? '',
+                                    address: this.cancelEmailAddress ?? '',
                                 },
                             },
                             locals: {
                                 cancelLink: link,
-                                oldEmail: this.$data.cancelEmailAddress,
-                                newEmail: this.$data.newEmailAddress ?? this.$data.email,
+                                oldEmail: this.cancelEmailAddress,
+                                newEmail: this.newEmailAddress ?? this.email,
                             },
                         }, this));
             }
@@ -968,14 +974,14 @@ let User = (() => {
          * @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;
+            await Promise.all(this.groups?.map((e) => e.$wake()) || []);
+            let groups = this.groups;
             if (groups == null) {
                 groups = [];
             }
             if (!group.$inArray(groups)) {
                 groups.push(group);
-                this.$data.groups = groups;
+                this.groups = groups;
                 return groups;
             }
             return true;
@@ -990,16 +996,16 @@ let User = (() => {
             const tilmeld = enforceTilmeld(this);
             switch (tilmeld.config.pwMethod) {
                 case 'plain':
-                    return this.$data.password === password;
+                    return this.password === password;
                 case 'digest':
-                    return (this.$data.password ===
+                    return (this.password ===
                         crypto.createHash('sha256').update(password).digest('base64'));
                 case 'salt':
                 default:
-                    return (this.$data.password ===
+                    return (this.password ===
                         crypto
                             .createHash('sha256')
-                            .update(password + this.$data.salt)
+                            .update(password + this.salt)
                             .digest('base64'));
             }
         }
@@ -1010,17 +1016,17 @@ let User = (() => {
          * @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)) {
+            await Promise.all(this.groups?.map((e) => e.$wake()) || []);
+            let groups = this.groups || [];
+            if (this.groups != null && group.$inArray(groups)) {
                 const newGroups = [];
                 for (let curGroup of groups) {
                     if (!group.$is(curGroup)) {
                         newGroups.push(curGroup);
                     }
                 }
-                this.$data.groups = newGroups;
-                return this.$data.groups;
+                this.groups = newGroups;
+                return this.groups;
             }
             return true;
         }
@@ -1032,17 +1038,17 @@ let User = (() => {
          */
         async $inGroup(group) {
             if (typeof group === 'string') {
-                if (this.$data.group?.guid === group) {
+                if (this.group?.guid === group) {
                     return true;
                 }
-                for (let curGroup of this.$data.groups ?? []) {
+                for (let curGroup of this.groups ?? []) {
                     if (curGroup.guid === group) {
                         return true;
                     }
                 }
                 return false;
             }
-            return (group.$is(this.$data.group) || group.$inArray(this.$data.groups ?? []));
+            return group.$is(this.group) || group.$inArray(this.groups ?? []);
         }
         /**
          * Check whether the user is a descendant of a group.
@@ -1052,14 +1058,14 @@ let User = (() => {
          */
         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))) {
+            await this.group?.$wake();
+            if (this.group != null &&
+                this.group?.cdate != null &&
+                (await this.group?.$isDescendant(group))) {
                 return true;
             }
-            await Promise.all(this.$data.groups?.map((e) => e.$wake()) || []);
-            for (let curGroup of this.$data.groups ?? []) {
+            await Promise.all(this.groups?.map((e) => e.$wake()) || []);
+            for (let curGroup of this.groups ?? []) {
                 if (await curGroup.$isDescendant(group)) {
                     return true;
                 }
@@ -1073,17 +1079,17 @@ let User = (() => {
          * @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}".`);
+            this.$nymph.config.debugLog('tilmeld', `Password change request for "${this.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}".`);
+                this.$nymph.config.debugLog('tilmeld', `Incorrect password for change request for "${this.username}".`);
                 return { result: false, message: 'Incorrect password.' };
             }
-            this.$data.passwordTemp = data.newPassword;
+            this.passwordTemp = data.newPassword;
             if (data.revokeCurrentTokens) {
-                this.$data.revokeTokenDate = Date.now();
+                this.revokeTokenDate = Date.now();
             }
             try {
                 await this.$save();
@@ -1107,26 +1113,26 @@ let User = (() => {
             const tilmeld = enforceTilmeld(this);
             switch (tilmeld.config.pwMethod) {
                 case 'plain':
-                    delete this.$data.salt;
-                    this.$data.password = password;
+                    delete this.salt;
+                    this.password = password;
                     break;
                 case 'digest':
-                    delete this.$data.salt;
-                    this.$data.password = crypto
+                    delete this.salt;
+                    this.password = crypto
                         .createHash('sha256')
                         .update(password)
                         .digest('base64');
                     break;
                 case 'salt':
                 default:
-                    this.$data.salt = nanoid();
-                    this.$data.password = crypto
+                    this.salt = nanoid();
+                    this.password = crypto
                         .createHash('sha256')
-                        .update(password + this.$data.salt)
+                        .update(password + this.salt)
                         .digest('base64');
                     break;
             }
-            return this.$data.password;
+            return this.password;
         }
         /**
          * A frontend accessible method to revoke all currently issued tokens.
@@ -1138,7 +1144,7 @@ let User = (() => {
             if (!this.$checkPassword(data.password ?? '')) {
                 return { result: false, message: 'Incorrect password.' };
             }
-            this.$data.revokeTokenDate = Date.now();
+            this.revokeTokenDate = Date.now();
             try {
                 await this.$save();
                 const tilmeld = enforceTilmeld(this);
@@ -1153,7 +1159,7 @@ let User = (() => {
             }
         }
         $hasTOTPSecret() {
-            return this.$data.totpSecret != null;
+            return this.totpSecret != null;
         }
         /**
          * Check the given code against the user's TOTP secret.
@@ -1162,17 +1168,17 @@ let User = (() => {
          * @returns True if the code is valid, otherwise false.
          */
         $checkTOTPCode(code) {
-            if (this.$data.totpSecret == null) {
+            if (this.totpSecret == null) {
                 return false;
             }
             const tilmeld = enforceTilmeld(this);
             const totp = new TOTP({
                 issuer: tilmeld.config.appName,
-                label: this.$data.username,
+                label: this.username,
                 algorithm: 'SHA1',
                 digits: 6,
                 period: 30,
-                secret: this.$data.totpSecret,
+                secret: this.totpSecret,
             });
             return totp.validate({ token: code, window: 2 }) != null;
         }
@@ -1183,13 +1189,13 @@ let User = (() => {
          */
         async $getNewTOTPSecret() {
             const tilmeld = enforceTilmeld(this);
-            if (this.$data.totpSecret != null) {
+            if (this.totpSecret != null) {
                 throw new BadDataError('You already have a 2FA secret.');
             }
             const secret = new Secret();
             const totp = new TOTP({
                 issuer: tilmeld.config.appName,
-                label: this.$data.username,
+                label: this.username,
                 algorithm: 'SHA1',
                 digits: 6,
                 period: 30,
@@ -1209,7 +1215,7 @@ let User = (() => {
             if (!this.$checkPassword(data.password ?? '')) {
                 return { result: false, message: 'Incorrect password.' };
             }
-            if (this.$data.totpSecret != null) {
+            if (this.totpSecret != null) {
                 return { result: false, message: 'You already have a 2FA secret.' };
             }
             if (data.secret == null ||
@@ -1225,7 +1231,7 @@ let User = (() => {
             const tilmeld = enforceTilmeld(this);
             const totp = new TOTP({
                 issuer: tilmeld.config.appName,
-                label: this.$data.username,
+                label: this.username,
                 algorithm: 'SHA1',
                 digits: 6,
                 period: 30,
@@ -1234,7 +1240,7 @@ let User = (() => {
             if (totp.validate({ token: data.code, window: 2 }) == null) {
                 return { result: false, message: '2FA code is incorrect.' };
             }
-            this.$data.totpSecret = data.secret;
+            this.totpSecret = data.secret;
             try {
                 await this.$save();
                 return { result: true, message: 'Your two factor secret is now set.' };
@@ -1261,16 +1267,16 @@ let User = (() => {
                     data.code.length !== 6) {
                     return { result: false, message: '2FA code is invalid.' };
                 }
-                if (this.$data.totpSecret == null) {
+                if (this.totpSecret == null) {
                     return { result: false, message: "You don't have a 2FA secret." };
                 }
                 const totp = new TOTP({
                     issuer: tilmeld.config.appName,
-                    label: this.$data.username,
+                    label: this.username,
                     algorithm: 'SHA1',
                     digits: 6,
                     period: 30,
-                    secret: this.$data.totpSecret,
+                    secret: this.totpSecret,
                 });
                 if (totp.validate({ token: data.code, window: 2 }) == null) {
                     return { result: false, message: '2FA code is incorrect.' };
@@ -1282,7 +1288,7 @@ let User = (() => {
                     message: 'You must provide your password and 2FA code.',
                 };
             }
-            delete this.$data.totpSecret;
+            delete this.totpSecret;
             try {
                 await this.$save();
                 return { result: true, message: 'Two factor secret has been removed.' };
@@ -1298,18 +1304,18 @@ let User = (() => {
          */
         async $checkUsername() {
             const tilmeld = enforceTilmeld(this);
-            this.$nymph.config.debugInfo('tilmeld', `Username check "${this.$data.username}".`);
+            this.$nymph.config.debugInfo('tilmeld', `Username check "${this.username}".`);
             if (!tilmeld.config.emailUsernames) {
                 let [username, domain] = tilmeld.config.domainSupport
-                    ? splitn(this.$data.username ?? '', '@', 2)
-                    : [this.$data.username, null];
+                    ? splitn(this.username ?? '', '@', 2)
+                    : [this.username, null];
                 // Lowercase the domain part.
                 if (domain) {
                     domain = domain.toLowerCase();
-                    this.$data.username = `${username}@${domain}`;
+                    this.username = `${username}@${domain}`;
                 }
-                if (this.$data.username == null ||
-                    !this.$data.username.length ||
+                if (this.username == null ||
+                    !this.username.length ||
                     username == null ||
                     !username.length) {
                     return { result: false, message: 'Please specify a username.' };
@@ -1357,7 +1363,7 @@ let User = (() => {
                     type: '&',
                     ilike: [
                         'username',
-                        this.$data.username.replace(/([\\%_])/g, (s) => `\\${s}`),
+                        this.username.replace(/([\\%_])/g, (s) => `\\${s}`),
                     ],
                 };
                 if (this.guid != null) {
@@ -1371,7 +1377,7 @@ let User = (() => {
                     .checkUsernameCallbacks) {
                     if (callback) {
                         const result = await callback(this, {
-                            username: this.$data.username,
+                            username: this.username,
                         });
                         if (!result.result) {
                             return { message: 'Username is not available.', ...result };
@@ -1384,11 +1390,11 @@ let User = (() => {
                 };
             }
             else {
-                this.$data.email = this.$data.username;
-                if (this.$data.username == null || !this.$data.username.length) {
+                this.email = this.username;
+                if (this.username == null || !this.username.length) {
                     return { result: false, message: 'Please specify an email.' };
                 }
-                if (this.$data.username.length < tilmeld.config.minUsernameLength) {
+                if (this.username.length < tilmeld.config.minUsernameLength) {
                     return {
                         result: false,
                         message: 'Emails must be at least ' +
@@ -1396,7 +1402,7 @@ let User = (() => {
                             ' characters.',
                     };
                 }
-                if (this.$data.username.length > tilmeld.config.maxUsernameLength) {
+                if (this.username.length > tilmeld.config.maxUsernameLength) {
                     return {
                         result: false,
                         message: 'Emails must not exceed ' +
@@ -1414,8 +1420,8 @@ let User = (() => {
          */
         async $checkEmail() {
             const tilmeld = enforceTilmeld(this);
-            this.$nymph.config.debugInfo('tilmeld', `Email check "${this.$data.email}".`);
-            if (this.$data.email == null || !this.$data.email.length) {
+            this.$nymph.config.debugInfo('tilmeld', `Email check "${this.email}".`);
+            if (this.email == null || !this.email.length) {
                 if (tilmeld.config.verifyEmail) {
                     return { result: false, message: 'Please specify an email.' };
                 }
@@ -1423,12 +1429,12 @@ let User = (() => {
                     return { result: true, message: '' };
                 }
             }
-            if (!tilmeld.config.validEmailRegex.test(this.$data.email)) {
+            if (!tilmeld.config.validEmailRegex.test(this.email)) {
                 return { result: false, message: tilmeld.config.validEmailRegexNotice };
             }
             const selector = {
                 type: '&',
-                ilike: ['email', this.$data.email.replace(/([\\%_])/g, (s) => `\\${s}`)],
+                ilike: ['email', this.email.replace(/([\\%_])/g, (s) => `\\${s}`)],
             };
             if (this.guid != null) {
                 selector['!guid'] = this.guid;
@@ -1452,11 +1458,11 @@ let User = (() => {
          */
         async $checkPhone() {
             const tilmeld = enforceTilmeld(this);
-            this.$nymph.config.debugInfo('tilmeld', `Phone check "${this.$data.phone}".`);
-            if (this.$data.phone == null || !this.$data.phone.length) {
+            this.$nymph.config.debugInfo('tilmeld', `Phone check "${this.phone}".`);
+            if (this.phone == null || !this.phone.length) {
                 return { result: false, message: 'Please specify a phone number.' };
             }
-            const stripToDigits = this.$data.phone.replace(/\D/g, () => '');
+            const stripToDigits = this.phone.replace(/\D/g, () => '');
             if (!/\d{10}/.test(stripToDigits)) {
                 return {
                     result: false,
@@ -1508,16 +1514,16 @@ let User = (() => {
             }
             this.$password(data.password);
             if (tilmeld.config.regFields.includes('name')) {
-                this.$data.name =
-                    this.$data.nameFirst +
-                        (this.$data.nameMiddle == null ? '' : ' ' + this.$data.nameMiddle) +
-                        (this.$data.nameLast == null ? '' : ' ' + this.$data.nameLast);
-                if (this.$data.name === '') {
-                    this.$data.name = this.$data.username;
+                this.name =
+                    this.nameFirst +
+                        (this.nameMiddle == null ? '' : ' ' + this.nameMiddle) +
+                        (this.nameLast == null ? '' : ' ' + this.nameLast);
+                if (this.name === '') {
+                    this.name = this.username;
                 }
             }
             if (tilmeld.config.emailUsernames) {
-                this.$data.email = this.$data.username;
+                this.email = this.username;
             }
             try {
                 const result = await transaction(this.$nymph, 'tilmeld-register-' + nanoid(), async (nymph) => {
@@ -1535,11 +1541,11 @@ let User = (() => {
                         tilmeld.config.verifyEmail) {
                         // The user will be enabled after verifying their e-mail address.
                         if (!tilmeld.config.unverifiedAccess) {
-                            this.$data.enabled = false;
+                            this.enabled = false;
                         }
                     }
                     else {
-                        this.$data.enabled = true;
+                        this.enabled = true;
                     }
                     // If createAdmin is true and there are no other users, grant
                     // "system/admin".
@@ -1557,11 +1563,11 @@ let User = (() => {
                         }
                         if (!otherUsers.length) {
                             this.$grant('system/admin');
-                            this.$data.enabled = true;
+                            this.enabled = true;
                             madeAdmin = true;
                         }
                     }
-                    this.$nymph.config.debugLog('tilmeld', `Registering new user "${this.$data.username}".`);
+                    this.$nymph.config.debugLog('tilmeld', `Registering new user "${this.username}".`);
                     await this.$saveSkipAC();
                     // Finish up.
                     if (tilmeld.config.verifyEmail &&
@@ -1569,7 +1575,7 @@ let User = (() => {
                         !madeAdmin &&
                         tilmeld.config.userFields.includes('email')) {
                         message +=
-                            `Almost there. An email has been sent to ${this.$data.email} ` +
+                            `Almost there. An email has been sent to ${this.email} ` +
                                 'with a verification link for you to finish registration.';
                     }
                     else if (tilmeld.config.verifyEmail &&
@@ -1581,7 +1587,7 @@ let User = (() => {
                         }
                         message +=
                             "You're now logged in! An email has been sent to " +
-                                `${this.$data.email} with a verification link for you to finish ` +
+                                `${this.email} with a verification link for you to finish ` +
                                 'registration.';
                         loggedin = true;
                     }
@@ -1609,19 +1615,19 @@ let User = (() => {
                             template: 'UserRegistered',
                             message: { to: tilmeld.config.userRegisteredRecipient },
                             locals: {
-                                userUsername: this.$data.username,
-                                userName: this.$data.name,
-                                userFirstName: this.$data.nameFirst,
-                                userLastName: this.$data.nameLast,
-                                userEmail: this.$data.email,
-                                userPhone: this.$data.phone,
+                                userUsername: this.username,
+                                userName: this.name,
+                                userFirstName: this.nameFirst,
+                                userLastName: this.nameLast,
+                                userEmail: this.email,
+                                userPhone: this.phone,
                             },
                         }, this))) {
                             throw new Error('Failed to send.');
                         }
                     }
                     catch (e) {
-                        this.$nymph.config.debugError('tilmeld', `Couldn't send new user registered email for "${this.$data.username}": ${e.message}`);
+                        this.$nymph.config.debugError('tilmeld', `Couldn't send new user registered email for "${this.username}": ${e.message}`);
                     }
                 }
                 if (result.loggedin) {
@@ -1644,24 +1650,24 @@ let User = (() => {
         }
         async $save() {
             let tilmeld = enforceTilmeld(this);
-            if (this.$data.username == null || !this.$data.username.trim().length) {
+            if (this.username == null || !this.username.trim().length) {
                 throw new BadUsernameError('Username must not be empty.');
             }
             if (!this.$skipAcWhenSaving &&
                 tilmeld.gatekeeper('tilmeld/admin') &&
                 !tilmeld.gatekeeper('system/admin') &&
-                this.$data.abilities?.includes('system/admin')) {
+                this.abilities?.includes('system/admin')) {
                 throw new AccessControlError("You don't have the authority to modify system admins.");
             }
             // Lowercase the domain part.
             if (tilmeld.config.domainSupport) {
-                const [username, domain] = splitn(this.$data.username ?? '', '@', 2);
+                const [username, domain] = splitn(this.username ?? '', '@', 2);
                 if (domain) {
-                    this.$data.username = `${username}@${domain.toLowerCase()}`;
+                    this.username = `${username}@${domain.toLowerCase()}`;
                 }
             }
             if (tilmeld.config.domainSupport) {
-                const [_username, domain] = splitn(this.$data.username ?? '', '@', 2);
+                const [_username, domain] = splitn(this.username ?? '', '@', 2);
                 const [_originalUsername, originalDomain] = splitn(this.$originalUsername ?? '', '@', 2);
                 if (this.guid != null &&
                     ((originalDomain == null && domain != null) ||
@@ -1686,86 +1692,80 @@ let User = (() => {
             }
             let sendVerification = false;
             // Formatting.
-            this.$data.username = this.$data.username.trim();
+            this.username = this.username.trim();
             if (tilmeld.config.emailUsernames) {
-                this.$data.email = this.$data.username;
-            }
-            this.$data.nameFirst = (this.$data.nameFirst ?? '').trim();
-            this.$data.nameMiddle = (this.$data.nameMiddle ?? '').trim();
-            this.$data.nameLast = (this.$data.nameLast ?? '').trim();
-            this.$data.phone = (this.$data.phone ?? '').trim();
-            this.$data.name =
-                this.$data.nameFirst +
-                    (this.$data.nameMiddle ? ' ' + this.$data.nameMiddle : '') +
-                    (this.$data.nameLast ? ' ' + this.$data.nameLast : '');
-            this.$data.enabled = !!this.$data.enabled;
+                this.email = this.username;
+            }
+            this.nameFirst = (this.nameFirst ?? '').trim();
+            this.nameMiddle = (this.nameMiddle ?? '').trim();
+            this.nameLast = (this.nameLast ?? '').trim();
+            this.phone = (this.phone ?? '').trim();
+            this.name =
+                this.nameFirst +
+                    (this.nameMiddle ? ' ' + this.nameMiddle : '') +
+                    (this.nameLast ? ' ' + this.nameLast : '');
+            this.enabled = !!this.enabled;
             // Clear empty values.
-            if (this.$data.nameFirst === '' ||
-                !tilmeld.config.userFields.includes('name')) {
-                delete this.$data.nameFirst;
+            if (this.nameFirst === '' || !tilmeld.config.userFields.includes('name')) {
+                delete this.nameFirst;
             }
-            if (this.$data.nameMiddle === '' ||
-                !tilmeld.config.userFields.includes('name')) {
-                delete this.$data.nameMiddle;
+            if (this.nameMiddle === '' || !tilmeld.config.userFields.includes('name')) {
+                delete this.nameMiddle;
             }
-            if (this.$data.nameLast === '' ||
-                !tilmeld.config.userFields.includes('name')) {
-                delete this.$data.nameLast;
+            if (this.nameLast === '' || !tilmeld.config.userFields.includes('name')) {
+                delete this.nameLast;
             }
-            if (this.$data.name === '' || !tilmeld.config.userFields.includes('name')) {
-                delete this.$data.name;
+            if (this.name === '' || !tilmeld.config.userFields.includes('name')) {
+                delete this.name;
             }
-            if (this.$data.email === '' ||
-                !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.email;
+            if (this.email === '' || !tilmeld.config.userFields.includes('email')) {
+                delete this.email;
             }
-            if (this.$data.avatar === '') {
-                delete this.$data.avatar;
+            if (this.avatar === '') {
+                delete this.avatar;
             }
-            if (this.$data.phone === '' ||
-                !tilmeld.config.userFields.includes('phone')) {
-                delete this.$data.phone;
+            if (this.phone === '' || !tilmeld.config.userFields.includes('phone')) {
+                delete this.phone;
             }
-            if (this.$data.secret === '' ||
-                !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.secret;
+            if (this.secret === '' || !tilmeld.config.userFields.includes('email')) {
+                delete this.secret;
             }
-            if (this.$data.emailChangeDate === 0 ||
+            if (this.emailChangeDate === 0 ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.emailChangeDate;
+                delete this.emailChangeDate;
             }
-            if (this.$data.newEmailSecret === '' ||
+            if (this.newEmailSecret === '' ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.newEmailSecret;
+                delete this.newEmailSecret;
             }
-            if (this.$data.newEmailAddress === '' ||
+            if (this.newEmailAddress === '' ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.newEmailAddress;
+                delete this.newEmailAddress;
             }
-            if (this.$data.cancelEmailSecret === '' ||
+            if (this.cancelEmailSecret === '' ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.cancelEmailSecret;
+                delete this.cancelEmailSecret;
             }
-            if (this.$data.cancelEmailAddress === '' ||
+            if (this.cancelEmailAddress === '' ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.cancelEmailAddress;
+                delete this.cancelEmailAddress;
             }
-            if (this.$data.recoverSecret === '' ||
+            if (this.recoverSecret === '' ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.recoverSecret;
+                delete this.recoverSecret;
             }
-            if (this.$data.recoverSecretDate === 0 ||
+            if (this.recoverSecretDate === 0 ||
                 !tilmeld.config.userFields.includes('email')) {
-                delete this.$data.recoverSecretDate;
+                delete this.recoverSecretDate;
             }
-            if (this.$data.password === '') {
-                delete this.$data.password;
+            if (this.password === '') {
+                delete this.password;
             }
-            if (this.$data.passwordTemp === '') {
-                delete this.$data.passwordTemp;
+            if (this.passwordTemp === '') {
+                delete this.passwordTemp;
             }
-            if (this.$data.inheritAbilities === false) {
-                delete this.$data.inheritAbilities;
+            if (this.inheritAbilities === false) {
+                delete this.inheritAbilities;
             }
             // Verification.
             const unCheck = await this.$checkUsername();
@@ -1789,67 +1789,67 @@ let User = (() => {
                     if (this.guid == null) {
                         // 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 = nanoid();
+                        if (!this.abilities?.includes('system/admin')) {
+                            this.secret = nanoid();
                             sendVerification = true;
                         }
                     }
                     else if (this.$originalEmail != null &&
-                        this.$originalEmail !== this.$data.email) {
+                        this.$originalEmail !== this.email) {
                         // The user already has an old email address.
                         if (tilmeld.config.emailRateLimit !== '' &&
-                            this.$data.emailChangeDate != null &&
-                            this.$data.emailChangeDate >=
+                            this.emailChangeDate != null &&
+                            this.emailChangeDate >=
                                 (strtotime('-' + tilmeld.config.emailRateLimit) || 0) * 1000) {
                             throw new EmailChangeRateLimitExceededError('You already changed your email address recently. Please wait until ' +
-                                new Date((strtotime('+' + tilmeld.config.emailRateLimit, Math.floor(this.$data.emailChangeDate / 1000)) || 0) * 1000).toString() +
+                                new Date((strtotime('+' + tilmeld.config.emailRateLimit, Math.floor(this.emailChangeDate / 1000)) || 0) * 1000).toString() +
                                 ' to change your email address again.');
                         }
                         else {
-                            if (this.$data.newEmailSecret == null &&
+                            if (this.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 <
+                                (this.emailChangeDate == null ||
+                                    this.emailChangeDate <
                                         (strtotime('-' + tilmeld.config.emailRateLimit) || 0) * 1000)) {
                                 // Save the old email in case the cancel change link is clicked.
-                                this.$data.cancelEmailAddress = this.$originalEmail;
-                                this.$data.cancelEmailSecret = nanoid();
-                                this.$data.emailChangeDate = Date.now();
+                                this.cancelEmailAddress = this.$originalEmail;
+                                this.cancelEmailSecret = nanoid();
+                                this.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;
+                            this.newEmailAddress = this.email;
+                            this.email = this.$originalEmail;
                             if (tilmeld.config.emailUsernames) {
-                                this.$data.username = this.$data.email;
+                                this.username = this.email;
                             }
-                            this.$data.newEmailSecret = nanoid();
+                            this.newEmailSecret = nanoid();
                             sendVerification = true;
                         }
                     }
                 }
                 else if (this.guid != null &&
                     this.$originalEmail != null &&
-                    this.$originalEmail !== this.$data.email &&
+                    this.$originalEmail !== this.email &&
                     // Make sure the user has at least the rate limit time to cancel an
                     // email change.
-                    (this.$data.emailChangeDate == null ||
-                        this.$data.emailChangeDate <
+                    (this.emailChangeDate == null ||
+                        this.emailChangeDate <
                             (strtotime('-' + tilmeld.config.emailRateLimit) || 0) * 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 = nanoid();
+                    this.cancelEmailAddress = this.$originalEmail;
+                    this.cancelEmailSecret = nanoid();
                     sendVerification = true;
                 }
             }
-            if (this.$data.passwordTemp != null) {
-                this.$password(this.$data.passwordTemp);
+            if (this.passwordTemp != null) {
+                this.$password(this.passwordTemp);
             }
-            delete this.$data.passwordTemp;
-            if (this.$data.password == null) {
+            delete this.passwordTemp;
+            if (this.password == null) {
                 throw new BadDataError('A password is required.');
             }
             let preGuid = this.guid;
@@ -1859,7 +1859,7 @@ let User = (() => {
                 this.$setNymph(nymph);
                 const tilmeld = enforceTilmeld(this);
                 const Group = this.$nymph.getEntityClass(GroupClass);
-                let group = this.$data.group;
+                let group = this.group;
                 if (group != null) {
                     // Make sure to get fresh group data.
                     if (group.$asleep()) {
@@ -1885,53 +1885,53 @@ let User = (() => {
                         // Add the default primary.
                         const group = await this.$nymph.getEntity({ class: Group }, { type: '&', equal: ['defaultPrimary', true] });
                         if (group != null) {
-                            this.$data.group = group;
+                            this.group = group;
                         }
                     }
                 }
                 if (group != null && group.user != null && this.$is(group.user)) {
                     // Update the user's generated primary group.
                     let changed = false;
-                    if (group.groupname !== this.$data.username) {
-                        group.groupname = this.$data.username;
+                    if (group.groupname !== this.username) {
+                        group.groupname = this.username;
                         changed = true;
                     }
-                    if (group.avatar !== this.$data.avatar) {
-                        group.avatar = this.$data.avatar;
+                    if (group.avatar !== this.avatar) {
+                        group.avatar = this.avatar;
                         changed = true;
                     }
                     if (tilmeld.config.userFields.includes('email') &&
-                        group.email !== this.$data.email) {
-                        group.email = this.$data.email;
+                        group.email !== this.email) {
+                        group.email = this.email;
                         changed = true;
                     }
                     if (tilmeld.config.userFields.includes('name') &&
-                        group.name !== this.$data.name) {
-                        group.name = this.$data.name;
+                        group.name !== this.name) {
+                        group.name = this.name;
                         changed = true;
                     }
                     if (tilmeld.config.userFields.includes('phone') &&
-                        group.phone !== this.$data.phone) {
-                        group.phone = this.$data.phone;
+                        group.phone !== this.phone) {
+                        group.phone = this.phone;
                         changed = true;
                     }
                     if (changed || group.guid == null) {
                         await group.$saveSkipAC();
                     }
-                    this.$data.group = group;
+                    this.group = group;
                 }
-                if (this.$data.groups == null || this.$data.groups.length === 0) {
+                if (this.groups == null || this.groups.length === 0) {
                     // Add secondary groups.
                     if (tilmeld.config.userFields.includes('email') &&
                         tilmeld.config.verifyEmail &&
                         tilmeld.config.unverifiedAccess &&
-                        this.$data.secret != null) {
+                        this.secret != null) {
                         // Add the default secondaries for unverified users.
-                        this.$data.groups = await this.$nymph.getEntities({ class: Group }, { type: '&', equal: ['unverifiedSecondary', true] });
+                        this.groups = await this.$nymph.getEntities({ class: Group }, { type: '&', equal: ['unverifiedSecondary', true] });
                     }
                     else {
                         // Add the default secondaries.
-                        this.$data.groups = await this.$nymph.getEntities({ class: Group }, { type: '&', equal: ['defaultSecondary', true] });
+                        this.groups = await this.$nymph.getEntities({ class: Group }, { type: '&', equal: ['defaultSecondary', true] });
                     }
                 }
                 try {
@@ -1943,7 +1943,7 @@ let User = (() => {
                 for (let callback of this.constructor
                     .beforeSaveCallbacks) {
                     if (callback) {
-                        await callback(this.$proxy());
+                        await callback(this);
                     }
                 }
                 await super.$save();
@@ -1958,14 +1958,14 @@ let User = (() => {
                 for (let callback of this.constructor
                     .afterSaveCallbacks) {
                     if (callback) {
-                        await callback(this.$proxy());
+                        await callback(this);
                     }
                 }
             }, async (nymph, committed) => {
                 this.$setNymph(nymph);
                 if (committed) {
-                    this.$originalEmail = this.$data.email;
-                    this.$originalUsername = this.$data.username;
+                    this.$originalEmail = this.email;
+                    this.$originalUsername = this.username;
                     try {
                         const tilmeld = enforceTilmeld(nymph);
                         if (tilmeld.User.current(true).$is(this)) {
@@ -2005,21 +2005,21 @@ let User = (() => {
             }
             if (!this.$skipAcWhenDeleting &&
                 !tilmeld.gatekeeper('system/admin') &&
-                this.$data.abilities?.includes('system/admin')) {
+                this.abilities?.includes('system/admin')) {
                 throw new AccessControlError("You don't have the authority to delete system admins.");
             }
-            if (this.$data.username !== this.$originalUsername) {
+            if (this.username !== this.$originalUsername) {
                 throw new AccessControlError("You can't delete a user while switching their username.");
             }
             if (!(await this.$refresh())) {
                 throw new BadDataError('User could not be refreshed.');
             }
-            if (this.$data.group != null) {
-                if (this.$data.group.$asleep()) {
-                    await this.$data.group.$wake();
+            if (this.group != null) {
+                if (this.group.$asleep()) {
+                    await this.group.$wake();
                 }
                 else {
-                    if (!(await this.$data.group.$refresh())) {
+                    if (!(await this.group.$refresh())) {
                         throw new BadDataError('Group could not be refreshed.');
                     }
                 }
@@ -2027,23 +2027,23 @@ let User = (() => {
             for (let callback of this.constructor
                 .beforeDeleteCallbacks) {
                 if (callback) {
-                    await callback(this.$proxy());
+                    await callback(this);
                 }
             }
             if (tilmeld.User.current(true).$is(this)) {
                 await this.$logout();
             }
-            if (this.$data.group != null && this.$is(this.$data.group.user)) {
+            if (this.group != null && this.$is(this.group.user)) {
                 // Read the skip ac value here, because super.$delete changes it.
                 const $skipAcWhenDeleting = this.$skipAcWhenDeleting;
                 // Delete the user.
                 await super.$delete();
                 // Delete the generated group.
                 if ($skipAcWhenDeleting) {
-                    await this.$data.group.$deleteSkipAC();
+                    await this.group.$deleteSkipAC();
                 }
                 else {
-                    await this.$data.group.$delete();
+                    await this.group.$delete();
                 }
             }
             else {
@@ -2052,7 +2052,7 @@ let User = (() => {
             for (let callback of this.constructor
                 .afterDeleteCallbacks) {
                 if (callback) {
-                    await callback(this.$proxy());
+                    await callback(this);
                 }
             }
         }
@@ -2094,14 +2094,5 @@ let User = (() => {
         }
     };
 })();
-/**
- * A user data model.
- *
- * Written by Hunter Perrin for SciActive.
- *
- * @author Hunter Perrin <hperrin@port87.com>
- * @copyright SciActive Inc
- * @see http://nymph.io/
- */
-export default User;
+export { User };
 //# sourceMappingURL=User.js.map