@unchainedshop/api 2.14.2 → 3.0.0-alpha3

package/lib/express/index.js

@@ -1,29 +1,105 @@
 import { getCurrentContextResolver } from '../context.js';
 import createBulkImportMiddleware from './createBulkImportMiddleware.js';
 import createERCMetadataMiddleware from './createERCMetadataMiddleware.js';
-import createApolloMiddleware from './createApolloMiddleware.js';
-import createSingleSignOnMiddleware from './createSingleSignOnMiddleware.js';
-const { BULK_IMPORT_API_PATH = '/bulk-import', ERC_METADATA_API_PATH = '/erc-metadata', GRAPHQL_API_PATH = '/graphql', } = process.env;
+import session from 'express-session';
+import MongoStore from 'connect-mongo';
+import setupPassport from './passport/setup.js';
+import { emit } from '@unchainedshop/events';
+import { API_EVENTS } from '../events.js';
+const resolveUserRemoteAddress = (req) => {
+    const remoteAddress = req.headers['x-real-ip'] ||
+        req.headers['x-forwarded-for'] ||
+        req.socket?.remoteAddress;
+    const remotePort = req.socket?.remotePort;
+    return { remoteAddress, remotePort };
+};
+const { BULK_IMPORT_API_PATH = '/bulk-import', ERC_METADATA_API_PATH = '/erc-metadata', GRAPHQL_API_PATH = '/graphql', UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, NODE_ENV, } = process.env;
 const addContext = async function middlewareWithContext(req, res, next) {
     try {
+        const setHeader = (key, value) => res.setHeader(key, value);
+        const getHeader = (key) => req.headers[key];
+        const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
         const context = getCurrentContextResolver();
-        req.unchainedContext = await context({ req, res });
+        const login = async (user) => {
+            await new Promise((resolve, reject) => {
+                req.login(user, (error, result) => {
+                    if (error) {
+                        return reject(error);
+                    }
+                    return resolve(result);
+                });
+            });
+            const tokenObject = {
+                _id: req.sessionID,
+                /* eslint-disable-next-line */
+                tokenExpires: new Date(req.session?.cookie._expires),
+            };
+            await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, { userId: user._id, ...tokenObject });
+            /* eslint-disable-next-line */
+            user._inLoginMethodResponse = true;
+            return { user, ...tokenObject };
+        };
+        const logout = async (sessionId) => {
+            // TODO: this should only logout an explicitly provided session if sessionID
+            // has been provided
+            // express-session destroy
+            const { user } = req;
+            if (!user)
+                return false;
+            const tokenObject = {
+                _id: sessionId || req.sessionID,
+                userId: user._id,
+            };
+            await new Promise((resolve, reject) => {
+                req.logout((error, result) => {
+                    if (error) {
+                        return reject(error);
+                    }
+                    return resolve(result);
+                });
+            });
+            await emit(API_EVENTS.API_LOGOUT, tokenObject);
+            return true;
+        };
+        req.unchainedContext = await context({
+            setHeader,
+            getHeader,
+            remoteAddress,
+            remotePort,
+            login,
+            logout,
+            user: req.user,
+            userId: req.user?._id,
+        });
         next();
     }
     catch (error) {
         next(error);
     }
 };
-export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
-    if (!path) {
-        throw new Error('Path is required for useMiddlewareWithCurrentContext');
-    }
-    expressApp.use(path, addContext, ...middleware);
-};
-export const connect = (expressApp, { apolloGraphQLServer }, options) => {
-    expressApp.use(GRAPHQL_API_PATH, createApolloMiddleware(apolloGraphQLServer, options));
+export const connect = (expressApp, { graphqlHandler, db, unchainedAPI, }) => {
+    const passport = setupPassport(unchainedAPI);
+    expressApp.use(session({
+        secret: process.env.UNCHAINED_TOKEN_SECRET,
+        store: MongoStore.create({
+            client: db.client,
+            dbName: db.databaseName,
+            collectionName: 'sessions',
+        }),
+        name: UNCHAINED_COOKIE_NAME,
+        saveUninitialized: false,
+        resave: false,
+        cookie: {
+            domain: UNCHAINED_COOKIE_DOMAIN,
+            httpOnly: Boolean(NODE_ENV === 'production'),
+            path: UNCHAINED_COOKIE_PATH,
+            sameSite: 'lax',
+            secure: NODE_ENV === 'production',
+            maxAge: 1000 * 60 * 60 * 24 * 7,
+        },
+    }), passport.initialize(), passport.session(), passport.authenticate('access-token', { session: false }), addContext);
+    expressApp.use(GRAPHQL_API_PATH, graphqlHandler.handle);
     expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware);
     expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware);
-    expressApp.use(['/', '/.well-known/unchained/cloud-sso'], createSingleSignOnMiddleware);
 };
 //# sourceMappingURL=index.js.map

package/lib/express/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,0BAA0B,MAAM,iCAAiC,CAAC;AACzE,OAAO,2BAA2B,MAAM,kCAAkC,CAAC;AAC3E,OAAO,sBAAsB,MAAM,6BAA6B,CAAC;AACjE,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAE7E,MAAM,EACJ,oBAAoB,GAAG,cAAc,EACrC,qBAAqB,GAAG,eAAe,EACvC,gBAAgB,GAAG,UAAU,GAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,UAAU,GAAG,KAAK,UAAU,qBAAqB,CACrD,GAA0D,EAC1D,GAAoB,EACpB,IAAI;IAEJ,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,yBAAyB,EAAE,CAAC;QAC5C,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,KAAK,CAAC,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE;IACjF,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IAED,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,OAA+B,EAC/B,EAAE;IACF,UAAU,CAAC,GAAG,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC;IACvF,UAAU,CAAC,GAAG,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACnE,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,CAAC;IACjE,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,kCAAkC,CAAC,EAAE,4BAA4B,CAAC,CAAC;AAC1F,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":"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"}

package/lib/express/passport/access-token-strategy.d.ts

@@ -0,0 +1,10 @@
+import Strategy from 'passport-strategy';
+export default class AccessTokenStrategy extends Strategy {
+    name: string;
+    pass: any;
+    _verify: any;
+    success: any;
+    constructor(verify: any);
+    authenticate(req: any): void;
+}
+//# sourceMappingURL=access-token-strategy.d.ts.map

package/lib/express/passport/access-token-strategy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"access-token-strategy.d.ts","sourceRoot":"","sources":["../../../src/express/passport/access-token-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAQ;IACvD,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,GAAG,CAAC;IAEV,OAAO,EAAE,GAAG,CAAC;IAEb,OAAO,EAAE,GAAG,CAAC;gBAED,MAAM,KAAA;IAalB,YAAY,CAAC,GAAG,KAAA;CAcjB"}

package/lib/express/passport/access-token-strategy.js

@@ -0,0 +1,33 @@
+import Strategy from 'passport-strategy';
+export default class AccessTokenStrategy extends Strategy {
+    name;
+    pass;
+    _verify;
+    success;
+    constructor(verify) {
+        super();
+        if (!verify) {
+            throw new TypeError('AccessTokenStrategy requires a verify callback');
+        }
+        // eslint-disable-next-line
+        this._verify = verify;
+        // Set the default name of our strategy
+        this.name = 'access-token';
+    }
+    authenticate(req) {
+        if (req.headers.authorization) {
+            const [type, token] = req.headers.authorization.split(' ');
+            if (type === 'Bearer') {
+                // eslint-disable-next-line
+                this._verify(token, (err, user) => {
+                    if (!user || err)
+                        return this.pass();
+                    this.success(user);
+                });
+                return;
+            }
+        }
+        this.pass();
+    }
+}
+//# sourceMappingURL=access-token-strategy.js.map

package/lib/express/passport/access-token-strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"access-token-strategy.js","sourceRoot":"","sources":["../../../src/express/passport/access-token-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAQ;IACvD,IAAI,CAAS;IAEb,IAAI,CAAM;IAEV,OAAO,CAAM;IAEb,OAAO,CAAM;IAEb,YAAY,MAAM;QAChB,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,SAAS,CAAC,gDAAgD,CAAC,CAAC;QACxE,CAAC;QACD,2BAA2B;QAC3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB,uCAAuC;QACvC,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;IAED,YAAY,CAAC,GAAG;QACd,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3D,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,2BAA2B;gBAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;oBAChC,IAAI,CAAC,IAAI,IAAI,GAAG;wBAAE,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;oBACrC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;IACd,CAAC;CACF"}

package/lib/express/passport/setup.d.ts

@@ -0,0 +1,4 @@
+import { UnchainedCore } from '@unchainedshop/core';
+declare const setupPassport: (unchainedAPI: UnchainedCore) => any;
+export default setupPassport;
+//# sourceMappingURL=setup.d.ts.map

package/lib/express/passport/setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/express/passport/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,QAAA,MAAM,aAAa,iBAAkB,aAAa,QAqCjD,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/lib/express/passport/setup.js

@@ -0,0 +1,30 @@
+import { Passport } from 'passport';
+import AccessTokenStrategy from './access-token-strategy.js';
+const setupPassport = (unchainedAPI) => {
+    const passport = new Passport();
+    passport.serializeUser(function serialize(user, done) {
+        done(null, user._id);
+    });
+    passport.deserializeUser(function deserialize(_id, done) {
+        unchainedAPI.modules.users.findUserById(_id).then((user) => {
+            done(null, user);
+        }, (error) => {
+            done(error, null);
+        });
+    });
+    passport.use(new AccessTokenStrategy(function verify(userToken, done) {
+        const [username] = userToken.split(':');
+        unchainedAPI.modules.users.findUserByToken(userToken).then((user) => {
+            if (user?.username === username) {
+                done(null, user);
+                return;
+            }
+            done(null, null);
+        }, (error) => {
+            done(error, null);
+        });
+    }));
+    return passport;
+};
+export default setupPassport;
+//# sourceMappingURL=setup.js.map

package/lib/express/passport/setup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/express/passport/setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAE7D,MAAM,aAAa,GAAG,CAAC,YAA2B,EAAE,EAAE;IACpD,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;IAEhC,QAAQ,CAAC,aAAa,CAAC,SAAS,SAAS,CAAC,IAAI,EAAE,IAAI;QAClD,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,CAAC,SAAS,WAAW,CAAC,GAAG,EAAE,IAAI;QACrD,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpB,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,CACV,IAAI,mBAAmB,CAAC,SAAS,MAAM,CAAC,SAAS,EAAE,IAAI;QACrD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,IAAI,CACxD,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,IAAI,EAAE,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnB,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpB,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/lib/loaders/index.d.ts

@@ -1,6 +1,5 @@
-import { IncomingMessage, OutgoingMessage } from 'http';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
-import { UnchainedLoaders } from '@unchainedshop/types/api.js';
-declare const loaders: (req: IncomingMessage, res: OutgoingMessage, unchainedAPI: UnchainedCore) => Promise<UnchainedLoaders["loaders"]>;
+import { UnchainedCore } from '@unchainedshop/core';
+import { UnchainedLoaders } from '../types.js';
+declare const loaders: (unchainedAPI: UnchainedCore) => Promise<UnchainedLoaders["loaders"]>;
 export default loaders;
 //# sourceMappingURL=index.d.ts.map

package/lib/loaders/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AA4B/D,QAAA,MAAM,OAAO,QACN,eAAe,OACf,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CA+QrC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AA0B/C,QAAA,MAAM,OAAO,iBAAwB,aAAa,KAAG,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CA8QvF,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/loaders/index.js

@@ -1,21 +1,19 @@
 import DataLoader from 'dataloader';
 import { systemLocale } from '@unchainedshop/utils';
-import localePkg from 'locale';
 import { ProductStatus } from '@unchainedshop/core-products';
-const { Locale } = localePkg;
 function getLocaleStrings(localeObj) {
-    return [localeObj.normalized, localeObj.language, systemLocale.normalized, systemLocale.language];
+    return [localeObj.baseName, localeObj.language, systemLocale.baseName, systemLocale.language];
 }
 function findMatchingText(texts, localeStrings) {
     return localeStrings.reduce((acc, localeString) => {
         if (acc)
             return acc;
-        return texts.find((p) => p.locale === localeString);
+        return texts.find((p) => p.locale.toLowerCase() === localeString.toLowerCase());
     }, null);
 }
 function getFilteredQueries({ queries, texts, filterFn }) {
     return queries.map(({ locale, ...queryParams }) => {
-        const localeObj = new Locale(locale);
+        const localeObj = new Intl.Locale(locale);
         const filteredTexts = texts.filter(filterFn(queryParams));
         if (!filteredTexts.length)
             return null;
@@ -24,7 +22,7 @@ function getFilteredQueries({ queries, texts, filterFn }) {
         return filterText || filteredTexts[0];
     });
 }
-const loaders = async (req, res, unchainedAPI) => {
+const loaders = async (unchainedAPI) => {
     return {
         assortmentLoader: new DataLoader(async (queries) => {
             const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];

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/locale-context.d.ts

@@ -1,7 +1,9 @@
-import { IncomingMessage, OutgoingMessage } from 'http';
-import { UnchainedLocaleContext } from '@unchainedshop/types/api.js';
-import 'abort-controller/polyfill.js';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { UnchainedCore } from '@unchainedshop/core';
+import { UnchainedHTTPServerContext, UnchainedLocaleContext } from './types.js';
+export type GetHeaderFn = (key: string) => string | string[];
 export declare const resolveDefaultContext: any;
-export declare const getLocaleContext: (req: IncomingMessage, res: OutgoingMessage, unchainedAPI: UnchainedCore) => Promise<UnchainedLocaleContext>;
+export declare const getLocaleContext: ({ remoteAddress, remotePort, getHeader, }: {
+    remoteAddress: string;
+    remotePort: number;
+} & UnchainedHTTPServerContext, unchainedAPI: UnchainedCore) => Promise<UnchainedLocaleContext>;
 //# sourceMappingURL=locale-context.d.ts.map

package/lib/locale-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locale-context.d.ts","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,8BAA8B,CAAC;AAStC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAO7D,eAAO,MAAM,qBAAqB,KAgDjC,CAAC;AAEF,eAAO,MAAM,gBAAgB,QACtB,eAAe,OACf,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,sBAAsB,CAQhC,CAAC"}
+{"version":3,"file":"locale-context.d.ts","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAIhF,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,EAAE,CAAC;AAE7D,eAAO,MAAM,qBAAqB,KAkDjC,CAAC;AAEF,eAAO,MAAM,gBAAgB,8CAKxB;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,0BAA0B,gBAChB,aAAa,KAC1B,OAAO,CAAC,sBAAsB,CAOhC,CAAC"}

package/lib/locale-context.js

@@ -1,9 +1,6 @@
-import localePkg from 'locale';
-import 'abort-controller/polyfill.js';
 import { log, LogLevel } from '@unchainedshop/logger';
-import { resolveBestCountry, resolveBestSupported, resolveBestCurrency, resolveUserRemoteAddress, systemLocale, } from '@unchainedshop/utils';
+import { resolveBestCountry, resolveBestSupported, resolveBestCurrency, systemLocale, } from '@unchainedshop/utils';
 import memoizee from 'memoizee';
-const { Locales } = localePkg;
 const { NODE_ENV } = process.env;
 export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry }, unchainedAPI) => {
     const languages = await unchainedAPI.modules.languages.findLanguages({ includeInactive: false }, { projection: { isoCode: 1, isActive: 1 } });
@@ -15,12 +12,11 @@ export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry
         });
         return accumulator.concat(added);
     }, []);
-    const supportedLocales = new Locales(supportedLocaleStrings, systemLocale.code);
-    const localeContext = resolveBestSupported(acceptLang, supportedLocales);
-    const countryContext = resolveBestCountry(localeContext.country, acceptCountry, countries);
+    const localeContext = resolveBestSupported(acceptLang, supportedLocaleStrings, systemLocale.baseName);
+    const countryContext = resolveBestCountry(localeContext.region, acceptCountry, countries);
     const countryObject = countries.find((country) => country.isoCode === countryContext);
     const currencyContext = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
-    log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext} ${currencyContext}`, {
+    log(`Locale Context: Resolved ${localeContext.baseName} ${countryContext} ${currencyContext}`, {
         level: LogLevel.Debug,
     });
     const newContext = {
@@ -36,10 +32,9 @@ export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry
         return `${args[0].acceptLang}-${args[0].acceptCountry}`;
     },
 });
-export const getLocaleContext = async (req, res, unchainedAPI) => {
-    const userAgent = req.headers['user-agent'];
-    const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
-    const context = await resolveDefaultContext({ acceptLang: req.headers['accept-language'], acceptCountry: req.headers['x-shop-country'] }, unchainedAPI);
+export const getLocaleContext = async ({ remoteAddress, remotePort, getHeader, }, unchainedAPI) => {
+    const userAgent = getHeader('user-agent');
+    const context = await resolveDefaultContext({ acceptLang: getHeader('accept-language'), acceptCountry: getHeader('x-shop-country') }, unchainedAPI);
     return { remoteAddress, remotePort, userAgent, ...context };
 };
 //# sourceMappingURL=locale-context.js.map

package/lib/locale-context.js.map

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

package/lib/resolvers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"wBAiBgB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;AAVnC,wBAUoC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"wBAsBgB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;AAVnC,wBAUoC"}

package/lib/resolvers/index.js

@@ -1,5 +1,4 @@
-import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
-import { JSONResolver, TimestampResolver, DateTimeResolver, DateResolver } from 'graphql-scalars';
+import { JSONResolver, TimestampResolver, DateTimeResolver, DateResolver, LocaleResolver, } from 'graphql-scalars';
 import Query from './queries/index.js';
 import Mutation from './mutations/index.js';
 import Types from './type/index.js';
@@ -7,12 +6,12 @@ import CustomScalars from './scalars/index.js';
 export default {
     ...Types,
     ...CustomScalars,
-    Upload: GraphQLUpload,
     JSON: JSONResolver,
     Query,
     Mutation,
     DateTime: DateTimeResolver,
     Date: DateResolver,
     Timestamp: TimestampResolver,
+    Locale: LocaleResolver,
 };
 //# sourceMappingURL=index.js.map

package/lib/resolvers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClG,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,eAAe;IACb,GAAG,KAAK;IACR,GAAG,aAAa;IAChB,MAAM,EAAE,aAAa;IACrB,IAAI,EAAE,YAAY;IAClB,KAAK;IACL,QAAQ;IACR,QAAQ,EAAE,gBAAgB;IAC1B,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,iBAAiB;CACK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,eAAe;IACb,GAAG,KAAK;IACR,GAAG,aAAa;IAChB,IAAI,EAAE,YAAY;IAClB,KAAK;IACL,QAAQ;IACR,QAAQ,EAAE,gBAAgB;IAC1B,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,iBAAiB;IAC5B,MAAM,EAAE,cAAc;CACW,CAAC"}

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

@@ -1,6 +1,6 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-export default function addEmail(root: Root, params: {
+import { Context } from '../../../types.js';
+export default function addEmail(root: never, params: {
     email: string;
     userId?: string;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/user.js").User>;
+}, { modules, userId }: Context): Promise<import("@unchainedshop/core-users").User>;
 //# sourceMappingURL=addEmail.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addEmail.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addEmail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,QAAQ,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,wDAY7B"}
+{"version":3,"file":"addEmail.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addEmail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,wBAA8B,QAAQ,CACpC,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,qDAiB7B"}

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

@@ -1,11 +1,19 @@
 import { log } from '@unchainedshop/logger';
-import { UserNotFoundError } from '../../../errors.js';
+import { EmailAlreadyExistsError, UserNotFoundError } from '../../../errors.js';
 export default async function addEmail(root, params, { modules, userId }) {
     const normalizedUserId = params.userId || userId;
     log(`mutation addEmail ${params.email} ${normalizedUserId}`, { userId });
     if (!(await modules.users.userExists({ userId: normalizedUserId })))
         throw new UserNotFoundError({ userId: normalizedUserId });
-    await modules.accounts.addEmail(normalizedUserId, params.email);
+    try {
+        await modules.users.addEmail(normalizedUserId, params.email);
+    }
+    catch (e) {
+        if (e.cause === 'EMAIL_INVALID')
+            throw new EmailAlreadyExistsError({ email: params?.email });
+        else
+            throw e;
+    }
     return modules.users.findUserById(normalizedUserId);
 }
 //# sourceMappingURL=addEmail.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"addEmail.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addEmail.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,QAAQ,CACpC,IAAU,EACV,MAA0C,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,qBAAqB,MAAM,CAAC,KAAK,IAAI,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzE,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,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"addEmail.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAGhF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,QAAQ,CACpC,IAAW,EACX,MAA0C,EAC1C,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAEjD,GAAG,CAAC,qBAAqB,MAAM,CAAC,KAAK,IAAI,gBAAgB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzE,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,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/D,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;;YACxF,MAAM,CAAC,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;AACtD,CAAC"}

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

@@ -1,5 +1,5 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-export default function addWeb3Address(root: Root, { address }: {
+import { Context } from '../../../types.js';
+export default function addWeb3Address(root: never, { address }: {
     address: any;
-}, { modules, userId, user }: Context): Promise<import("@unchainedshop/types/user.js").User>;
+}, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User>;
 //# sourceMappingURL=addWeb3Address.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWeb3Address.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,cAAc,CAC1C,IAAI,EAAE,IAAI,EACV,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,GAAG,CAAA;CAAE,EAC7B,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,wDA6BnC"}
+{"version":3,"file":"addWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWeb3Address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,wBAA8B,cAAc,CAC1C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,GAAG,CAAA;CAAE,EAC7B,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDA6BnC"}

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

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

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

@@ -1,5 +1,5 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-export default function addWebAuthnCredentials(root: Root, { credentials }: {
+import { Context } from '../../../types.js';
+export default function addWebAuthnCredentials(root: never, { credentials }: {
     credentials: any;
-}, { modules, userId, user }: Context): Promise<import("@unchainedshop/types/user.js").User>;
+}, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User>;
 //# sourceMappingURL=addWebAuthnCredentials.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"addWebAuthnCredentials.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWebAuthnCredentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE5D,wBAA8B,sBAAsB,CAClD,IAAI,EAAE,IAAI,EACV,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,GAAG,CAAA;CAAE,EACrC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,wDAoBnC"}
+{"version":3,"file":"addWebAuthnCredentials.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWebAuthnCredentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,wBAA8B,sBAAsB,CAClD,IAAI,EAAE,KAAK,EACX,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,GAAG,CAAA;CAAE,EACrC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDAoBnC"}

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

@@ -3,7 +3,7 @@ export default async function addWebAuthnCredentials(root, { credentials }, { mo
     log(`mutation addWebAuthnCredentials ${user.username}`, {
         userId,
     });
-    const webAuthnService = await modules.accounts.webAuthn.verifyCredentialCreation(user.username, credentials);
+    const webAuthnService = await modules.users.webAuthn.verifyCredentialCreation(user.username, credentials);
     return modules.users.updateUser({ _id: userId }, {
         $push: {
             'services.webAuthn': webAuthnService,

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"changePassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,cAAc,CAC1C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,EACD,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO;;GAoB7B"}
+{"version":3,"file":"changePassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,wBAA8B,cAAc,CAC1C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,EACD,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO;;GA8B7B"}