@unchainedshop/api 2.13.0 → 3.0.0-alpha2

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

@@ -1,43 +1,38 @@
 import { log } from '@unchainedshop/logger';
-import { hashPassword } from '../../../hashPassword.js';
-import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, } from '../../../errors.js';
+import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, PasswordOrWebAuthnPublicKeyRequiredError, PasswordInvalidError, } from '../../../errors.js';
 export default async function createUser(root, params, context) {
     const { modules, userId } = context;
     log('mutation createUser', { email: params.email, username: params.username, userId });
-    if (!params.plainPassword && !params.webAuthnPublicKeyCredentials) {
-        throw new Error('Password or Public Key is required');
+    if (!params.username && !params.email) {
+        throw new UsernameOrEmailRequiredError({ username: params?.username });
     }
-    const mappedUser = { ...params };
-    if (mappedUser.plainPassword) {
-        mappedUser.password = hashPassword(mappedUser.plainPassword);
+    if (!params.password && !params.webAuthnPublicKeyCredentials) {
+        throw new PasswordOrWebAuthnPublicKeyRequiredError({ username: params?.username });
     }
-    delete mappedUser.plainPassword;
-    delete mappedUser.webAuthnPublicKeyCredentials;
-    const webAuthnService = params.webAuthnPublicKeyCredentials &&
-        (await modules.accounts.webAuthn.verifyCredentialCreation(params.username, params.webAuthnPublicKeyCredentials));
-    let newUserId;
     try {
-        newUserId = await modules.accounts.createUser(mappedUser, {
-            skipPasswordEnrollment: !!webAuthnService,
+        const newUserId = await modules.users.createUser({
+            ...params,
+            initialPassword: false,
+        }, {});
+        let user = await modules.users.findUserById(newUserId);
+        user = await context.modules.users.updateHeartbeat(user._id, {
+            remoteAddress: context.remoteAddress,
+            remotePort: context.remotePort,
+            userAgent: context.userAgent,
+            locale: context.localeContext.normalized,
+            countryCode: context.countryContext,
         });
+        return context.login(user);
     }
     catch (e) {
-        if (e.code === 'EmailAlreadyExists')
+        if (e.cause === 'EMAIL_INVALID')
             throw new EmailAlreadyExistsError({ email: params?.email });
-        else if (e.code === 'UsernameAlreadyExists')
+        else if (e.cause === 'USERNAME_INVALID')
             throw new UsernameAlreadyExistsError({ username: params?.username });
-        else if (e.code === 'UsernameOrEmailRequired')
-            throw new UsernameOrEmailRequiredError({ username: params?.username });
+        else if (e.cause === 'PASSWORD_INVALID')
+            throw new PasswordInvalidError({ username: params?.username });
         else
             throw new AuthOperationFailedError({ username: params?.username, email: params.email });
     }
-    if (newUserId && webAuthnService) {
-        await modules.users.updateUser({ _id: newUserId }, {
-            $push: {
-                'services.webAuthn': webAuthnService,
-            },
-        }, {});
-    }
-    return modules.accounts.createLoginToken(newUserId, context);
 }
 //# sourceMappingURL=createUser.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;QAC7B,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,UAAU,CAAC,aAAa,CAAC;IAChC,OAAO,UAAU,CAAC,4BAA4B,CAAC;IAE/C,MAAM,eAAe,GACnB,MAAM,CAAC,4BAA4B;QACnC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CACvD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,4BAA4B,CACpC,CAAC,CAAC;IACL,IAAI,SAAS,CAAC;IACd,IAAI,CAAC;QACH,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;YACxD,sBAAsB,EAAE,CAAC,CAAC,eAAe;SAC1C,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB;YAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5F,IAAI,CAAC,CAAC,IAAI,KAAK,uBAAuB;YACzC,MAAM,IAAI,0BAA0B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;aAClE,IAAI,CAAC,CAAC,IAAI,KAAK,yBAAyB;YAC3C,MAAM,IAAI,4BAA4B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;;YACpE,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,SAAS,IAAI,eAAe,EAAE,CAAC;QACjC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,SAAS,EAAE,EAClB;YACE,KAAK,EAAE;gBACL,mBAAmB,EAAE,eAAe;aACrC;SACF,EACD,EAAE,CACH,CAAC;IACJ,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"createUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,EAC5B,wCAAwC,EACxC,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,IAAI,4BAA4B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,CAAC;QAC7D,MAAM,IAAI,wCAAwC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC9C;YACE,GAAG,MAAM;YACT,eAAe,EAAE,KAAK;SACvB,EACD,EAAE,CACH,CAAC;QAEF,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAEvD,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE;YAC3D,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,UAAU;YACxC,WAAW,EAAE,OAAO,CAAC,cAAc;SACpC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,KAAK,KAAK,eAAe;YAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;aACxF,IAAI,CAAC,CAAC,KAAK,KAAK,kBAAkB;YACrC,MAAM,IAAI,0BAA0B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;aAClE,IAAI,CAAC,CAAC,KAAK,KAAK,kBAAkB;YACrC,MAAM,IAAI,oBAAoB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;;YAC5D,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/F,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.d.ts

@@ -2,5 +2,5 @@ import { Context, Root } from '@unchainedshop/types/api.js';
 export default function createWebAuthnCredentialCreationOptions(root: Root, { extensionOptions, username }: {
     username: string;
     extensionOptions: any;
-}, { modules, userId, req }: Context): Promise<any>;
+}, { modules, userId, getHeader }: Context): Promise<any>;
 //# sourceMappingURL=createWebAuthnCredentialCreationOptions.d.ts.map

package/lib/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createWebAuthnCredentialCreationOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,uCAAuC,CACnE,IAAI,EAAE,IAAI,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAA;CAAE,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,OAAO,gBAalC"}
+{"version":3,"file":"createWebAuthnCredentialCreationOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,uCAAuC,CACnE,IAAI,EAAE,IAAI,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAA;CAAE,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,OAAO,gBAaxC"}

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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-export default async function createWebAuthnCredentialCreationOptions(root, { extensionOptions, username }, { modules, userId, req }) {
+export default async function createWebAuthnCredentialCreationOptions(root, { extensionOptions, username }, { modules, userId, getHeader }) {
     log(`mutation createWebAuthnCredentialCreationOptions ${username}`, {
         userId,
     });
-    const options = await modules.accounts.webAuthn.createCredentialCreationOptions(req.headers.origin, username, extensionOptions);
+    const options = await modules.users.webAuthn.createCredentialCreationOptions(getHeader('origin'), username, extensionOptions);
     return options;
 }
 //# sourceMappingURL=createWebAuthnCredentialCreationOptions.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createWebAuthnCredentialCreationOptions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uCAAuC,CACnE,IAAU,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAA+C,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAW;IAEjC,GAAG,CAAC,oDAAoD,QAAQ,EAAE,EAAE;QAClE,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,+BAA+B,CAC7E,GAAG,CAAC,OAAO,CAAC,MAAM,EAClB,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"createWebAuthnCredentialCreationOptions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,uCAAuC,CACnE,IAAU,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAA+C,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAW;IAEvC,GAAG,CAAC,oDAAoD,QAAQ,EAAE,EAAE;QAClE,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,+BAA+B,CAC1E,SAAS,CAAC,QAAQ,CAAW,EAC7B,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/lib/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.d.ts

@@ -2,5 +2,5 @@ import { Context, Root } from '@unchainedshop/types/api.js';
 export default function createWebAuthnCredentialRequestOptions(root: Root, { extensionOptions, username }: {
     username: string;
     extensionOptions: any;
-}, { modules, userId, req }: Context): Promise<any>;
+}, { modules, userId, getHeader }: Context): Promise<any>;
 //# sourceMappingURL=createWebAuthnCredentialRequestOptions.d.ts.map

package/lib/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createWebAuthnCredentialRequestOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,sCAAsC,CAClE,IAAI,EAAE,IAAI,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAA;CAAE,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,OAAO,gBAqBlC"}
+{"version":3,"file":"createWebAuthnCredentialRequestOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,sCAAsC,CAClE,IAAI,EAAE,IAAI,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,GAAG,CAAA;CAAE,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,OAAO,gBAqBxC"}

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

@@ -1,11 +1,11 @@
 import { log } from '@unchainedshop/logger';
-export default async function createWebAuthnCredentialRequestOptions(root, { extensionOptions, username }, { modules, userId, req }) {
+export default async function createWebAuthnCredentialRequestOptions(root, { extensionOptions, username }, { modules, userId, getHeader }) {
     log(`mutation createWebAuthnCredentialRequestOptions ${username}`, {
         userId,
     });
-    const options = await modules.accounts.webAuthn.createCredentialRequestOptions(req.headers.origin, username, extensionOptions);
+    const options = await modules.users.webAuthn.createCredentialRequestOptions(getHeader('origin'), username, extensionOptions);
     if (username) {
-        const user = await modules.users.findUser({ username });
+        const user = await modules.users.findUserByUsername(username);
         options.allowCredentials = user?.services?.webAuthn?.map(({ id, type }) => ({
             id,
             type: type || options.type || 'public-key',

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

@@ -1 +1 @@
-{"version":3,"file":"createWebAuthnCredentialRequestOptions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sCAAsC,CAClE,IAAU,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAA+C,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAW;IAEjC,GAAG,CAAC,mDAAmD,QAAQ,EAAE,EAAE;QACjE,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,8BAA8B,CAC5E,GAAG,CAAC,OAAO,CAAC,MAAM,EAClB,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,gBAAgB,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1E,EAAE;YACF,IAAI,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,YAAY;SAC3C,CAAC,CAAC,CAAC;IACN,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"createWebAuthnCredentialRequestOptions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sCAAsC,CAClE,IAAU,EACV,EAAE,gBAAgB,EAAE,QAAQ,EAA+C,EAC3E,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAW;IAEvC,GAAG,CAAC,mDAAmD,QAAQ,EAAE,EAAE;QACjE,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,8BAA8B,CACzE,SAAS,CAAC,QAAQ,CAAW,EAC7B,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC9D,OAAO,CAAC,gBAAgB,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1E,EAAE;YACF,IAAI,EAAE,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,YAAY;SAC3C,CAAC,CAAC,CAAC;IACN,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/lib/resolvers/mutations/accounts/enrollUser.d.ts

@@ -1,4 +1,4 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
-import { UserData } from '@unchainedshop/types/accounts.js';
+import { UserData } from '@unchainedshop/types/user.js';
 export default function enrollUser(root: Root, params: UserData, context: Context): Promise<import("@unchainedshop/types/user.js").User>;
 //# sourceMappingURL=enrollUser.d.ts.map

package/lib/resolvers/mutations/accounts/enrollUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrollUser.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAS5D,wBAA8B,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,wDA4BtF"}
+{"version":3,"file":"enrollUser.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AASxD,wBAA8B,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,wDA6BtF"}

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

@@ -1,30 +1,27 @@
 import { log } from '@unchainedshop/logger';
-import { hashPassword } from '../../../hashPassword.js';
-import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, } from '../../../errors.js';
+import { AuthOperationFailedError, EmailAlreadyExistsError, PasswordInvalidError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, } from '../../../errors.js';
 export default async function enrollUser(root, params, context) {
     const { modules } = context;
     log('mutation enrollUser', { email: params.email, userId: context.userId });
-    const mappedUserData = params;
-    mappedUserData.initialPassword = true;
-    if (mappedUserData.plainPassword) {
-        mappedUserData.password = hashPassword(mappedUserData.plainPassword);
+    if (!params.username && !params.email) {
+        throw new UsernameOrEmailRequiredError({});
     }
-    delete mappedUserData.plainPassword;
-    // Skip Messaging when password is set so we
-    // don't send a verification e-mail after enrollment
     try {
-        const userId = await modules.accounts.createUser(mappedUserData, {
-            skipMessaging: !!mappedUserData.password,
+        const userId = await modules.users.createUser({
+            ...params,
+            initialPassword: true,
+        }, {
+            skipMessaging: !!params.password,
         });
         return modules.users.findUserById(userId);
     }
     catch (e) {
-        if (e.code === 'EmailAlreadyExists')
+        if (e.cause === 'EMAIL_INVALID')
             throw new EmailAlreadyExistsError({ email: params?.email });
-        else if (e.code === 'UsernameAlreadyExists')
-            throw new UsernameAlreadyExistsError({ username: params?.username, email: params.email });
-        else if (e.code === 'UsernameOrEmailRequired')
-            throw new UsernameOrEmailRequiredError({ username: params?.username, email: params.email });
+        else if (e.cause === 'USERNAME_INVALID')
+            throw new UsernameAlreadyExistsError({ username: params?.username });
+        else if (e.cause === 'PASSWORD_INVALID')
+            throw new PasswordInvalidError({ username: params?.username });
         else
             throw new AuthOperationFailedError({ username: params?.username, email: params.email });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"enrollUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,MAAM,CAAC;IAC9B,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;QACjC,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;YAC/D,aAAa,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ;SACzC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB;YAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5F,IAAI,CAAC,CAAC,IAAI,KAAK,uBAAuB;YACzC,MAAM,IAAI,0BAA0B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;aACvF,IAAI,CAAC,CAAC,IAAI,KAAK,yBAAyB;YAC3C,MAAM,IAAI,4BAA4B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;;YACzF,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/F,CAAC;AACH,CAAC"}
+{"version":3,"file":"enrollUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE5E,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtC,MAAM,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC3C;YACE,GAAG,MAAM;YACT,eAAe,EAAE,IAAI;SACtB,EACD;YACE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ;SACjC,CACF,CAAC;QAEF,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,KAAK,KAAK,eAAe;YAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;aACxF,IAAI,CAAC,CAAC,KAAK,KAAK,kBAAkB;YACrC,MAAM,IAAI,0BAA0B,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;aAClE,IAAI,CAAC,CAAC,KAAK,KAAK,kBAAkB;YACrC,MAAM,IAAI,oBAAoB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;;YAC5D,MAAM,IAAI,wBAAwB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/F,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/accounts/forgotPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/forgotPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,cAAc,CAC1C,IAAI,EAAE,IAAI,EACV,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO;;GAa7B"}
+{"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/forgotPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,cAAc,CAC1C,IAAI,EAAE,IAAI,EACV,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO;;GAiB7B"}

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

@@ -1,17 +1,20 @@
 import { log } from '@unchainedshop/logger';
-import { AuthOperationFailedError, UserNotFoundError } from '../../../errors.js';
+import { UserNotFoundError } from '../../../errors.js';
 export default async function forgotPassword(root, { email }, { modules, userId }) {
     log('mutation forgotPassword', { email, userId });
-    let success = false;
+    const user = await modules.users.findUserByEmail(email);
+    if (!user)
+        throw new UserNotFoundError({ email });
     try {
-        success = await modules.accounts.sendResetPasswordEmail(email);
+        await modules.users.sendResetPasswordEmail(user._id, email);
+        return {
+            success: true,
+        };
     }
     catch (e) {
-        if (e.code === 'UserNotFound')
-            throw new UserNotFoundError({ email });
-        else
-            throw new AuthOperationFailedError({ email });
+        return {
+            success: false,
+        };
     }
-    return { success };
 }
 //# sourceMappingURL=forgotPassword.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"forgotPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/forgotPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEjF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,EAAE,KAAK,EAAqB,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc;YAAE,MAAM,IAAI,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;;YACjE,MAAM,IAAI,wBAAwB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}
+{"version":3,"file":"forgotPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/forgotPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,EAAE,KAAK,EAAqB,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACxD,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;AACH,CAAC"}

package/lib/resolvers/mutations/accounts/loginAsGuest.d.ts

@@ -1,7 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 export default function loginAsGuest(root: Root, _: any, context: Context): Promise<{
-    id: string;
-    token: string;
+    _id: string;
     tokenExpires: Date;
 }>;
 //# sourceMappingURL=loginAsGuest.d.ts.map

package/lib/resolvers/mutations/accounts/loginAsGuest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loginAsGuest.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO;;;;GAQ9E"}
+{"version":3,"file":"loginAsGuest.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAK5D,wBAA8B,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO;;;GAyB9E"}

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

@@ -1,8 +1,23 @@
 import { log } from '@unchainedshop/logger';
+import moniker from 'moniker';
+import { randomValueHex } from '@unchainedshop/utils';
 export default async function loginAsGuest(root, _, context) {
-    const { modules } = context;
     log('mutation loginAsGuest');
-    const loginToken = await modules.accounts.loginWithService({ service: 'guest' }, context);
-    return loginToken;
+    const guestname = `${moniker.choose()}-${randomValueHex(5)}`;
+    const guestUserId = await context.modules.users.createUser({
+        email: `${guestname}@unchained.local`,
+        guest: true,
+        password: null,
+        initialPassword: true,
+    }, { skipMessaging: true });
+    let user = await context.modules.users.findUserById(guestUserId);
+    user = await context.modules.users.updateHeartbeat(user._id, {
+        remoteAddress: context.remoteAddress,
+        remotePort: context.remotePort,
+        userAgent: context.userAgent,
+        locale: context.localeContext.normalized,
+        countryCode: context.countryContext,
+    });
+    return context.login(user);
 }
 //# sourceMappingURL=loginAsGuest.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"loginAsGuest.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,IAAU,EAAE,CAAM,EAAE,OAAgB;IAC7E,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAE7B,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAE1F,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"loginAsGuest.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,IAAU,EAAE,CAAM,EAAE,OAAgB;IAC7E,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAE7B,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7D,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CACxD;QACE,KAAK,EAAE,GAAG,SAAS,kBAAkB;QACrC,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,IAAI;QACd,eAAe,EAAE,IAAI;KACtB,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;IAEF,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEjE,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3D,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,UAAU;QACxC,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC"}

package/lib/resolvers/mutations/accounts/loginWithPassword.d.ts

@@ -2,11 +2,9 @@ import { Context, Root } from '@unchainedshop/types/api.js';
 export default function loginWithPassword(root: Root, params: {
     username?: string;
     email?: string;
-    plainPassword?: string;
-    totpCode?: string;
+    password?: string;
 }, context: Context): Promise<{
-    id: string;
-    token: string;
+    _id: string;
     tokenExpires: Date;
 }>;
 //# sourceMappingURL=loginWithPassword.d.ts.map

package/lib/resolvers/mutations/accounts/loginWithPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loginWithPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAW5D,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,EACD,OAAO,EAAE,OAAO;;;;GAiCjB"}
+{"version":3,"file":"loginWithPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,EACD,OAAO,EAAE,OAAO;;;GAsCjB"}

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

@@ -1,35 +1,32 @@
 import { log } from '@unchainedshop/logger';
-import { AuthenticationFailedError, AuthOperationFailedError, InvalidCredentialsError, TwoFactorCodeDidNotMatchError, TwoFactorCodeRequiredError, UserDeactivatedError, } from '../../../errors.js';
-import { hashPassword } from '../../../hashPassword.js';
+import { InvalidCredentialsError } from '../../../errors.js';
 export default async function loginWithPassword(root, params, context) {
-    const { modules } = context;
-    const { username, email, plainPassword, totpCode } = params;
+    const { username, email, password } = params;
     log('mutation loginWithPassword', { username, email });
-    if (!plainPassword) {
+    if (!password) {
         throw new Error('Password is required');
     }
-    const mappedUserLoginParams = {
-        user: email ? { email } : { username },
-        password: hashPassword(plainPassword),
-        code: totpCode,
-    };
-    try {
-        const result = await modules.accounts.loginWithService({ service: 'password', ...mappedUserLoginParams }, context);
-        return result;
+    let user = username
+        ? await context.modules.users.findUserByUsername(username)
+        : await context.modules.users.findUserByEmail(email);
+    const verified = user.services?.password &&
+        (await context.modules.users.verifyPassword(user.services.password, password));
+    if (!verified)
+        throw new InvalidCredentialsError({ username, email });
+    if (user.guest) {
+        await context.modules.users.updateGuest(user, false);
     }
-    catch (e) {
-        if (e.code === 'AuthenticationFailed')
-            throw new AuthenticationFailedError({ username, email });
-        else if (e.code === 'UserDeactivated')
-            throw new UserDeactivatedError({ username, email });
-        else if (e.code === 'InvalidCredentials')
-            throw new InvalidCredentialsError({ username, email });
-        else if (e?.message?.includes('2FA code required'))
-            throw new TwoFactorCodeRequiredError({ username, email });
-        else if (e?.message?.includes("2FA code didn't match"))
-            throw new TwoFactorCodeDidNotMatchError({ submittedCode: params.totpCode, username, email });
-        else
-            throw new AuthOperationFailedError({ submittedCode: params.totpCode, username, email });
+    user = await context.modules.users.updateHeartbeat(user._id, {
+        remoteAddress: context.remoteAddress,
+        remotePort: context.remotePort,
+        userAgent: context.userAgent,
+        locale: context.localeContext.normalized,
+        countryCode: context.countryContext,
+    });
+    if (context.userId) {
+        await context.services.users.migrateUserData(context.userId, user._id, context);
     }
+    await context.services.orders.nextUserCart({ user, countryCode: context.countryContext }, context);
+    return context.login(user);
 }
 //# sourceMappingURL=loginWithPassword.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,6BAA6B,EAC7B,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5D,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,qBAAqB,GAAG;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;QACtC,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC;QACrC,IAAI,EAAE,QAAQ;KACf,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CACpD,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,qBAAqB,EAAE,EACjD,OAAO,CACR,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;aAC3F,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB;YAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;aACtF,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB;YAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;aAC5F,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,mBAAmB,CAAC;YAChD,MAAM,IAAI,0BAA0B,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;aACvD,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,uBAAuB,CAAC;YACpD,MAAM,IAAI,6BAA6B,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;;YAC1F,MAAM,IAAI,wBAAwB,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/F,CAAC;AACH,CAAC"}
+{"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAC7C,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,IAAI,GAAG,QAAQ;QACjB,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC;QAC1D,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAEvD,MAAM,QAAQ,GACZ,IAAI,CAAC,QAAQ,EAAE,QAAQ;QACvB,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEjF,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEtE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3D,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,UAAU;QACxC,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;IAEnG,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC"}

package/lib/resolvers/mutations/accounts/loginWithWebAuthn.d.ts

@@ -2,8 +2,7 @@ import { Context, Root } from '@unchainedshop/types/api.js';
 export default function loginWithWebAuthn(root: Root, params: {
     webAuthnPublicKeyCredentials?: any;
 }, context: Context): Promise<{
-    id: string;
-    token: string;
+    _id: string;
     tokenExpires: Date;
 }>;
 //# sourceMappingURL=loginWithWebAuthn.d.ts.map

package/lib/resolvers/mutations/accounts/loginWithWebAuthn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loginWithWebAuthn.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithWebAuthn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAO5D,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,4BAA4B,CAAC,EAAE,GAAG,CAAC;CACpC,EACD,OAAO,EAAE,OAAO;;;;GAajB"}
+{"version":3,"file":"loginWithWebAuthn.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithWebAuthn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,4BAA4B,CAAC,EAAE,GAAG,CAAC;CACpC,EACD,OAAO,EAAE,OAAO;;;GAyBjB"}

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

@@ -1,19 +1,18 @@
 import { log } from '@unchainedshop/logger';
-import { AuthenticationFailedError, AuthOperationFailedError, UserDeactivatedError, } from '../../../errors.js';
 export default async function loginWithWebAuthn(root, params, context) {
-    const { modules } = context;
     log('mutation loginWithWebAuthn');
-    try {
-        const result = await modules.accounts.loginWithService({ service: 'webAuthn', ...params }, context);
-        return result;
-    }
-    catch (e) {
-        if (e.code === 'AuthenticationFailed')
-            throw new AuthenticationFailedError({});
-        else if (e.code === 'UserDeactivated')
-            throw new UserDeactivatedError({});
-        else
-            throw new AuthOperationFailedError({});
-    }
+    const username = Buffer.from(params.webAuthnPublicKeyCredentials?.response?.userHandle, 'base64').toString() || '';
+    let user = await context.modules.users.findUserByUsername(username);
+    if (!user)
+        throw new Error('User not found');
+    await context.modules.users.webAuthn.verifyCredentialRequest(user.services?.webAuthn, user.username, params.webAuthnPublicKeyCredentials);
+    user = await context.modules.users.updateHeartbeat(user._id, {
+        remoteAddress: context.remoteAddress,
+        remotePort: context.remotePort,
+        userAgent: context.userAgent,
+        locale: context.localeContext.normalized,
+        countryCode: context.countryContext,
+    });
+    return context.login(user);
 }
 //# sourceMappingURL=loginWithWebAuthn.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"loginWithWebAuthn.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithWebAuthn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAEC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;QACpG,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC;aAC1E,IAAI,CAAC,CAAC,IAAI,KAAK,iBAAiB;YAAE,MAAM,IAAI,oBAAoB,CAAC,EAAE,CAAC,CAAC;;YACrE,MAAM,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC"}
+{"version":3,"file":"loginWithWebAuthn.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithWebAuthn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAEC,EACD,OAAgB;IAEhB,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAElC,MAAM,QAAQ,GACZ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;IAEpG,IAAI,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE7C,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAC1D,IAAI,CAAC,QAAQ,EAAE,QAAQ,EACvB,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,4BAA4B,CACpC,CAAC;IAEF,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3D,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,UAAU;QACxC,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC"}

package/lib/resolvers/mutations/accounts/logout.d.ts

@@ -1,7 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
-export default function logout(root: Root, { token }: {
-    token: string;
-}, context: Context): Promise<{
+export default function logout(root: Root, _: never, context: Context): Promise<{
     success: boolean;
 }>;
 //# sourceMappingURL=logout.d.ts.map

package/lib/resolvers/mutations/accounts/logout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,EAAE,OAAO;;GAwB9F"}
+{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;;GAQ1E"}

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

@@ -1,21 +1,8 @@
-import { log, LogLevel } from '@unchainedshop/logger';
-export default async function logout(root, { token }, context) {
-    const { modules, userId, setLoginToken } = context;
+import { log } from '@unchainedshop/logger';
+export default async function logout(root, _, context) {
+    const { userId } = context;
     log('mutation logout', { userId });
-    const loggedOut = await modules.accounts.logout({
-        token,
-        loginToken: context.loginToken,
-        userId: context.userId,
-    }, context);
-    if (loggedOut.error) {
-        log('Error while logging out', {
-            logLevel: LogLevel.Error,
-            ...loggedOut.error,
-        });
-    }
-    else {
-        setLoginToken(null);
-    }
-    return { success: loggedOut.success };
+    const success = await context.logout();
+    return { success };
 }
 //# sourceMappingURL=logout.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,IAAU,EAAE,EAAE,KAAK,EAAqB,EAAE,OAAgB;IAC7F,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C;QACE,KAAK;QACL,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,EACD,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,IAAU,EAAE,CAAQ,EAAE,OAAgB;IACzE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,GAAG,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;IAEvC,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}

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

@@ -5,7 +5,7 @@ export default async function removeEmail(root, params, { modules, userId }) {
     log(`mutation removeEmail ${params.email} ${normalizedUserId}`, { userId });
     if (!(await modules.users.userExists({ userId: normalizedUserId })))
         throw new UserNotFoundError({ userId: normalizedUserId });
-    await modules.accounts.removeEmail(normalizedUserId, params.email);
+    await modules.users.removeEmail(normalizedUserId, params.email);
     return modules.users.findUserById(normalizedUserId);
 }
 //# sourceMappingURL=removeEmail.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"removeEmail.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAA0C,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,wBAAwB,MAAM,CAAC,KAAK,IAAI,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE5D,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAEnE,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"removeEmail.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAA0C,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,wBAAwB,MAAM,CAAC,KAAK,IAAI,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5E,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACjE,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE5D,MAAM,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/mutations/accounts/resetPassword.d.ts

@@ -1,10 +1,9 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 export default function resetPassword(root: Root, params: {
-    newPlainPassword?: string;
+    newPassword?: string;
     token: string;
 }, context: Context): Promise<{
-    id: string;
-    token: string;
+    _id: string;
     tokenExpires: Date;
 }>;
 //# sourceMappingURL=resetPassword.d.ts.map

package/lib/resolvers/mutations/accounts/resetPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resetPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAU5D,wBAA8B,aAAa,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EACpD,OAAO,EAAE,OAAO;;;;GAwDjB"}
+{"version":3,"file":"resetPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,aAAa,CACzC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC/C,OAAO,EAAE,OAAO;;;GA4DjB"}