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

package/dist/User.js

@@ -1,4 +1,5 @@
 import crypto from 'node:crypto';
+import { MethodFailedError, HttpError, } from '@nymphjs/nymph';
 import { humanSecret, nanoid } from '@nymphjs/guid';
 import { strtotime } from 'locutus/php/datetime/index';
 import { difference, xor } from 'lodash-es';
@@ -214,7 +215,10 @@ export default class User extends AbleObject {
             // Create a unique secret.
             getUser.recoverSecret = humanSecret();
             getUser.recoverSecretDate = Date.now();
-            if (!(await getUser.$saveSkipAC())) {
+            try {
+                await getUser.$saveSkipAC();
+            }
+            catch (e) {
                 return { result: false, message: "Couldn't save recovery secret." };
             }
             // Send the recovery email.
@@ -280,13 +284,14 @@ export default class User extends AbleObject {
         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) {
             return { result: false, message: 'Error saving new password.' };
         }
     }
@@ -371,19 +376,6 @@ export default class User extends AbleObject {
         this.$data.inheritAbilities = true;
         this.$updateDataProtection();
     }
-    $setNymph(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() {
         const tilmeld = enforceTilmeld(this);
         const uniques = [`u:${this.$data.username}`];
@@ -1106,14 +1098,15 @@ export default class User extends AbleObject {
         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) {
             return { result: false, message: "Couldn't save new password." };
         }
     }
@@ -1159,7 +1152,8 @@ export default class User extends AbleObject {
             return { result: false, message: 'Incorrect password.' };
         }
         this.$data.revokeTokenDate = Date.now();
-        if (await this.$save()) {
+        try {
+            await this.$save();
             const tilmeld = enforceTilmeld(this);
             await tilmeld.login(this, true);
             return {
@@ -1167,7 +1161,7 @@ export default class User extends AbleObject {
                 message: 'You have logged out of all other sessions.',
             };
         }
-        else {
+        catch (e) {
             return { result: false, message: "Couldn't save revocation date." };
         }
     }
@@ -1258,10 +1252,11 @@ export default class User extends AbleObject {
             return { result: false, message: '2FA code is incorrect.' };
         }
         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) {
             return { result: false, message: "Couldn't save two factor secret." };
         }
     }
@@ -1305,13 +1300,14 @@ export default class User extends AbleObject {
             };
         }
         delete this.$data.totpSecret;
-        if (await this.$save()) {
+        try {
+            await this.$save();
             return {
                 result: true,
                 message: 'Two factor secret has been removed.',
             };
         }
-        else {
+        catch (e) {
             return { result: false, message: "Couldn't remove two factor secret." };
         }
     }
@@ -1615,7 +1611,8 @@ export default class User extends AbleObject {
                 }
             }
             this.$nymph.config.debugLog('tilmeld', `Registering new user "${this.$data.username}".`);
-            if (await this.$saveSkipAC()) {
+            try {
+                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) {
@@ -1673,7 +1670,10 @@ export default class User extends AbleObject {
                     }
                 }
             }
-            else {
+            catch (e) {
+                if (e instanceof HttpError) {
+                    throw e;
+                }
                 this.$nymph.config.debugError('tilmeld', `Error registering new user "${this.$data.username}".`);
                 await tnymph.rollback(transaction);
                 this.$setNymph(nymph);
@@ -1707,7 +1707,7 @@ export default class User extends AbleObject {
     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 (!this.$skipAcWhenSaving &&
             tilmeld.gatekeeper('tilmeld/admin') &&
@@ -1985,9 +1985,7 @@ export default class User extends AbleObject {
                     changed = true;
                 }
                 if (changed || group.guid == null) {
-                    if (!(await group.$saveSkipAC())) {
-                        throw Error('Error updating primary group for user.');
-                    }
+                    await group.$saveSkipAC();
                 }
                 this.$data.group = group;
             }
@@ -2023,7 +2021,6 @@ export default class User extends AbleObject {
             this.$setNymph(nymph);
             throw e;
         }
-        let ret = false;
         let preGuid = this.guid;
         let preCdate = this.cdate;
         let preMdate = this.mdate;
@@ -2034,7 +2031,7 @@ export default class User extends AbleObject {
                     await callback(this);
                 }
             }
-            ret = await super.$save();
+            await super.$save();
         }
         catch (e) {
             await tnymph.rollback(transaction);
@@ -2044,43 +2041,38 @@ export default class User extends AbleObject {
             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.");
-                }
-            }
-            this.$descendantGroups = undefined;
-            this.$gatekeeperCache = undefined;
-            try {
-                for (let callback of this.constructor
-                    .afterSaveCallbacks) {
-                    if (callback) {
-                        await callback(this);
-                    }
-                }
-            }
-            catch (e) {
+        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 e;
+                throw new Error("Couldn't send verification email.");
             }
-            ret = await tnymph.commit(transaction);
         }
-        else {
+        this.$descendantGroups = undefined;
+        this.$gatekeeperCache = undefined;
+        try {
+            for (let callback of this.constructor
+                .afterSaveCallbacks) {
+                if (callback) {
+                    await callback(this);
+                }
+            }
+        }
+        catch (e) {
             await tnymph.rollback(transaction);
+            this.guid = preGuid;
+            this.cdate = preCdate;
+            this.mdate = preMdate;
+            this.$setNymph(nymph);
+            throw e;
         }
+        const committed = await tnymph.commit(transaction);
         this.$setNymph(nymph);
-        if (ret) {
+        if (committed) {
             this.$originalEmail = this.$data.email;
             this.$originalUsername = this.$data.username;
             const tilmeld = enforceTilmeld(nymph);
@@ -2089,14 +2081,16 @@ export default class User extends AbleObject {
                 await tilmeld.fillSession(this);
             }
         }
-        return ret;
+        else {
+            throw new MethodFailedError('Transaction could not be committed.');
+        }
     }
     /**
      * This should *never* be accessible on the client.
      */
     async $saveSkipAC() {
         this.$skipAcWhenSaving = true;
-        return await this.$save();
+        await this.$save();
     }
     $tilmeldSaveSkipAC() {
         if (this.$skipAcWhenSaving) {
@@ -2122,7 +2116,6 @@ export default class User extends AbleObject {
         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.');
@@ -2150,16 +2143,17 @@ export default class User extends AbleObject {
                 // 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();
+                await super.$delete();
+                // Delete the generated group.
+                if ($skipAcWhenDeleting) {
+                    await this.$data.group.$deleteSkipAC();
+                }
+                else {
+                    await this.$data.group.$delete();
                 }
             }
             else {
-                success = await super.$delete();
+                await super.$delete();
             }
         }
         catch (e) {
@@ -2167,34 +2161,42 @@ export default class User extends AbleObject {
             this.$setNymph(nymph);
             throw e;
         }
-        if (success) {
-            try {
-                for (let callback of this.constructor
-                    .afterDeleteCallbacks) {
-                    if (callback) {
-                        await callback(this);
-                    }
+        try {
+            for (let callback of this.constructor
+                .afterDeleteCallbacks) {
+                if (callback) {
+                    await callback(this);
                 }
             }
-            catch (e) {
+        }
+        catch (e) {
+            try {
                 await tnymph.rollback(transaction);
-                this.$setNymph(nymph);
-                throw e;
             }
-            success = await tnymph.commit(transaction);
+            catch (e) {
+                nymph.config.debugError('tilmeld', `Rollback of transaction ${transaction} failed, reason: ${e.message}`);
+            }
+            this.$setNymph(nymph);
+            throw e;
         }
-        else {
-            await tnymph.rollback(transaction);
+        let committed = false;
+        try {
+            committed = await tnymph.commit(transaction);
+        }
+        catch (e) {
+            committed = false;
         }
         this.$setNymph(nymph);
-        return success;
+        if (!committed) {
+            throw new MethodFailedError('Transaction could not be committed.');
+        }
     }
     /*
      * This should *never* be accessible on the client.
      */
     async $deleteSkipAC() {
         this.$skipAcWhenDeleting = true;
-        return await this.$delete();
+        await this.$delete();
     }
     $tilmeldDeleteSkipAC() {
         if (this.$skipAcWhenDeleting) {