@nymphjs/tilmeld 1.0.0-beta.121 → 1.0.0-beta.123

package/src/User.ts

@@ -1,11 +1,12 @@
 import crypto from 'node:crypto';
-import type {
-  Nymph,
-  EntityData,
-  EntityJson,
-  EntityPatch,
-  Selector,
-  SerializedEntityData,
+import {
+  type EntityData,
+  type EntityJson,
+  type EntityPatch,
+  type Selector,
+  type SerializedEntityData,
+  transaction,
+  transactional,
 } from '@nymphjs/nymph';
 import { humanSecret, nanoid } from '@nymphjs/guid';
 import type { EmailOptions } from 'email-templates';
@@ -372,9 +373,7 @@ export default class User extends AbleObject<UserData> {
     const entity = new this();
     if (username != null) {
       const entity = await this.nymph.getEntity(
-        {
-          class: this,
-        },
+        { class: this },
         {
           type: '&',
           ilike: ['username', username.replace(/([\\%_])/g, (s) => `\\${s}`)],
@@ -413,10 +412,7 @@ export default class User extends AbleObject<UserData> {
   }): Promise<{ result: boolean; message: string }> {
     const tilmeld = enforceTilmeld(this);
     if (!tilmeld.config.pwRecovery) {
-      return {
-        result: false,
-        message: 'Account recovery is not allowed.',
-      };
+      return { result: false, message: 'Account recovery is not allowed.' };
     }
 
     let user: User & UserData;
@@ -444,10 +440,7 @@ export default class User extends AbleObject<UserData> {
       user = getUser;
       options.template = 'RecoverUsername';
       options.message = {
-        to: {
-          name: user.name ?? '',
-          address: user.email ?? '',
-        },
+        to: { name: user.name ?? '', address: user.email ?? '' },
       };
       options.locals = {};
     } else if (data.recoveryType === 'password') {
@@ -465,7 +458,9 @@ export default class User extends AbleObject<UserData> {
       // Create a unique secret.
       getUser.recoverSecret = humanSecret();
       getUser.recoverSecretDate = Date.now();
-      if (!(await getUser.$saveSkipAC())) {
+      try {
+        await getUser.$saveSkipAC();
+      } catch (e: any) {
         return { result: false, message: "Couldn't save recovery secret." };
       }
 
@@ -473,10 +468,7 @@ export default class User extends AbleObject<UserData> {
       user = getUser;
       options.template = 'RecoverPassword';
       options.message = {
-        to: {
-          name: user.name ?? '',
-          address: user.email ?? '',
-        },
+        to: { name: user.name ?? '', address: user.email ?? '' },
       };
       options.locals = {
         recoverCode: getUser.recoverSecret,
@@ -517,10 +509,7 @@ export default class User extends AbleObject<UserData> {
   }): Promise<{ result: boolean; message: string }> {
     const tilmeld = enforceTilmeld(this);
     if (!tilmeld.config.pwRecovery) {
-      return {
-        result: false,
-        message: 'Account recovery is not allowed.',
-      };
+      return { result: false, message: 'Account recovery is not allowed.' };
     }
 
     const user = await tilmeld.User.factoryUsername(data.username);
@@ -536,10 +525,7 @@ export default class User extends AbleObject<UserData> {
         1000 <
         Date.now()
     ) {
-      return {
-        result: false,
-        message: 'The secret code does not match.',
-      };
+      return { result: false, message: 'The secret code does not match.' };
     }
 
     if (!('password' in data) || !data.password.length) {
@@ -554,13 +540,14 @@ export default class User extends AbleObject<UserData> {
     user.$password(data.password);
     delete user.recoverSecret;
     delete user.recoverSecretDate;
-    if (await user.$saveSkipAC()) {
+    try {
+      await user.$saveSkipAC();
       return {
         result: true,
         message:
           'Your password has been reset. You can now log in using your new password.',
       };
-    } else {
+    } catch (e: any) {
       return { result: false, message: 'Error saving new password.' };
     }
   }
@@ -636,26 +623,10 @@ export default class User extends AbleObject<UserData> {
     return await this.nymph.getEntities(
       {
         class: this.nymph.getEntityClass(User),
-        ...(options?.limit != null
-          ? {
-              limit: options.limit,
-            }
-          : {}),
-        ...(options?.offset != null
-          ? {
-              offset: options.offset,
-            }
-          : {}),
-        ...(options?.sort != null
-          ? {
-              sort: options.sort,
-            }
-          : {}),
-        ...(options?.reverse != null
-          ? {
-              reverse: options.reverse,
-            }
-          : {}),
+        ...(options?.limit != null ? { limit: options.limit } : {}),
+        ...(options?.offset != null ? { offset: options.offset } : {}),
+        ...(options?.sort != null ? { sort: options.sort } : {}),
+        ...(options?.reverse != null ? { reverse: options.reverse } : {}),
       },
       {
         type: '&',
@@ -675,20 +646,6 @@ export default class User extends AbleObject<UserData> {
     this.$updateDataProtection();
   }
 
-  $setNymph(nymph: Nymph) {
-    this.$nymph = nymph;
-    if (!this.$asleep()) {
-      if (this.$data.group && this.$data.group.$nymph !== nymph) {
-        this.$data.group.$setNymph(nymph);
-      }
-      for (const group of this.$data.groups ?? []) {
-        if (group && group.$nymph !== nymph) {
-          group.$setNymph(nymph);
-        }
-      }
-    }
-  }
-
   async $getUniques(): Promise<string[]> {
     const tilmeld = enforceTilmeld(this);
     const uniques = [`u:${this.$data.username}`];
@@ -754,10 +711,7 @@ export default class User extends AbleObject<UserData> {
         }
       }
     } catch (e: any) {
-      return {
-        result: false,
-        message: e.message,
-      };
+      return { result: false, message: e.message };
     }
 
     this.$nymph.config.debugLog(
@@ -781,7 +735,9 @@ export default class User extends AbleObject<UserData> {
     return { result: true, message: 'You are logged in.' };
   }
 
-  public async $switchUser(data?: { additionalData?: { [k: string]: any } }) {
+  public async $switchUser(data?: {
+    additionalData?: { [k: string]: any };
+  }): Promise<{ result: boolean; message: string }> {
     const tilmeld = enforceTilmeld(this);
     if (this.guid == null) {
       return { result: false, message: 'Incorrect login/password.' };
@@ -831,10 +787,7 @@ export default class User extends AbleObject<UserData> {
         }
       }
     } catch (e: any) {
-      return {
-        result: false,
-        message: e.message,
-      };
+      return { result: false, message: e.message };
     }
 
     this.$nymph.config.debugLog(
@@ -862,7 +815,7 @@ export default class User extends AbleObject<UserData> {
    * Log a user out of the system.
    * @returns An object with a boolean 'result' entry and a 'message' entry.
    */
-  public async $logout() {
+  public async $logout(): Promise<{ result: boolean; message: string }> {
     const tilmeld = enforceTilmeld(this);
 
     try {
@@ -873,10 +826,7 @@ export default class User extends AbleObject<UserData> {
         }
       }
     } catch (e: any) {
-      return {
-        result: false,
-        message: e.message,
-      };
+      return { result: false, message: e.message };
     }
 
     this.$nymph.config.debugLog(
@@ -896,7 +846,7 @@ export default class User extends AbleObject<UserData> {
     return { result: true, message: 'You have been logged out.' };
   }
 
-  public $getAvatar() {
+  public $getAvatar(): string {
     if (this.$data.avatar != null && this.$data.avatar !== '') {
       return this.$data.avatar;
     }
@@ -1130,7 +1080,6 @@ export default class User extends AbleObject<UserData> {
       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');
@@ -1344,7 +1293,7 @@ export default class User extends AbleObject<UserData> {
    *
    * @returns True on success, false on failure.
    */
-  public async $sendEmailVerification() {
+  public async $sendEmailVerification(): Promise<boolean> {
     const tilmeld = enforceTilmeld(this);
     if (this.guid == null) {
       return false;
@@ -1371,9 +1320,7 @@ export default class User extends AbleObject<UserData> {
                 address: this.$data.email ?? '',
               },
             },
-            locals: {
-              verifyLink: link,
-            },
+            locals: { verifyLink: link },
           },
           this,
         ));
@@ -1581,13 +1528,14 @@ export default class User extends AbleObject<UserData> {
     if (data.revokeCurrentTokens) {
       this.$data.revokeTokenDate = Date.now();
     }
-    if (await this.$save()) {
+    try {
+      await this.$save();
       if (data.revokeCurrentTokens) {
         const tilmeld = enforceTilmeld(this);
         await tilmeld.login(this, true);
       }
       return { result: true, message: 'Your password has been changed.' };
-    } else {
+    } catch (e: any) {
       return { result: false, message: "Couldn't save new password." };
     }
   }
@@ -1639,19 +1587,20 @@ export default class User extends AbleObject<UserData> {
 
     this.$data.revokeTokenDate = Date.now();
 
-    if (await this.$save()) {
+    try {
+      await this.$save();
       const tilmeld = enforceTilmeld(this);
       await tilmeld.login(this, true);
       return {
         result: true,
         message: 'You have logged out of all other sessions.',
       };
-    } else {
+    } catch (e: any) {
       return { result: false, message: "Couldn't save revocation date." };
     }
   }
 
-  public async $hasTOTPSecret() {
+  public $hasTOTPSecret(): boolean {
     return this.$data.totpSecret != null;
   }
 
@@ -1685,7 +1634,11 @@ export default class User extends AbleObject<UserData> {
    *
    * @returns An object with 'uri', 'qrcode', and 'secret'.
    */
-  public async $getNewTOTPSecret() {
+  public async $getNewTOTPSecret(): Promise<{
+    uri: string;
+    qrcode: string;
+    secret: string;
+  }> {
     const tilmeld = enforceTilmeld(this);
 
     if (this.$data.totpSecret != null) {
@@ -1707,11 +1660,7 @@ export default class User extends AbleObject<UserData> {
 
     const qrcode = await toDataURL(uri);
 
-    return {
-      uri,
-      qrcode,
-      secret: secret.base32,
-    };
+    return { uri, qrcode, secret: secret.base32 };
   }
 
   /**
@@ -1766,9 +1715,10 @@ export default class User extends AbleObject<UserData> {
 
     this.$data.totpSecret = data.secret;
 
-    if (await this.$save()) {
+    try {
+      await this.$save();
       return { result: true, message: 'Your two factor secret is now set.' };
-    } else {
+    } catch (e: any) {
       return { result: false, message: "Couldn't save two factor secret." };
     }
   }
@@ -1824,12 +1774,10 @@ export default class User extends AbleObject<UserData> {
 
     delete this.$data.totpSecret;
 
-    if (await this.$save()) {
-      return {
-        result: true,
-        message: 'Two factor secret has been removed.',
-      };
-    } else {
+    try {
+      await this.$save();
+      return { result: true, message: 'Two factor secret has been removed.' };
+    } catch (e: any) {
       return { result: false, message: "Couldn't remove two factor secret." };
     }
   }
@@ -1889,16 +1837,10 @@ export default class User extends AbleObject<UserData> {
         difference(username.split(''), tilmeld.config.validChars.split(''))
           .length
       ) {
-        return {
-          result: false,
-          message: tilmeld.config.validCharsNotice,
-        };
+        return { result: false, message: tilmeld.config.validCharsNotice };
       }
       if (!tilmeld.config.validRegex.test(username)) {
-        return {
-          result: false,
-          message: tilmeld.config.validRegexNotice,
-        };
+        return { result: false, message: tilmeld.config.validRegexNotice };
       }
       if (domain != null) {
         if (!tilmeld.config.validDomainRegex.test(domain)) {
@@ -2004,10 +1946,7 @@ export default class User extends AbleObject<UserData> {
       }
     }
     if (!tilmeld.config.validEmailRegex.test(this.$data.email)) {
-      return {
-        result: false,
-        message: tilmeld.config.validEmailRegexNotice,
-      };
+      return { result: false, message: tilmeld.config.validEmailRegexNotice };
     }
     const selector: Selector = {
       type: '&',
@@ -2127,187 +2066,163 @@ export default class User extends AbleObject<UserData> {
       this.$data.email = this.$data.username;
     }
 
-    // Start transaction.
-    const transaction = 'tilmeld-register-' + nanoid();
-    const nymph = this.$nymph;
-    const tnymph = await this.$nymph.startTransaction(transaction);
-    this.$setNymph(tnymph);
-    tilmeld = enforceTilmeld(this);
+    try {
+      const result = await transaction(
+        this.$nymph,
+        'tilmeld-register-' + nanoid(),
+        async (nymph) => {
+          this.$setNymph(nymph);
+          const tilmeld = enforceTilmeld(this);
 
-    let message = '';
-    let loggedin = false;
+          let message = '';
+          let loggedin = false;
 
-    try {
-      try {
-        for (let callback of (this.constructor as typeof User)
-          .beforeRegisterCallbacks) {
-          if (callback) {
-            await callback(this, data);
+          for (let callback of (this.constructor as typeof User)
+            .beforeRegisterCallbacks) {
+            if (callback) {
+              await callback(this, data);
+            }
           }
-        }
-      } catch (e: any) {
-        await tnymph.rollback(transaction);
-        this.$setNymph(nymph);
-        return {
-          result: false,
-          loggedin: false,
-          message: e.message,
-        };
-      }
 
-      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;
-        }
-      } else {
-        this.$data.enabled = true;
-      }
+          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;
+            }
+          } else {
+            this.$data.enabled = true;
+          }
 
-      // If createAdmin is true and there are no other users, grant
-      // "system/admin".
-      let madeAdmin = false;
-      if (tilmeld.config.createAdmin) {
-        const otherUsers = await tnymph.getEntities({
-          class: tilmeld.User,
-          skipAc: true,
-          limit: 1,
-          return: 'guid',
-        });
-        // Make sure it's not just null, cause that means an error.
-        if (otherUsers == null) {
-          await tnymph.rollback(transaction);
-          this.$setNymph(nymph);
-          return {
-            result: false,
-            loggedin: false,
-            message: 'An error occurred.',
-          };
-        }
-        if (!otherUsers.length) {
-          this.$grant('system/admin');
-          this.$data.enabled = true;
-          madeAdmin = true;
-        }
-      }
+          // If createAdmin is true and there are no other users, grant
+          // "system/admin".
+          let madeAdmin = false;
+          if (tilmeld.config.createAdmin) {
+            const otherUsers = await this.$nymph.getEntities({
+              class: tilmeld.User,
+              skipAc: true,
+              limit: 1,
+              return: 'guid',
+            });
+            // Make sure it's not just null, cause that means an error.
+            if (otherUsers == null) {
+              throw new Error('An error occurred.');
+            }
+            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',
-              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,
-              },
-            },
-            this,
+          this.$nymph.config.debugLog(
+            'tilmeld',
+            `Registering new user "${this.$data.username}".`,
           );
-        }
 
-        // Finish up.
-        if (
-          tilmeld.config.verifyEmail &&
-          !tilmeld.config.unverifiedAccess &&
-          !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 &&
-          tilmeld.config.userFields.includes('email')
-        ) {
-          if (!(await tilmeld.login(this, true))) {
-            throw new Error('An error occurred trying to log you in.');
+          await this.$saveSkipAC();
+
+          // Finish up.
+          if (
+            tilmeld.config.verifyEmail &&
+            !tilmeld.config.unverifiedAccess &&
+            !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 &&
+            tilmeld.config.userFields.includes('email')
+          ) {
+            if (!(await tilmeld.login(this, true))) {
+              throw new Error('An error occurred trying to log you in.');
+            }
+            message +=
+              "You're now logged in! An email has been sent to " +
+              `${this.$data.email} with a verification link for you to finish ` +
+              'registration.';
+            loggedin = true;
+          } else {
+            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!";
+            loggedin = true;
           }
-          message +=
-            "You're now logged in! An email has been sent to " +
-            `${this.$data.email} with a verification link for you to finish ` +
-            'registration.';
-          loggedin = true;
-        } else {
-          if (!(await tilmeld.login(this, true))) {
-            throw new Error('An error occurred trying to log you in.');
+
+          for (let callback of (this.constructor as typeof User)
+            .afterRegisterCallbacks) {
+            if (callback) {
+              await callback(this, { loggedin, message });
+            }
           }
-          message += "You're now registered and logged in!";
-          loggedin = true;
-        }
 
-        for (let callback of (this.constructor as typeof User)
-          .afterRegisterCallbacks) {
-          if (callback) {
-            await callback(this, {
-              loggedin,
-              message,
-            });
+          return { result: true, loggedin, message };
+        },
+        async (nymph) => {
+          this.$setNymph(nymph);
+        },
+      );
+
+      // Send the new user registered email.
+      if (tilmeld.config.userRegisteredRecipient != null) {
+        try {
+          if (
+            !(await tilmeld.config.sendEmail(
+              tilmeld,
+              {
+                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,
+                },
+              },
+              this,
+            ))
+          ) {
+            throw new Error('Failed to send.');
           }
+        } catch (e: any) {
+          this.$nymph.config.debugError(
+            'tilmeld',
+            `Couldn't send new user registered email for "${this.$data.username}": ${e.message}`,
+          );
         }
-      } else {
-        this.$nymph.config.debugError(
-          'tilmeld',
-          `Error registering new user "${this.$data.username}".`,
-        );
-        await tnymph.rollback(transaction);
-        this.$setNymph(nymph);
-        return {
-          result: false,
-          loggedin: false,
-          message: 'Error registering user.',
-        };
       }
-    } catch (e: any) {
-      this.$nymph.config.debugError(
-        'tilmeld',
-        `Error registering new user "${this.$data.username}": ${e}`,
-      );
-      await tnymph.rollback(transaction);
-      this.$setNymph(nymph);
-      throw e;
-    }
 
-    try {
-      await tnymph.commit(transaction);
-      this.$setNymph(nymph);
-      await this.$nymph.tilmeld?.fillSession(this);
+      if (result.loggedin) {
+        try {
+          await this.$nymph.tilmeld?.fillSession(this);
+        } catch (e: any) {
+          return {
+            result: true,
+            loggedin: false,
+            message: `You are registered, but an error occurred logging you in: ${e.message}`,
+          };
+        }
+      }
+
+      return result;
     } catch (e: any) {
-      throw e;
+      return { result: false, loggedin: false, message: e.message };
     }
-
-    return {
-      result: true,
-      loggedin,
-      message,
-    };
   }
 
   public async $save() {
     let tilmeld = enforceTilmeld(this);
     if (this.$data.username == null || !this.$data.username.trim().length) {
-      return false;
+      throw new BadUsernameError('Username must not be empty.');
     }
 
     if (
@@ -2591,208 +2506,167 @@ export default class User extends AbleObject<UserData> {
       throw new BadDataError('A password is required.');
     }
 
-    // Start transaction.
-    const transaction = 'tilmeld-save-user-' + (this.guid || nanoid());
-    const nymph = this.$nymph;
-    const tnymph = await this.$nymph.startTransaction(transaction);
-    this.$setNymph(tnymph);
-    tilmeld = enforceTilmeld(this);
-    const Group = tnymph.getEntityClass(GroupClass);
+    let preGuid = this.guid;
+    let preCdate = this.cdate;
+    let preMdate = this.mdate;
+    return await transaction(
+      this.$nymph,
+      'tilmeld-save-user-' + (this.guid || nanoid()),
+      async (nymph) => {
+        this.$setNymph(nymph);
+        const tilmeld = enforceTilmeld(this);
+        const Group = this.$nymph.getEntityClass(GroupClass);
 
-    try {
-      let group = this.$data.group;
-      if (group != null) {
-        // Make sure to get fresh group data.
-        if (group.$asleep()) {
-          await group.$wake();
-        } else {
-          if (!(await group.$refresh())) {
-            throw new Error("Couldn't retrieve primary group info.");
+        let group = this.$data.group;
+        if (group != null) {
+          // Make sure to get fresh group data.
+          if (group.$asleep()) {
+            await group.$wake();
+          } else {
+            if (!(await group.$refresh())) {
+              throw new Error("Couldn't retrieve primary group info.");
+            }
           }
         }
-      }
-      if (group == null && this.guid == null) {
-        if (tilmeld.config.generatePrimary) {
-          // Generate a new primary group for the user.
-          group = await Group.factory();
-          group.user = this;
-          const parent = await tnymph.getEntity(
-            { class: Group },
-            {
-              type: '&',
-              equal: ['defaultPrimary', true],
-            },
-          );
-          if (parent != null) {
-            group.parent = parent;
-          }
-        } else {
-          // Add the default primary.
-          const group = await tnymph.getEntity(
-            { class: Group },
-            {
-              type: '&',
-              equal: ['defaultPrimary', true],
-            },
-          );
-          if (group != null) {
-            this.$data.group = group;
+        if (group == null && this.guid == null) {
+          if (tilmeld.config.generatePrimary) {
+            // Generate a new primary group for the user.
+            group = await Group.factory();
+            group.user = this;
+            const parent = await this.$nymph.getEntity(
+              { class: Group },
+              { type: '&', equal: ['defaultPrimary', true] },
+            );
+            if (parent != null) {
+              group.parent = parent;
+            }
+          } else {
+            // Add the default primary.
+            const group = await this.$nymph.getEntity(
+              { class: Group },
+              { type: '&', equal: ['defaultPrimary', true] },
+            );
+            if (group != null) {
+              this.$data.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;
-          changed = true;
-        }
-        if (group.avatar !== this.$data.avatar) {
-          group.avatar = this.$data.avatar;
-          changed = true;
-        }
-        if (
-          tilmeld.config.userFields.includes('email') &&
-          group.email !== this.$data.email
-        ) {
-          group.email = this.$data.email;
-          changed = true;
-        }
-        if (
-          tilmeld.config.userFields.includes('name') &&
-          group.name !== this.$data.name
-        ) {
-          group.name = this.$data.name;
-          changed = true;
-        }
-        if (
-          tilmeld.config.userFields.includes('phone') &&
-          group.phone !== this.$data.phone
-        ) {
-          group.phone = this.$data.phone;
-          changed = true;
-        }
-        if (changed || group.guid == null) {
-          if (!(await group.$saveSkipAC())) {
-            throw Error('Error updating primary group for user.');
+        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;
+            changed = true;
+          }
+          if (group.avatar !== this.$data.avatar) {
+            group.avatar = this.$data.avatar;
+            changed = true;
+          }
+          if (
+            tilmeld.config.userFields.includes('email') &&
+            group.email !== this.$data.email
+          ) {
+            group.email = this.$data.email;
+            changed = true;
           }
+          if (
+            tilmeld.config.userFields.includes('name') &&
+            group.name !== this.$data.name
+          ) {
+            group.name = this.$data.name;
+            changed = true;
+          }
+          if (
+            tilmeld.config.userFields.includes('phone') &&
+            group.phone !== this.$data.phone
+          ) {
+            group.phone = this.$data.phone;
+            changed = true;
+          }
+          if (changed || group.guid == null) {
+            await group.$saveSkipAC();
+          }
+          this.$data.group = group;
         }
-        this.$data.group = group;
-      }
 
-      if (this.$data.groups == null || this.$data.groups.length === 0) {
-        // Add secondary groups.
-        if (
-          tilmeld.config.userFields.includes('email') &&
-          tilmeld.config.verifyEmail &&
-          tilmeld.config.unverifiedAccess &&
-          this.$data.secret != null
-        ) {
-          // Add the default secondaries for unverified users.
-          this.$data.groups = await tnymph.getEntities(
-            { class: Group },
-            {
-              type: '&',
-              equal: ['unverifiedSecondary', true],
-            },
-          );
-        } else {
-          // Add the default secondaries.
-          this.$data.groups = await tnymph.getEntities(
-            { class: Group },
-            {
-              type: '&',
-              equal: ['defaultSecondary', true],
-            },
-          );
+        if (this.$data.groups == null || this.$data.groups.length === 0) {
+          // Add secondary groups.
+          if (
+            tilmeld.config.userFields.includes('email') &&
+            tilmeld.config.verifyEmail &&
+            tilmeld.config.unverifiedAccess &&
+            this.$data.secret != null
+          ) {
+            // Add the default secondaries for unverified users.
+            this.$data.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] },
+            );
+          }
         }
-      }
 
-      try {
-        tilmeld.config.validatorUser(tilmeld, this);
-      } catch (e: any) {
-        throw new BadDataError(e?.message);
-      }
-    } catch (e: any) {
-      await tnymph.rollback(transaction);
-      this.$setNymph(nymph);
-      throw e;
-    }
-
-    let ret = false;
-    let preGuid = this.guid;
-    let preCdate = this.cdate;
-    let preMdate = this.mdate;
+        try {
+          tilmeld.config.validatorUser(tilmeld, this);
+        } catch (e: any) {
+          throw new BadDataError(e?.message);
+        }
 
-    try {
-      for (let callback of (this.constructor as typeof User)
-        .beforeSaveCallbacks) {
-        if (callback) {
-          await callback(this);
+        for (let callback of (this.constructor as typeof User)
+          .beforeSaveCallbacks) {
+          if (callback) {
+            await callback(this);
+          }
         }
-      }
 
-      ret = await super.$save();
-    } catch (e: any) {
-      await tnymph.rollback(transaction);
-      this.guid = preGuid;
-      this.cdate = preCdate;
-      this.mdate = preMdate;
-      this.$setNymph(nymph);
-      throw e;
-    }
-
-    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;
-          this.cdate = preCdate;
-          this.mdate = preMdate;
-          this.$setNymph(nymph);
-          throw new Error("Couldn't send verification email.");
+        await super.$save();
+
+        if (sendVerification) {
+          // The email has changed, so send a new verification email.
+          if (!(await this.$sendEmailVerification())) {
+            throw new Error("Couldn't send verification email.");
+          }
         }
-      }
 
-      this.$descendantGroups = undefined;
-      this.$gatekeeperCache = undefined;
+        this.$descendantGroups = undefined;
+        this.$gatekeeperCache = undefined;
 
-      try {
         for (let callback of (this.constructor as typeof User)
           .afterSaveCallbacks) {
           if (callback) {
             await callback(this);
           }
         }
-      } catch (e: any) {
-        await tnymph.rollback(transaction);
-        this.guid = preGuid;
-        this.cdate = preCdate;
-        this.mdate = preMdate;
+      },
+      async (nymph, committed) => {
         this.$setNymph(nymph);
-        throw e;
-      }
-
-      ret = await tnymph.commit(transaction);
-    } else {
-      await tnymph.rollback(transaction);
-    }
-    this.$setNymph(nymph);
-
-    if (ret) {
-      this.$originalEmail = this.$data.email;
-      this.$originalUsername = this.$data.username;
 
-      const tilmeld = enforceTilmeld(nymph);
+        if (committed) {
+          this.$originalEmail = this.$data.email;
+          this.$originalUsername = this.$data.username;
 
-      if (tilmeld.User.current(true).$is(this)) {
-        // Update the user in the session cache.
-        await tilmeld.fillSession(this);
-      }
-    }
+          try {
+            const tilmeld = enforceTilmeld(nymph);
 
-    return ret;
+            if (tilmeld.User.current(true).$is(this)) {
+              // Update the user in the session cache.
+              await tilmeld.fillSession(this);
+            }
+          } catch (e: any) {
+            // Ignore.
+          }
+        } else {
+          this.guid = preGuid;
+          this.cdate = preCdate;
+          this.mdate = preMdate;
+        }
+      },
+    );
   }
 
   /**
@@ -2800,7 +2674,7 @@ export default class User extends AbleObject<UserData> {
    */
   public async $saveSkipAC() {
     this.$skipAcWhenSaving = true;
-    return await this.$save();
+    await this.$save();
   }
 
   public $tilmeldSaveSkipAC() {
@@ -2811,6 +2685,7 @@ export default class User extends AbleObject<UserData> {
     return false;
   }
 
+  @transactional
   public async $delete() {
     const tilmeld = enforceTilmeld(this);
     if (!this.$skipAcWhenDeleting && !tilmeld.gatekeeper('tilmeld/admin')) {
@@ -2833,79 +2708,53 @@ export default class User extends AbleObject<UserData> {
       );
     }
 
-    const transaction = 'tilmeld-delete-user-' + this.guid;
-    const nymph = this.$nymph;
-    const tnymph = await nymph.startTransaction(transaction);
-    this.$setNymph(tnymph);
-
-    let success = false;
-
-    try {
-      if (!(await this.$refresh())) {
-        throw new BadDataError('User could not be refreshed.');
-      }
+    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();
-        } else {
-          if (!(await this.$data.group.$refresh())) {
-            throw new BadDataError('Group could not be refreshed.');
-          }
+    if (this.$data.group != null) {
+      if (this.$data.group.$asleep()) {
+        await this.$data.group.$wake();
+      } else {
+        if (!(await this.$data.group.$refresh())) {
+          throw new BadDataError('Group could not be refreshed.');
         }
       }
+    }
 
-      for (let callback of (this.constructor as typeof User)
-        .beforeDeleteCallbacks) {
-        if (callback) {
-          await callback(this);
-        }
+    for (let callback of (this.constructor as typeof User)
+      .beforeDeleteCallbacks) {
+      if (callback) {
+        await callback(this);
       }
+    }
 
-      if (tilmeld.User.current(true).$is(this)) {
-        await this.$logout();
-      }
+    if (tilmeld.User.current(true).$is(this)) {
+      await this.$logout();
+    }
 
-      if (this.$data.group != null && this.$is(this.$data.group.user)) {
-        // Read the skip ac value here, because super.$delete changes it.
-        const $skipAcWhenDeleting = this.$skipAcWhenDeleting;
-
-        // Delete the user.
-        success = await super.$delete();
-        if (success) {
-          // Delete the generated group.
-          success = $skipAcWhenDeleting
-            ? await this.$data.group.$deleteSkipAC()
-            : await this.$data.group.$delete();
-        }
+    if (this.$data.group != null && this.$is(this.$data.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();
       } else {
-        success = await super.$delete();
+        await this.$data.group.$delete();
       }
-    } catch (e: any) {
-      await tnymph.rollback(transaction);
-      this.$setNymph(nymph);
-      throw e;
+    } else {
+      await super.$delete();
     }
 
-    if (success) {
-      try {
-        for (let callback of (this.constructor as typeof User)
-          .afterDeleteCallbacks) {
-          if (callback) {
-            await callback(this);
-          }
-        }
-      } catch (e: any) {
-        await tnymph.rollback(transaction);
-        this.$setNymph(nymph);
-        throw e;
+    for (let callback of (this.constructor as typeof User)
+      .afterDeleteCallbacks) {
+      if (callback) {
+        await callback(this);
       }
-      success = await tnymph.commit(transaction);
-    } else {
-      await tnymph.rollback(transaction);
     }
-    this.$setNymph(nymph);
-    return success;
   }
 
   /*
@@ -2913,7 +2762,7 @@ export default class User extends AbleObject<UserData> {
    */
   async $deleteSkipAC() {
     this.$skipAcWhenDeleting = true;
-    return await this.$delete();
+    await this.$delete();
   }
 
   $tilmeldDeleteSkipAC() {