npm - @unchainedshop/api - Versions diffs - 3.0.0-alpha7 → 3.0.0-rc.12 - Mend

@unchainedshop/api 3.0.0-alpha7 → 3.0.0-rc.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1200) hide show

package/lib/loaders/index.js.map CHANGED Viewed

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

package/lib/locale-context.d.ts CHANGED Viewed

@@ -1,9 +1,18 @@
 import { UnchainedCore } from '@unchainedshop/core';
-import { UnchainedHTTPServerContext, UnchainedLocaleContext } from './types.js';
+import { UnchainedHTTPServerContext } from './context.js';
+export interface UnchainedLocaleContext {
+    countryContext: string;
+    localeContext: Intl.Locale;
+    currencyContext: string;
+    remoteAddress?: string;
+    remotePort?: string;
+    userAgent?: string;
+}
 export type GetHeaderFn = (key: string) => string | string[];
-export declare const resolveDefaultContext: any;
+export declare const resolveDefaultContext: ({ acceptLang, acceptCountry }: any, unchainedAPI: any) => Promise<UnchainedLocaleContext>;
 export declare const getLocaleContext: ({ remoteAddress, remotePort, getHeader, }: {
     remoteAddress: string;
-    remotePort: number;
-} & UnchainedHTTPServerContext, unchainedAPI: UnchainedCore) => Promise<UnchainedLocaleContext>;
+    remotePort: number | string;
+    getHeader: UnchainedHTTPServerContext["getHeader"];
+}, unchainedAPI: UnchainedCore) => Promise<UnchainedLocaleContext>;
 //# sourceMappingURL=locale-context.d.ts.map

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

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"file":"locale-context.d.ts","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAI1D,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,EAAE,CAAC;AAI7D,eAAO,MAAM,qBAAqB,4FA+CjC,CAAC;AAEF,eAAO,MAAM,gBAAgB,8CAKxB;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,SAAS,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;CACpD,gBACa,aAAa,KAC1B,OAAO,CAAC,sBAAsB,CAOhC,CAAC"}

package/lib/locale-context.js CHANGED Viewed

@@ -1,8 +1,11 @@
-import { log, LogLevel } from '@unchainedshop/logger';
 import { resolveBestCountry, resolveBestSupported, resolveBestCurrency, systemLocale, } from '@unchainedshop/utils';
-import memoizee from 'memoizee';
+import pMemoize from 'p-memoize';
+import ExpiryMap from 'expiry-map';
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:api');
 const { NODE_ENV } = process.env;
-export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry }, unchainedAPI) => {
+const memoizeCache = new ExpiryMap(NODE_ENV === 'production' ? 1000 * 60 : 100); // Cached values expire after 10 seconds
+export const resolveDefaultContext = pMemoize(async ({ acceptLang, acceptCountry }, unchainedAPI) => {
     const languages = await unchainedAPI.modules.languages.findLanguages({ includeInactive: false }, { projection: { isoCode: 1, isActive: 1 } });
     const countries = await unchainedAPI.modules.countries.findCountries({ includeInactive: false }, { projection: { isoCode: 1, isActive: 1 } });
     const currencies = await unchainedAPI.modules.currencies.findCurrencies({ includeInactive: false });
@@ -16,9 +19,7 @@ export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry
     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.baseName} ${countryContext} ${currencyContext}`, {
-        level: LogLevel.Debug,
-    });
+    logger.debug(`Locale Context: Resolved ${localeContext.baseName} ${countryContext} ${currencyContext}`);
     const newContext = {
         localeContext,
         countryContext,
@@ -26,15 +27,12 @@ export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry
     };
     return newContext;
 }, {
-    maxAge: NODE_ENV === 'production' ? 1000 * 60 : 100, // minute or 100ms
-    promise: true,
-    normalizer(args) {
-        return `${args[0].acceptLang}-${args[0].acceptCountry}`;
-    },
+    cache: memoizeCache,
+    cacheKey: (p) => [p.acceptLang, p.acceptCountry].join('-'),
 });
 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 };
+    return { remoteAddress, remotePort: String(remotePort), userAgent, ...context };
 };
 //# sourceMappingURL=locale-context.js.map

package/lib/locale-context.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"locale-context.js","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,~~EACL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,QAAQ,MAAM,~~UAAU~~,CAAC;~~AAGhC~~,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAIjC,MAAM,CAAC,MAAM,qBAAqB,GAAG,QAAQ,CAC3C,KAAK,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,YAAY,EAAE,EAAE;IACpD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IAEpG,MAAM,sBAAsB,GAAkB,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;QACvF,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,aAAa,GAAG,oBAAoB,CACxC,UAAU,EACV,sBAAsB,EACtB,YAAY,CAAC,QAAQ,CACtB,CAAC;IACF,MAAM,cAAc,GAAG,kBAAkB,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IAE1F,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,cAAc,CAAC,CAAC;IACtF,MAAM,eAAe,GAAG,mBAAmB,CAAC,aAAa,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAE3F,~~GAAG~~,CAAC,4BAA4B,aAAa,CAAC,QAAQ,IAAI,cAAc,IAAI,eAAe,EAAE,~~EAAE;QAC7F~~,~~KAAK,EAAE,QAAQ,~~CAAC~~,KAAK~~;~~KACtB~~,~~CAAC,CAAC;IAEH,~~MAAM,UAAU,GAA2B;QACzC,aAAa;QACb,cAAc;QACd,eAAe;KAChB,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,EACD;IACE,~~MAAM~~,EAAE,~~QAAQ,KAAK,~~YAAY,~~CAAC~~,~~CAAC~~,CAAC,~~IAAI~~,~~GAAG~~,EAAE,CAAC,CAAC,CAAC,~~GAAG~~,~~EAAE~~,~~kBAAkB;IACvE,OAAO,~~EAAE,~~IAAI;IACb,UAAU,~~CAAC,~~IAAI;QACb,OAAO,GAAG,IAAI,~~CAAC,~~CAAC~~,CAAC,CAAC,~~UAAU,~~IAAI,~~IAAI,~~CAAC,~~CAAC~~,CAAC~~,CAAC,aAAa,EAAE,CAAC~~;~~IAC1D~~,~~CAAC;~~CACF,~~CACF,~~CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,EACE,aAAa,EACb,UAAU,EACV,SAAS,~~GAImB~~,~~EAC9B~~,YAA2B,EACM,EAAE;IACnC,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,qBAAqB,CACzC,EAAE,UAAU,EAAE,SAAS,CAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,gBAAgB,CAAC,EAAE,EACxF,YAAY,CACb,CAAC;IACF,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAC;~~AAC9D~~,CAAC,CAAC"}
1	+ {"version":3,"file":"locale-context.js","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function addEmail(root: never, params: {
     email: string;
     userId?: string;

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

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"file":"addEmail.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addEmail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,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/addWeb3Address.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function addWeb3Address(root: never, { address }: {
     address: any;
 }, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User>;

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

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"file":"addWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWeb3Address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,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/addWebAuthnCredentials.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function addWebAuthnCredentials(root: never, { credentials }: {
     credentials: any;
 }, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User>;

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

	@@ -1 +1 @@
1	- {"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~~"}
1	+ {"version":3,"file":"addWebAuthnCredentials.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWebAuthnCredentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,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,qDAsBnC"}

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

@@ -1,9 +1,12 @@
 import { log } from '@unchainedshop/logger';
+import { WebAuthnDisabledError } from '../../../errors.js';
 export default async function addWebAuthnCredentials(root, { credentials }, { modules, userId, user }) {
     log(`mutation addWebAuthnCredentials ${user.username}`, {
         userId,
     });
     const webAuthnService = await modules.users.webAuthn.verifyCredentialCreation(user.username, credentials);
+    if (!webAuthnService)
+        throw new WebAuthnDisabledError();
     return modules.users.updateUser({ _id: userId }, {
         $push: {
             'services.webAuthn': webAuthnService,

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

	@@ -1 +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,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"}
1	+ {"version":3,"file":"addWebAuthnCredentials.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/addWebAuthnCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,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,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,qBAAqB,EAAE,CAAC;IAExD,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 CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function changePassword(root: never, params: {
     oldPassword?: string;
     newPassword?: string;

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

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"file":"changePassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,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"}

package/lib/resolvers/mutations/accounts/createUser.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { UserData } from '@unchainedshop/core-users';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function createUser(root: never, params: UserData, context: Context): Promise<{
     _id: string;
     tokenExpires: Date;

package/lib/resolvers/mutations/accounts/createUser.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createUser.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAW5C~~,wBAA8B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO;;;GAyCvF"}
1	+ {"version":3,"file":"createUser.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAW9C,wBAA8B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO;;;GAyCvF"}

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

@@ -1,6 +1,9 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function createWebAuthnCredentialCreationOptions(root: never, { extensionOptions, username }: {
     username: string;
     extensionOptions: any;
-}, { modules, userId, getHeader }: Context): Promise<any>;
+}, { modules, userId, getHeader }: Context): Promise<Omit<import("fido2-lib").PublicKeyCredentialCreationOptions, "challenge" | "requestId"> & {
+    challenge: string;
+    requestId: number;
+}>;
 //# sourceMappingURL=createWebAuthnCredentialCreationOptions.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"createWebAuthnCredentialCreationOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,uCAAuC,CACnE,IAAI,EAAE,KAAK,EACX,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~~"}
1	+ {"version":3,"file":"createWebAuthnCredentialCreationOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialCreationOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,uCAAuC,CACnE,IAAI,EAAE,KAAK,EACX,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;;;GAaxC"}

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

	@@ -1 +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,IAAW,EACX,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"}
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,IAAW,EACX,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,CAAC,EACnB,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -1,6 +1,9 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function createWebAuthnCredentialRequestOptions(root: never, { extensionOptions, username }: {
     username: string;
     extensionOptions: any;
-}, { modules, userId, getHeader }: Context): Promise<any>;
+}, { modules, userId, getHeader }: Context): Promise<Omit<import("fido2-lib").PublicKeyCredentialRequestOptions, "challenge" | "requestId"> & {
+    challenge: string;
+    requestId: number;
+}>;
 //# sourceMappingURL=createWebAuthnCredentialRequestOptions.d.ts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"createWebAuthnCredentialRequestOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,sCAAsC,CAClE,IAAI,EAAE,KAAK,EACX,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~~"}
1	+ {"version":3,"file":"createWebAuthnCredentialRequestOptions.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createWebAuthnCredentialRequestOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,sCAAsC,CAClE,IAAI,EAAE,KAAK,EACX,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;;;GAqBxC"}

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

@@ -4,11 +4,11 @@ export default async function createWebAuthnCredentialRequestOptions(root, { ext
         userId,
     });
     const options = await modules.users.webAuthn.createCredentialRequestOptions(getHeader('origin'), username, extensionOptions);
-    if (username) {
+    if (username && options) {
         const user = await modules.users.findUserByUsername(username);
         options.allowCredentials = user?.services?.webAuthn?.map(({ id, type }) => ({
             id,
-            type: type || options.type || 'public-key',
+            type: type || 'public-key',
         }));
     }
     return options;

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

	@@ -1 +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,IAAW,EACX,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"}
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,IAAW,EACX,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,CAAC,EACnB,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;QACxB,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,YAAY;SAC3B,CAAC,CAAC,CAAC;IACN,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"enrollUser.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AASrD,wBAA8B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,qDA6BvF"}
1	+ {"version":3,"file":"enrollUser.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AASrD,wBAA8B,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,qDA6BvF"}

package/lib/resolvers/mutations/accounts/forgotPassword.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function forgotPassword(root: never, { email }: {
     email: string;
 }, { modules, userId }: Context): Promise<{

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

	@@ -1 +1 @@
1	- {"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/forgotPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,cAAc,CAC1C,IAAI,EAAE,KAAK,EACX,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO;;GAiB7B"}
1	+ {"version":3,"file":"forgotPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/forgotPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,cAAc,CAC1C,IAAI,EAAE,KAAK,EACX,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO;;GAiB7B"}

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function loginAsGuest(root: never, _: any, context: Context): Promise<{
     _id: string;
     tokenExpires: Date;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"loginAsGuest.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"~~AAGA~~,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO;;;GAyB/E"}
1	+ {"version":3,"file":"loginAsGuest.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,wBAA8B,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO;;;GAyB/E"}

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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
 import moniker from 'moniker';
-import { randomValueHex } from '@unchainedshop/utils';
+import { generateDbObjectId } from '@unchainedshop/mongodb';
 export default async function loginAsGuest(root, _, context) {
     log('mutation loginAsGuest');
-    const guestname = `${moniker.choose()}-${randomValueHex(5)}`;
+    const guestname = `${moniker.choose()}-${generateDbObjectId(5)}`;
     const guestUserId = await context.modules.users.createUser({
         email: `${guestname}@unchained.local`,
         guest: true,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"loginAsGuest.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,OAAO,MAAM,SAAS,CAAC;~~AAC9B~~,OAAO,EAAE,~~cAAc~~,EAAE,MAAM,~~sBAAsB~~,CAAC;~~AAGtD~~,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,IAAW,EAAE,CAAM,EAAE,OAAgB;IAC9E,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,QAAQ;QACtC,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC"}
1	+ {"version":3,"file":"loginAsGuest.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginAsGuest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CAAC,IAAW,EAAE,CAAM,EAAE,OAAgB;IAC9E,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAE7B,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,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,QAAQ;QACtC,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 CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function loginWithPassword(root: never, params: {
     username?: string;
     email?: string;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"loginWithPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,EACD,OAAO,EAAE,OAAO;;;GAsCjB"}
1	+ {"version":3,"file":"loginWithPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,EACD,OAAO,EAAE,OAAO;;;GAsCjB"}

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

@@ -25,9 +25,9 @@ export default async function loginWithPassword(root, params, context) {
         countryCode: context.countryContext,
     });
     if (context.userId) {
-        await context.services.users.migrateUserData(context.userId, user._id, context);
+        await context.services.users.migrateUserData(context.userId, user._id);
     }
-    await context.services.orders.nextUserCart({ user, countryCode: context.countryContext }, context);
+    await context.services.orders.nextUserCart({ user, countryCode: context.countryContext });
     return context.login(user);
 }
 //# sourceMappingURL=loginWithPassword.js.map

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

	@@ -1 +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;AAC5C,OAAO,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAG3F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAW,EACX,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,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAC;IAEpE,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,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,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,QAAQ;QACtC,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"}
1	+ {"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAG3F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAW,EACX,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,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,4BAA4B,CAAC,EAAE,CAAC,CAAC;IAEpE,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,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,uBAAuB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAElE,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,QAAQ;QACtC,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,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;IAE1F,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC"}

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function loginWithWebAuthn(root: never, params: {
     webAuthnPublicKeyCredentials?: any;
 }, context: Context): Promise<{

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

	@@ -1 +1 @@
1	- {"version":3,"file":"loginWithWebAuthn.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithWebAuthn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,4BAA4B,CAAC,EAAE,GAAG,CAAC;CACpC,EACD,OAAO,EAAE,OAAO;;;~~GAyBjB~~"}
1	+ {"version":3,"file":"loginWithWebAuthn.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithWebAuthn.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IACN,4BAA4B,CAAC,EAAE,GAAG,CAAC;CACpC,EACD,OAAO,EAAE,OAAO;;;GA2BjB"}

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

@@ -1,11 +1,14 @@
 import { log } from '@unchainedshop/logger';
+import { WebAuthnDisabledError } from '../../../errors.js';
 export default async function loginWithWebAuthn(root, params, context) {
     log('mutation loginWithWebAuthn');
     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);
+    const verification = await context.modules.users.webAuthn.verifyCredentialRequest(user.services?.webAuthn, user.username, params.webAuthnPublicKeyCredentials);
+    if (!verification)
+        throw new WebAuthnDisabledError();
     user = await context.modules.users.updateHeartbeat(user._id, {
         remoteAddress: context.remoteAddress,
         remotePort: context.remotePort,

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

	@@ -1 +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,IAAW,EACX,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,QAAQ;QACtC,WAAW,EAAE,OAAO,CAAC,cAAc;KACpC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC"}
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,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAW,EACX,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,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAC/E,IAAI,CAAC,QAAQ,EAAE,QAAQ,EACvB,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,4BAA4B,CACpC,CAAC;IAEF,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,qBAAqB,EAAE,CAAC;IAErD,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,QAAQ;QACtC,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 CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function logout(root: never, _: never, context: Context): Promise<{
     success: boolean;
 }>;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;;GAQ3E"}
1	+ {"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO;;GAQ3E"}

package/lib/resolvers/mutations/accounts/removeEmail.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function removeEmail(root: never, params: {
     email: string;
     userId?: string;

package/lib/resolvers/mutations/accounts/removeEmail.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"removeEmail.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeEmail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,WAAW,CACvC,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,qDAY7B"}
1	+ {"version":3,"file":"removeEmail.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeEmail.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,WAAW,CACvC,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,qDAY7B"}

package/lib/resolvers/mutations/accounts/removeWeb3Address.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function removeWeb3Address(root: never, { address }: {
     address: string;
 }, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User>;

package/lib/resolvers/mutations/accounts/removeWeb3Address.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"removeWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWeb3Address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAChC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDAsBnC"}
1	+ {"version":3,"file":"removeWeb3Address.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWeb3Address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,iBAAiB,CAC7C,IAAI,EAAE,KAAK,EACX,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAChC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDAsBnC"}

package/lib/resolvers/mutations/accounts/removeWebAuthnCredentials.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function removeWebAuthnCredentials(root: never, { credentialsId }: {
     credentialsId: string;
 }, { modules, userId, user }: Context): Promise<import("@unchainedshop/core-users").User>;

package/lib/resolvers/mutations/accounts/removeWebAuthnCredentials.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"removeWebAuthnCredentials.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWebAuthnCredentials.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,yBAAyB,CACrD,IAAI,EAAE,KAAK,EACX,EAAE,aAAa,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,EAC5C,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDAoBnC"}
1	+ {"version":3,"file":"removeWebAuthnCredentials.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/removeWebAuthnCredentials.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,yBAAyB,CACrD,IAAI,EAAE,KAAK,EACX,EAAE,aAAa,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,EAC5C,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,qDAoBnC"}

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 export default function resetPassword(root: never, params: {
     newPassword?: string;
     token: string;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"resetPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,~~mBAAmB~~,CAAC;~~AAE5C~~,wBAA8B,aAAa,CACzC,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC/C,OAAO,EAAE,OAAO;;;~~GA4DjB~~"}
1	+ {"version":3,"file":"resetPassword.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/resetPassword.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,wBAA8B,aAAa,CACzC,IAAI,EAAE,KAAK,EACX,MAAM,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC/C,OAAO,EAAE,OAAO;;;GA2BjB"}

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

@@ -6,55 +6,24 @@ export default async function resetPassword(root, params, context) {
     if (!params.newPassword) {
         throw new Error('Password is required');
     }
-    let user = await modules.users.findUserByResetToken(params.token);
-    if (!user)
-        throw new InvalidResetTokenError({});
     try {
-        await modules.users.setPassword(user._id, params.newPassword);
-        // TODO: Verify E-Mail after reset!
-        // if (resetTicket.address) {
-        //   // Try verifying the E-Mail along the way
-        //   try {
-        //     const updatedUser = await modules.users.updateUser(
-        //       {
-        //         _id: userWithNewPassword.id,
-        //         emails: {
-        //           $elemMatch: {
-        //             address: emailRegexOperator(resetTicket.address),
-        //             verified: false,
-        //           },
-        //         },
-        //       },
-        //       {
-        //         $set: {
-        //           'emails.$[email].verified': true,
-        //         },
-        //       },
-        //       {
-        //         arrayFilters: [{ 'email.address': resetTicket.address }],
-        //       },
-        //     );
-        //     if (updatedUser) {
-        //       await modules.accounts.emit('VerifyEmailSuccess', updatedUser);
-        //     }
-        //   } catch (e) {
-        //     /* */
-        //   }
-        // }
+        let user = await modules.users.resetPassword(params.token, params.newPassword);
+        if (!user)
+            throw new InvalidResetTokenError({});
+        user = await context.modules.users.updateHeartbeat(user._id, {
+            remoteAddress: context.remoteAddress,
+            remotePort: context.remotePort,
+            userAgent: context.userAgent,
+            locale: context.localeContext.baseName,
+            countryCode: context.countryContext,
+        });
+        return context.login(user);
     }
     catch (e) {
         if (e.cause === 'PASSWORD_INVALID')
-            throw new PasswordInvalidError({ userId: user._id });
+            throw new PasswordInvalidError({});
         else
             throw e;
     }
-    user = await context.modules.users.updateHeartbeat(user._id, {
-        remoteAddress: context.remoteAddress,
-        remotePort: context.remotePort,
-        userAgent: context.userAgent,
-        locale: context.localeContext.baseName,
-        countryCode: context.countryContext,
-    });
-    return context.login(user);
 }
 //# sourceMappingURL=resetPassword.js.map