@unchainedshop/api 2.10.7 → 2.11.0

package/lib/resolvers/mutations/accounts/addWeb3Address.js

@@ -13,7 +13,7 @@ export default async function addWeb3Address(root, { address }, { modules, userI
     if (foundAlreadyExistingEntryForAddress)
         return user;
     const nonce = Math.floor(Math.random() * 1000000).toString();
-    await modules.users.updateUser({ _id: userId }, {
+    return modules.users.updateUser({ _id: userId }, {
         $push: {
             'services.web3': {
                 address,
@@ -21,6 +21,5 @@ export default async function addWeb3Address(root, { address }, { modules, userI
             },
         },
     }, {});
-    return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=addWeb3Address.js.map

package/lib/resolvers/mutations/accounts/addWeb3Address.js.map

@@ -1 +1 @@
-{"version":3,"file":"addWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,EAAE,OAAO,EAAoB,EAC7B,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC9C,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,2BAA2B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,mCAAmC,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAChF,OAAO,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,mCAAmC;QAAE,OAAO,IAAI,CAAC;IAErD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,eAAe,EAAE;gBACf,OAAO;gBACP,KAAK;aACN;SACF;KACF,EACD,EAAE,CACH,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"addWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,EAAE,OAAO,EAAoB,EAC7B,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC9C,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,2BAA2B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,mCAAmC,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAChF,OAAO,OAAO,CAAC,OAAO,KAAK,OAAO,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,mCAAmC;QAAE,OAAO,IAAI,CAAC;IAErD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAC7B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,eAAe,EAAE;gBACf,OAAO;gBACP,KAAK;aACN;SACF;KACF,EACD,EAAE,CACH,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/accounts/addWebAuthnCredentials.js

@@ -4,11 +4,10 @@ export default async function addWebAuthnCredentials(root, { credentials }, { mo
         userId,
     });
     const webAuthnService = await modules.accounts.webAuthn.verifyCredentialCreation(user.username, credentials);
-    await modules.users.updateUser({ _id: userId }, {
+    return modules.users.updateUser({ _id: userId }, {
         $push: {
             'services.webAuthn': webAuthnService,
         },
     }, {});
-    return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=addWebAuthnCredentials.js.map

package/lib/resolvers/mutations/accounts/addWebAuthnCredentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"addWebAuthnCredentials.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWebAuthnCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAClD,IAAU,EACV,EAAE,WAAW,EAAwB,EACrC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,mCAAmC,IAAI,CAAC,QAAQ,EAAE,EAAE;QACtD,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAC9E,IAAI,CAAC,QAAQ,EACb,WAAW,CACZ,CAAC;IAEF,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,mBAAmB,EAAE,eAAe;SACrC;KACF,EACD,EAAE,CACH,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"addWebAuthnCredentials.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWebAuthnCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAClD,IAAU,EACV,EAAE,WAAW,EAAwB,EACrC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,mCAAmC,IAAI,CAAC,QAAQ,EAAE,EAAE;QACtD,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAC9E,IAAI,CAAC,QAAQ,EACb,WAAW,CACZ,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAC7B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,mBAAmB,EAAE,eAAe;SACrC;KACF,EACD,EAAE,CACH,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/accounts/removeWeb3Address.js

@@ -8,11 +8,10 @@ export default async function removeWeb3Address(root, { address }, { modules, us
     if (!foundCredentials) {
         throw new UserWeb3AddressNotFoundError({ userId, address });
     }
-    await modules.users.updateUser({ _id: userId }, {
+    return modules.users.updateUser({ _id: userId }, {
         $pull: {
             'services.web3': { address: foundCredentials.address },
         },
     }, {});
-    return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=removeWeb3Address.js.map

package/lib/resolvers/mutations/accounts/removeWeb3Address.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAElE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,EAAE,OAAO,EAAuB,EAChC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,8BAA8B,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC5D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAChD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CACrE,CAAC;IACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,4BAA4B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,eAAe,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE;SACvD;KACF,EACD,EAAE,CACH,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"removeWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAElE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,EAAE,OAAO,EAAuB,EAChC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,8BAA8B,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC5D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAChD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CACrE,CAAC;IACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,4BAA4B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAC7B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,eAAe,EAAE,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE;SACvD;KACF,EACD,EAAE,CACH,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/accounts/removeWebAuthnCredentials.js

@@ -8,11 +8,10 @@ export default async function removeWebAuthnCredentials(root, { credentialsId },
     if (!foundCredentials) {
         throw new UserWebAuthnCredentialsNotFoundError({ userId, credentialsId });
     }
-    await modules.users.updateUser({ _id: userId }, {
+    return modules.users.updateUser({ _id: userId }, {
         $pull: {
             'services.webAuthn': { id: credentialsId },
         },
     }, {});
-    return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=removeWebAuthnCredentials.js.map

package/lib/resolvers/mutations/accounts/removeWebAuthnCredentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"removeWebAuthnCredentials.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWebAuthnCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,EAAE,aAAa,EAA6B,EAC5C,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,sCAAsC,aAAa,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC1E,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;IAClG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,oCAAoC,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,mBAAmB,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE;SAC3C;KACF,EACD,EAAE,CACH,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"removeWebAuthnCredentials.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWebAuthnCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,oCAAoC,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,IAAU,EACV,EAAE,aAAa,EAA6B,EAC5C,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,sCAAsC,aAAa,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC1E,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,aAAa,CAAC,CAAC;IAClG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,oCAAoC,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAC7B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,mBAAmB,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE;SAC3C;KACF,EACD,EAAE,CACH,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/accounts/resetPassword.js

@@ -1,4 +1,5 @@
 import { log } from '@unchainedshop/logger';
+import { emailRegexOperator } from '@unchainedshop/mongodb';
 import { AuthOperationFailedError, InvalidResetTokenError, NoEmailSetError, ResetPasswordLinkExpiredError, ResetPasswordLinkUnknownAddressError, } from '../../../errors.js';
 export default async function resetPassword(root, params, context) {
     const { modules, userId } = context;
@@ -8,10 +9,38 @@ export default async function resetPassword(root, params, context) {
     }
     try {
         const userWithNewPassword = await modules.accounts.resetPassword(params, context);
+        const resetTicket = userWithNewPassword?.services?.password?.reset?.find((t) => t.token === params.token);
+        if (resetTicket.address) {
+            // Try verifying the E-Mail along the way
+            try {
+                const updatedUser = await modules.users.updateUser({
+                    _id: userWithNewPassword.id,
+                    emails: {
+                        $elemMatch: {
+                            address: emailRegexOperator(resetTicket.address),
+                            verified: false,
+                        },
+                    },
+                }, {
+                    $set: {
+                        'emails.$[email].verified': true,
+                    },
+                }, {
+                    arrayFilters: [{ 'email.address': resetTicket.address }],
+                });
+                if (updatedUser) {
+                    await modules.accounts.emit('VerifyEmailSuccess', updatedUser);
+                }
+            }
+            catch (e) {
+                /* */
+            }
+        }
         const result = await modules.accounts.createLoginToken(userWithNewPassword.id, context);
         return result;
     }
     catch (e) {
+        log(e);
         if (e.code === 'InvalidToken')
             throw new InvalidResetTokenError({});
         if (e.code === 'ResetPasswordLinkExpired')

package/lib/resolvers/mutations/accounts/resetPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"resetPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,eAAe,EACf,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,MAAoD,EACpD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAElF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACxF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc;YAAE,MAAM,IAAI,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,CAAC,IAAI,KAAK,0BAA0B;YAAE,MAAM,IAAI,6BAA6B,CAAC,EAAE,CAAC,CAAC;QACvF,IAAI,CAAC,CAAC,IAAI,KAAK,kCAAkC;YAC/C,MAAM,IAAI,oCAAoC,CAAC,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY;YAAE,MAAM,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC"}
+{"version":3,"file":"resetPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,eAAe,EACf,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,MAAoD,EACpD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,wBAAwB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAElF,MAAM,WAAW,GAAG,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CACtE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAChC,CAAC;QACF,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,yCAAyC;YACzC,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAChD;oBACE,GAAG,EAAE,mBAAmB,CAAC,EAAE;oBAC3B,MAAM,EAAE;wBACN,UAAU,EAAE;4BACV,OAAO,EAAE,kBAAkB,CAAC,WAAW,CAAC,OAAO,CAAC;4BAChD,QAAQ,EAAE,KAAK;yBAChB;qBACF;iBACF,EACD;oBACE,IAAI,EAAE;wBACJ,0BAA0B,EAAE,IAAI;qBACjC;iBACF,EACD;oBACE,YAAY,EAAE,CAAC,EAAE,eAAe,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC;iBACzD,CACF,CAAC;gBACF,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,KAAK;YACP,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACxF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,CAAC,CAAC,CAAC;QACP,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc;YAAE,MAAM,IAAI,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,CAAC,IAAI,KAAK,0BAA0B;YAAE,MAAM,IAAI,6BAA6B,CAAC,EAAE,CAAC,CAAC;QACvF,IAAI,CAAC,CAAC,IAAI,KAAK,kCAAkC;YAC/C,MAAM,IAAI,oCAAoC,CAAC,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY;YAAE,MAAM,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/accounts/unlinkOAuthAccount.js

@@ -4,11 +4,10 @@ export default async function unlinkOAuthAccount(root, { provider, oAuthAccountI
     log(`mutation unlinkOAuthAccount ${provider} ${oAuthAccountId}`, {
         userId,
     });
-    await modules.users.updateUser({ _id: userId }, {
+    return modules.users.updateUser({ _id: userId }, {
         $pull: {
             [`services.oauth.${provider}`]: { id: oAuthAccountId },
         },
     }, { upsert: true });
-    return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=unlinkOAuthAccount.js.map

package/lib/resolvers/mutations/accounts/unlinkOAuthAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"unlinkOAuthAccount.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/unlinkOAuthAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,kBAAkB,CAC9C,IAAU,EACV,EAAE,QAAQ,EAAE,cAAc,EAAgD,EAC1E,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,+BAA+B,QAAQ,IAAI,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,CAAC,kBAAkB,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SACvD;KACF,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"unlinkOAuthAccount.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/unlinkOAuthAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,kBAAkB,CAC9C,IAAU,EACV,EAAE,QAAQ,EAAE,cAAc,EAAgD,EAC1E,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,+BAA+B,QAAQ,IAAI,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAC7B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,KAAK,EAAE;YACL,CAAC,kBAAkB,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SACvD;KACF,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/accounts/verifyWeb3Address.js

@@ -28,13 +28,12 @@ export default async function verifyWeb3Address(root, { address, hash }, { modul
         }
         return service;
     });
-    await modules.users.updateUser({ _id: userId }, {
+    return modules.users.updateUser({ _id: userId }, {
         $set: {
             // eslint-disable-next-line
             // @ts-ignore
             'services.web3': web3Services,
         },
     }, {});
-    return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=verifyWeb3Address.js.map

package/lib/resolvers/mutations/accounts/verifyWeb3Address.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/verifyWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEjG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAqC,EACpD,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,8BAA8B,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC5D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAChD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CACrE,CAAC;IACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,4BAA4B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,GAAG,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAE/E,MAAM,aAAa,GAAG,wBAAwB,CAAC;QAC7C,IAAI,EAAE,GAAG;QACT,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,0BAA0B,GAC9B,aAAa,CAAC,WAAW,EAAE,KAAK,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAEzE,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,MAAM,IAAI,6BAA6B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,YAAY,GAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7D,IAAI,gBAAgB,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;YACjD,OAAO;gBACL,GAAG,OAAO;gBACV,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,IAAI,EAAE;YACJ,2BAA2B;YAC3B,aAAa;YACb,eAAe,EAAE,YAAY;SAC9B;KACF,EACD,EAAE,CACH,CAAC;IAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"verifyWeb3Address.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/verifyWeb3Address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAEjG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAqC,EACpD,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAW;IAElC,GAAG,CAAC,8BAA8B,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE;QAC5D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAChD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,WAAW,EAAE,CACrE,CAAC;IACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,4BAA4B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,GAAG,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAE/E,MAAM,aAAa,GAAG,wBAAwB,CAAC;QAC7C,IAAI,EAAE,GAAG;QACT,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,0BAA0B,GAC9B,aAAa,CAAC,WAAW,EAAE,KAAK,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAEzE,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChC,MAAM,IAAI,6BAA6B,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,YAAY,GAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7D,IAAI,gBAAgB,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;YACjD,OAAO;gBACL,GAAG,OAAO;gBACV,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,UAAU,CAC7B,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;QACE,IAAI,EAAE;YACJ,2BAA2B;YAC3B,aAAa;YACb,eAAe,EAAE,YAAY;SAC9B;KACF,EACD,EAAE,CACH,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.10.7",
+  "version": "2.11.0",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -48,11 +48,11 @@
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.2",
-    "@unchainedshop/core": "^2.10.7",
-    "@unchainedshop/events": "^2.10.7",
-    "@unchainedshop/logger": "^2.10.7",
-    "@unchainedshop/roles": "^2.10.7",
-    "@unchainedshop/utils": "^2.10.7",
+    "@unchainedshop/core": "^2.11.0",
+    "@unchainedshop/events": "^2.11.0",
+    "@unchainedshop/logger": "^2.11.0",
+    "@unchainedshop/roles": "^2.11.0",
+    "@unchainedshop/utils": "^2.11.0",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
@@ -64,8 +64,8 @@
   "devDependencies": {
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.14.7",
-    "@unchainedshop/types": "^2.10.7",
+    "@types/node": "^20.14.8",
+    "@unchainedshop/types": "^2.11.0",
     "express": "^4.19.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.5",

package/src/resolvers/mutations/accounts/addWeb3Address.ts

@@ -22,7 +22,7 @@ export default async function addWeb3Address(
   if (foundAlreadyExistingEntryForAddress) return user;
 
   const nonce = Math.floor(Math.random() * 1000000).toString();
-  await modules.users.updateUser(
+  return modules.users.updateUser(
     { _id: userId },
     {
       $push: {
@@ -34,6 +34,4 @@ export default async function addWeb3Address(
     },
     {},
   );
-
-  return modules.users.findUserById(userId);
 }

package/src/resolvers/mutations/accounts/addWebAuthnCredentials.ts

@@ -15,7 +15,7 @@ export default async function addWebAuthnCredentials(
     credentials,
   );
 
-  await modules.users.updateUser(
+  return modules.users.updateUser(
     { _id: userId },
     {
       $push: {
@@ -24,6 +24,4 @@ export default async function addWebAuthnCredentials(
     },
     {},
   );
-
-  return modules.users.findUserById(userId);
 }

package/src/resolvers/mutations/accounts/removeWeb3Address.ts

@@ -18,7 +18,7 @@ export default async function removeWeb3Address(
     throw new UserWeb3AddressNotFoundError({ userId, address });
   }
 
-  await modules.users.updateUser(
+  return modules.users.updateUser(
     { _id: userId },
     {
       $pull: {
@@ -27,6 +27,4 @@ export default async function removeWeb3Address(
     },
     {},
   );
-
-  return modules.users.findUserById(userId);
 }

package/src/resolvers/mutations/accounts/removeWebAuthnCredentials.ts

@@ -16,7 +16,7 @@ export default async function removeWebAuthnCredentials(
     throw new UserWebAuthnCredentialsNotFoundError({ userId, credentialsId });
   }
 
-  await modules.users.updateUser(
+  return modules.users.updateUser(
     { _id: userId },
     {
       $pull: {
@@ -25,6 +25,4 @@ export default async function removeWebAuthnCredentials(
     },
     {},
   );
-
-  return modules.users.findUserById(userId);
 }

package/src/resolvers/mutations/accounts/resetPassword.ts

@@ -1,5 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
+import { emailRegexOperator } from '@unchainedshop/mongodb';
 import {
   AuthOperationFailedError,
   InvalidResetTokenError,
@@ -23,9 +24,43 @@ export default async function resetPassword(
   try {
     const userWithNewPassword = await modules.accounts.resetPassword(params, context);
 
+    const resetTicket = userWithNewPassword?.services?.password?.reset?.find(
+      (t) => t.token === params.token,
+    );
+    if (resetTicket.address) {
+      // Try verifying the E-Mail along the way
+      try {
+        const updatedUser = await modules.users.updateUser(
+          {
+            _id: userWithNewPassword.id,
+            emails: {
+              $elemMatch: {
+                address: emailRegexOperator(resetTicket.address),
+                verified: false,
+              },
+            },
+          },
+          {
+            $set: {
+              'emails.$[email].verified': true,
+            },
+          },
+          {
+            arrayFilters: [{ 'email.address': resetTicket.address }],
+          },
+        );
+        if (updatedUser) {
+          await modules.accounts.emit('VerifyEmailSuccess', updatedUser);
+        }
+      } catch (e) {
+        /* */
+      }
+    }
+
     const result = await modules.accounts.createLoginToken(userWithNewPassword.id, context);
     return result;
   } catch (e) {
+    log(e);
     if (e.code === 'InvalidToken') throw new InvalidResetTokenError({});
     if (e.code === 'ResetPasswordLinkExpired') throw new ResetPasswordLinkExpiredError({});
     if (e.code === 'ResetPasswordLinkUnknownAddress​')

package/src/resolvers/mutations/accounts/unlinkOAuthAccount.ts

@@ -12,7 +12,7 @@ export default async function unlinkOAuthAccount(
     userId,
   });
 
-  await modules.users.updateUser(
+  return modules.users.updateUser(
     { _id: userId },
     {
       $pull: {
@@ -21,6 +21,4 @@ export default async function unlinkOAuthAccount(
     },
     { upsert: true },
   );
-
-  return modules.users.findUserById(userId);
 }

package/src/resolvers/mutations/accounts/verifyWeb3Address.ts

@@ -44,7 +44,7 @@ export default async function verifyWeb3Address(
     return service;
   });
 
-  await modules.users.updateUser(
+  return modules.users.updateUser(
     { _id: userId },
     {
       $set: {
@@ -55,6 +55,4 @@ export default async function verifyWeb3Address(
     },
     {},
   );
-
-  return modules.users.findUserById(userId);
 }