@unchainedshop/api 2.0.0-beta7 → 2.0.0-beta9

package/lib/express/createSingleSignOnMiddleware.js

@@ -0,0 +1,71 @@
+/// <reference lib="dom" />
+import { createLogger } from '@unchainedshop/logger';
+import cookie from 'cookie';
+const { ROOT_URL, NODE_ENV, UNCHAINED_CLOUD_ENDPOINT } = process.env;
+const logger = createLogger('unchained:unchained-cloud-sso');
+const loginWithSingleSignOn = async (remoteToken, context) => {
+    const domain = process.env.UNCHAINED_COOKIE_DOMAIN || new URL(ROOT_URL).hostname || 'localhost';
+    const result = await fetch(UNCHAINED_CLOUD_ENDPOINT, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/json',
+        },
+        body: JSON.stringify({
+            operationName: 'consume',
+            variables: {
+                token: remoteToken,
+            },
+            query: 'mutation consume($token: ID!) { controlConsumeSingleSignOnToken(token: $token) { domain } }',
+        }),
+    });
+    const json = await result.json();
+    if (json?.errors?.length > 0) {
+        throw new Error(json.errors[0].message);
+    }
+    if (domain === 'localhost' || domain === json?.data?.controlConsumeSingleSignOnToken?.domain) {
+        // create sso user if not exist and login
+        const ssoUserId = (await context.modules.users.findUser({ username: 'sso' }))?._id ||
+            (await context.modules.accounts.createUser({
+                username: 'sso',
+                roles: ['admin'],
+                email: 'sso@unchained.local',
+                password: null,
+                guest: false,
+            }, { skipMessaging: true }));
+        const { tokenExpires, token } = await context.modules.accounts.createLoginToken(ssoUserId, context);
+        const expires = new Date(tokenExpires || new Date().getTime() + 100000);
+        const authCookie = cookie.serialize(process.env.UNCHAINED_COOKIE_NAME, token, {
+            domain,
+            httpOnly: true,
+            expires,
+            path: '/',
+            sameSite: 'strict',
+            secure: NODE_ENV === 'production',
+        });
+        return authCookie;
+    }
+    throw new Error('Invalid token/domain pair');
+};
+export default function singleSignOnMiddleware(contextResolver) {
+    return async (req, res, next) => {
+        try {
+            if (req.query?.token) {
+                const context = await contextResolver({ req, res });
+                const authCookie = await loginWithSingleSignOn(req.query.token, context);
+                if (authCookie) {
+                    res.writeHead(303, {
+                        'Set-Cookie': authCookie,
+                        Location: '/',
+                    });
+                    res.end();
+                    return;
+                }
+            }
+        }
+        catch (e) {
+            logger.error(e.message);
+        }
+        next();
+    };
+}
+//# sourceMappingURL=createSingleSignOnMiddleware.js.map

package/lib/express/createSingleSignOnMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"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"}

package/lib/express/index.d.ts

@@ -0,0 +1,6 @@
+import { ApolloServer } from '@apollo/server';
+import type e from 'express';
+export declare const useMiddlewareWithCurrentContext: (expressApp: any, path: any, ...middleware: any[]) => void;
+export declare const connect: (expressApp: e.Express, { apolloGraphQLServer }: {
+    apolloGraphQLServer: ApolloServer;
+}) => void;

package/lib/express/index.js

@@ -0,0 +1,27 @@
+import { getCurrentContextResolver } from '../context';
+import createBulkImportMiddleware from './createBulkImportMiddleware';
+import createERCMetadataMiddleware from './createERCMetadataMiddleware';
+import createApolloMiddleware from './createApolloMiddleware';
+import createSingleSignOnMiddleware from './createSingleSignOnMiddleware';
+const { BULK_IMPORT_API_PATH = '/bulk-import', ERC_METADATA_API_PATH = '/erc-metadata', GRAPHQL_API_PATH = '/graphql', } = process.env;
+export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
+    const context = getCurrentContextResolver();
+    const addContext = async function middlewareWithContext(req, res, next) {
+        try {
+            req.unchainedContext = await context({ req, res });
+            next();
+        }
+        catch (error) {
+            next(error);
+        }
+    };
+    expressApp.use(path, addContext, ...middleware);
+};
+export const connect = (expressApp, { apolloGraphQLServer }) => {
+    const contextResolver = getCurrentContextResolver();
+    expressApp.use(GRAPHQL_API_PATH, createApolloMiddleware(contextResolver, { apolloGraphQLServer }));
+    expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware(contextResolver));
+    expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware(contextResolver));
+    expressApp.use(['/', '/.well-known/unchained/cloud-sso'], createSingleSignOnMiddleware(contextResolver));
+};
+//# sourceMappingURL=index.js.map

package/lib/express/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,0BAA0B,MAAM,8BAA8B,CAAC;AACtE,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,MAAM,EACJ,oBAAoB,GAAG,cAAc,EACrC,qBAAqB,GAAG,eAAe,EACvC,gBAAgB,GAAG,UAAU,GAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,yBAAyB,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,KAAK,UAAU,qBAAqB,CACrD,GAA0D,EAC1D,GAAoB,EACpB,IAAI;QAEJ,IAAI;YACF,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,UAAqB,EACrB,EAAE,mBAAmB,EAAyC,EAC9D,EAAE;IACF,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,UAAU,CAAC,GAAG,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,eAAe,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IACnG,UAAU,CAAC,GAAG,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,eAAe,CAAC,CAAC,CAAC;IACpF,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC;IAClF,UAAU,CAAC,GAAG,CACZ,CAAC,GAAG,EAAE,kCAAkC,CAAC,EACzC,4BAA4B,CAAC,eAAe,CAAC,CAC9C,CAAC;AACJ,CAAC,CAAC"}

package/lib/loaders/index.js

@@ -12,13 +12,10 @@ export default async (req, res, unchainedAPI) => {
                 includeInactive: true,
                 includeLeaves: true,
             });
-            return queries.map(({ assortmentId, includeInactive }) => {
+            return queries.map(({ assortmentId }) => {
                 return assortments.find((assortment) => {
                     if (assortment._id !== assortmentId)
                         return false;
-                    if (!includeInactive) {
-                        return assortment.isActive === true;
-                    }
                     return true;
                 });
             });
@@ -85,15 +82,14 @@ export default async (req, res, unchainedAPI) => {
             const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
             const products = await unchainedAPI.modules.products.findProducts({
                 productIds,
-                includeDrafts: true,
+                productSelector: {
+                    status: { $in: [null, ProductStatus.ACTIVE, ProductStatus.DELETED] },
+                },
             });
-            return queries.map(({ productId, includeDrafts }) => {
+            return queries.map(({ productId }) => {
                 return products.find((product) => {
                     if (product._id !== productId)
                         return false;
-                    if (!includeDrafts) {
-                        return product.status === ProductStatus.ACTIVE;
-                    }
                     return true;
                 });
             });

package/lib/loaders/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"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"}

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

@@ -1,8 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function changePassword(root: Root, params: {
-    oldPassword?: string;
     oldPlainPassword?: string;
-    newPassword?: string;
     newPlainPassword?: string;
 }, { modules, userId }: Context): Promise<{
     success: boolean;

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

@@ -1,13 +1,24 @@
 import { log } from '@unchainedshop/logger';
+import { AuthOperationFailedError, InvalidCredentialsError } from '../../../errors';
 export default async function changePassword(root, params, { modules, userId }) {
     log('mutation changePassword', { userId });
-    if (!params.newPassword && !params.newPlainPassword) {
+    if (!params.newPlainPassword) {
         throw new Error('New password is required');
     }
-    if (!params.oldPassword && !params.oldPlainPassword) {
+    if (!params.oldPlainPassword) {
         throw new Error('Old password is required');
     }
-    const success = await modules.accounts.changePassword(userId, params);
+    let success = false;
+    try {
+        success = await modules.accounts.changePassword(userId, params);
+    }
+    catch (e) {
+        success = false;
+        if (e.code === 'InvalidCredentials')
+            throw new InvalidCredentialsError({});
+        else
+            throw new AuthOperationFailedError({});
+    }
     return { success };
 }
 //# sourceMappingURL=changePassword.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"changePassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAKC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}
+{"version":3,"file":"changePassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAEpF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAGC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI;QACF,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,GAAG,KAAK,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,oBAAoB;YAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,CAAC,CAAC;;YACtE,MAAM,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;KAC7C;IAED,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}

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

@@ -1,22 +1,36 @@
 import { log } from '@unchainedshop/logger';
 import { hashPassword } from '../../../hashPassword';
+import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, } from '../../../errors';
 export default async function createUser(root, params, context) {
     const { modules, userId } = context;
     log('mutation createUser', { email: params.email, username: params.username, userId });
-    if (!params.password && !params.plainPassword && !params.webAuthnPublicKeyCredentials) {
+    if (!params.plainPassword && !params.webAuthnPublicKeyCredentials) {
         throw new Error('Password or Public Key is required');
     }
     const mappedUser = { ...params };
-    if (!mappedUser.password && mappedUser.plainPassword) {
+    if (mappedUser.plainPassword) {
         mappedUser.password = hashPassword(mappedUser.plainPassword);
     }
     delete mappedUser.plainPassword;
     delete mappedUser.webAuthnPublicKeyCredentials;
     const webAuthnService = params.webAuthnPublicKeyCredentials &&
         (await modules.accounts.webAuthn.verifyCredentialCreation(params.username, params.webAuthnPublicKeyCredentials));
-    const newUserId = await modules.accounts.createUser(mappedUser, {
-        skipPasswordEnrollment: !!webAuthnService,
-    });
+    let newUserId;
+    try {
+        newUserId = await modules.accounts.createUser(mappedUser, {
+            skipPasswordEnrollment: !!webAuthnService,
+        });
+    }
+    catch (e) {
+        if (e.code === 'EmailAlreadyExists')
+            throw new EmailAlreadyExistsError({ email: params?.email });
+        else if (e.code === 'UsernameAlreadyExists')
+            throw new UsernameAlreadyExistsError({ username: params?.username });
+        else if (e.code === 'UsernameOrEmailRequired')
+            throw new UsernameOrEmailRequiredError({ username: params?.username });
+        else
+            throw new AuthOperationFailedError({ username: params?.username, email: params.email });
+    }
     if (newUserId && webAuthnService) {
         await modules.users.updateUser({ _id: newUserId }, {
             $push: {

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,uBAAuB,CAAC;AAErD,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,aAAa,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE;QACrF,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,aAAa,EAAE;QACpD,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KAC9D;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;IAEL,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;QAC9D,sBAAsB,EAAE,CAAC,CAAC,eAAe;KAC1C,CAAC,CAAC;IAEH,IAAI,SAAS,IAAI,eAAe,EAAE;QAChC,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;KACH;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,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,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;QACjE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,UAAU,CAAC,aAAa,EAAE;QAC5B,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KAC9D;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;QACF,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;YACxD,sBAAsB,EAAE,CAAC,CAAC,eAAe;SAC1C,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,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;KAC9F;IAED,IAAI,SAAS,IAAI,eAAe,EAAE;QAChC,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;KACH;IAED,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}

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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { UserNotFoundError } from '../../../errors';
+import { TwoFactorCodeDidNotMatchError, TwoFactorNotSetError, UserNotFoundError } from '../../../errors';
 export default async function disableTOTP(root, params, { modules, userId }) {
     const normalizedUserId = params.userId || userId;
     log(`mutation disableTOTP ${params.code} ${normalizedUserId}`, {
@@ -8,7 +8,20 @@ export default async function disableTOTP(root, params, { modules, userId }) {
     const user = await modules.users.findUserById(normalizedUserId);
     if (!user)
         throw new UserNotFoundError({ userId: normalizedUserId });
-    await modules.accounts.disableTOTP(normalizedUserId, params.code);
+    try {
+        await modules.accounts.disableTOTP(normalizedUserId, params.code);
+    }
+    catch (e) {
+        if (e?.message?.includes("2FA code didn't match"))
+            throw new TwoFactorCodeDidNotMatchError({
+                submittedCode: params.code,
+                userId: params?.userId || userId,
+            });
+        else if (e?.message?.includes('2FA not set'))
+            throw new TwoFactorNotSetError({ userId: params?.userId || userId });
+        else
+            throw e;
+    }
     return user;
 }
 //# sourceMappingURL=disableTOTP.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"disableTOTP.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/disableTOTP.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAAwC,EACxC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,wBAAwB,MAAM,CAAC,IAAI,IAAI,gBAAgB,EAAE,EAAE;QAC7D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAErE,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAElE,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"disableTOTP.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/disableTOTP.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAAwC,EACxC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,wBAAwB,MAAM,CAAC,IAAI,IAAI,gBAAgB,EAAE,EAAE;QAC7D,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACrE,IAAI;QACF,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KACnE;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,uBAAuB,CAAC;YAC/C,MAAM,IAAI,6BAA6B,CAAC;gBACtC,aAAa,EAAE,MAAM,CAAC,IAAI;gBAC1B,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,MAAM;aACjC,CAAC,CAAC;aACA,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC;YAC1C,MAAM,IAAI,oBAAoB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;;YAClE,MAAM,CAAC,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}

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

@@ -1,9 +1,20 @@
 import { log } from '@unchainedshop/logger';
+import { TwoFactorAlreadySetError, TwoFactorCodeDidNotMatchError } from '../../../errors';
 export default async function enableTOTP(root, params, { modules, userId }) {
     log(`mutation enableTOTP ${params.code}`, {
         userId,
     });
-    await modules.accounts.enableTOTP(userId, params.secretBase32, params.code);
+    try {
+        await modules.accounts.enableTOTP(userId, params.secretBase32, params.code);
+    }
+    catch (e) {
+        if (e?.message?.includes("2FA code didn't match"))
+            throw new TwoFactorCodeDidNotMatchError({ submittedCode: params.code, userId });
+        else if (e?.message?.includes('2FA already set'))
+            throw new TwoFactorAlreadySetError({ userId });
+        else
+            throw e;
+    }
     return modules.users.findUserById(userId);
 }
 //# sourceMappingURL=enableTOTP.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"enableTOTP.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enableTOTP.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CACtC,IAAU,EACV,MAA8C,EAC9C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,uBAAuB,MAAM,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM;KACP,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE5E,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"enableTOTP.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enableTOTP.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAE1F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CACtC,IAAU,EACV,MAA8C,EAC9C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,uBAAuB,MAAM,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM;KACP,CAAC,CAAC;IACH,IAAI;QACF,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KAC7E;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,uBAAuB,CAAC;YAC/C,MAAM,IAAI,6BAA6B,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;aAC7E,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,iBAAiB,CAAC;YAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;;YAC5F,MAAM,CAAC,CAAC;KACd;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}

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

@@ -1,19 +1,32 @@
 import { log } from '@unchainedshop/logger';
 import { hashPassword } from '../../../hashPassword';
+import { AuthOperationFailedError, EmailAlreadyExistsError, UsernameAlreadyExistsError, UsernameOrEmailRequiredError, } from '../../../errors';
 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.password && mappedUserData.plainPassword) {
+    if (mappedUserData.plainPassword) {
         mappedUserData.password = hashPassword(mappedUserData.plainPassword);
     }
     delete mappedUserData.plainPassword;
     // Skip Messaging when password is set so we
     // don't send a verification e-mail after enrollment
-    const userId = await modules.accounts.createUser(mappedUserData, {
-        skipMessaging: !!mappedUserData.password,
-    });
-    return modules.users.findUserById(userId);
+    try {
+        const userId = await modules.accounts.createUser(mappedUserData, {
+            skipMessaging: !!mappedUserData.password,
+        });
+        return modules.users.findUserById(userId);
+    }
+    catch (e) {
+        if (e.code === 'EmailAlreadyExists')
+            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
+            throw new AuthOperationFailedError({ username: params?.username, email: params.email });
+    }
 }
 //# sourceMappingURL=enrollUser.js.map

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,uBAAuB,CAAC;AAErD,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,CAAC,QAAQ,IAAI,cAAc,CAAC,aAAa,EAAE;QAC5D,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACtE;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;QAC/D,aAAa,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ;KACzC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,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,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAC1B,4BAA4B,GAC7B,MAAM,iBAAiB,CAAC;AAEzB,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;QAChC,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACtE;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,IAAI;QACF,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;KAC3C;IAAC,OAAO,CAAC,EAAE;QACV,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;KAC9F;AACH,CAAC"}

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

@@ -1,7 +1,17 @@
 import { log } from '@unchainedshop/logger';
+import { AuthOperationFailedError, UserNotFoundError } from '../../../errors';
 export default async function forgotPassword(root, { email }, { modules, userId }) {
     log('mutation forgotPassword', { email, userId });
-    const success = await modules.accounts.sendResetPasswordEmail(email);
+    let success = false;
+    try {
+        success = await modules.accounts.sendResetPasswordEmail(email);
+    }
+    catch (e) {
+        if (e.code === 'UserNotFound')
+            throw new UserNotFoundError({ email });
+        else
+            throw new AuthOperationFailedError({ email });
+    }
     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;AAG5C,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,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAErE,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,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAE9E,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;QACF,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;KAChE;IAAC,OAAO,CAAC,EAAE;QACV,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;KACpD;IAED,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}

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

@@ -4,7 +4,7 @@ const impersonate = async (root, { userId }, context) => {
     log(`mutation impersonate ${userId}`);
     const userToImpersonate = await context.modules.users.findUserById(userId);
     if (!userToImpersonate) {
-        throw new UserNotFoundError(`No user with id ${userId}`);
+        throw new UserNotFoundError({ userId });
     }
     if ((userToImpersonate.roles || []).includes('admin')) {
         throw new NoPermissionError("Cannot impersonate users with role 'admin'");

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

@@ -1 +1 @@
-{"version":3,"file":"impersonate.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/impersonate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEvE,MAAM,WAAW,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,OAAgB,EAAE,EAAE;IAC/D,GAAG,CAAC,wBAAwB,MAAM,EAAE,CAAC,CAAC;IAEtC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAE3E,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;KAC1D;IAED,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACrD,MAAM,IAAI,iBAAiB,CAAC,4CAA4C,CAAC,CAAC;KAC3E;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC3F,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"impersonate.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/impersonate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEvE,MAAM,WAAW,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,OAAgB,EAAE,EAAE;IAC/D,GAAG,CAAC,wBAAwB,MAAM,EAAE,CAAC,CAAC;IAEtC,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAE3E,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;KACzC;IAED,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACrD,MAAM,IAAI,iBAAiB,CAAC,4CAA4C,CAAC,CAAC;KAC3E;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC3F,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}

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

@@ -2,7 +2,6 @@ import { Context, Root } from '@unchainedshop/types/api';
 export default function loginWithPassword(root: Root, params: {
     username?: string;
     email?: string;
-    password?: string;
     plainPassword?: string;
     totpCode?: string;
 }, context: Context): Promise<{

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

@@ -1,17 +1,35 @@
 import { log } from '@unchainedshop/logger';
+import { AuthenticationFailedError, AuthOperationFailedError, InvalidCredentialsError, TwoFactorCodeDidNotMatchError, TwoFactorCodeRequiredError, UserDeactivatedError, } from '../../../errors';
 import { hashPassword } from '../../../hashPassword';
 export default async function loginWithPassword(root, params, context) {
     const { modules } = context;
-    const { username, email, password: hashedPassword, plainPassword, totpCode } = params;
+    const { username, email, plainPassword, totpCode } = params;
     log('mutation loginWithPassword', { username, email });
-    if (!hashedPassword && !plainPassword) {
+    if (!plainPassword) {
         throw new Error('Password is required');
     }
     const mappedUserLoginParams = {
         user: email ? { email } : { username },
-        password: hashedPassword || hashPassword(plainPassword),
+        password: hashPassword(plainPassword),
         code: totpCode,
     };
-    return modules.accounts.loginWithService({ service: 'password', ...mappedUserLoginParams }, context);
+    try {
+        const result = await modules.accounts.loginWithService({ service: 'password', ...mappedUserLoginParams }, context);
+        return result;
+    }
+    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 });
+    }
 }
 //# 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,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAMC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEtF,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,qBAAqB,GAAG;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;QACtC,QAAQ,EAAE,cAAc,IAAI,YAAY,CAAC,aAAa,CAAC;QACvD,IAAI,EAAE,QAAQ;KACf,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,qBAAqB,EAAE,EAAE,OAAO,CAAC,CAAC;AACvG,CAAC"}
+{"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,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,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;QAClB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;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;QACF,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;KACf;IAAC,OAAO,CAAC,EAAE;QACV,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;KAC9F;AACH,CAAC"}

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

@@ -1,7 +1,19 @@
 import { log } from '@unchainedshop/logger';
+import { AuthenticationFailedError, AuthOperationFailedError, UserDeactivatedError, } from '../../../errors';
 export default async function loginWithWebAuthn(root, params, context) {
     const { modules } = context;
     log('mutation loginWithWebAuthn');
-    return modules.accounts.loginWithService({ service: 'webAuthn', ...params }, context);
+    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({});
+    }
 }
 //# 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;AAG5C,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;IAElC,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;AACxF,CAAC"}
+{"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,iBAAiB,CAAC;AAEzB,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;QACF,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;KACf;IAAC,OAAO,CAAC,EAAE;QACV,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;KAC7C;AACH,CAAC"}

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

@@ -1,5 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api';
-export default function logout(root: Root, params: {
+export default function logout(root: Root, { token }: {
     token: string;
 }, context: Context): Promise<{
     success: boolean;

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

@@ -1,8 +1,12 @@
 import { log, LogLevel } from '@unchainedshop/logger';
-export default async function logout(root, params, context) {
+export default async function logout(root, { token }, context) {
     const { modules, userId, setLoginToken } = context;
     log('mutation logout', { userId });
-    const loggedOut = await modules.accounts.logout(params, context);
+    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,

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,MAAyB,EAAE,OAAgB;IAC1F,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,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEjE,IAAI,SAAS,CAAC,KAAK,EAAE;QACnB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;KACJ;SAAM;QACL,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;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,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;QACnB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;KACJ;SAAM;QACL,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}

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

@@ -2,7 +2,10 @@ import { log, LogLevel } from '@unchainedshop/logger';
 export default async function logoutAllSessions(root, _, context) {
     const { modules, userId, setLoginToken } = context;
     log('mutation logoutAllSessions', { userId });
-    const loggedOut = await modules.accounts.logout({}, context);
+    const loggedOut = await modules.accounts.logout({
+        loginToken: context.loginToken,
+        userId: context.userId,
+    }, context);
     if (loggedOut.error) {
         log('Error while logging out', {
             logLevel: LogLevel.Error,

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

@@ -1 +1 @@
-{"version":3,"file":"logoutAllSessions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logoutAllSessions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,CAAM,EAAE,OAAgB;IAClF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAE7D,IAAI,SAAS,CAAC,KAAK,EAAE;QACnB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;KACJ;SAAM;QACL,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}
+{"version":3,"file":"logoutAllSessions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logoutAllSessions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,CAAM,EAAE,OAAgB;IAClF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C;QACE,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,EACD,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,EAAE;QACnB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;KACJ;SAAM;QACL,aAAa,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}

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

@@ -1,6 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function resetPassword(root: Root, params: {
-    newPassword?: string;
     newPlainPassword?: string;
     token: string;
 }, context: Context): Promise<{