@unchainedshop/api 2.5.11 → 2.6.0

package/lib/createGraphQLServer.js

@@ -3,7 +3,6 @@ import { log, LogLevel } from '@unchainedshop/logger';
 import { buildDefaultTypeDefs } from './schema/index.js';
 import resolvers from './resolvers/index.js';
 import { actions } from './roles/index.js';
-const { APOLLO_ENGINE_KEY } = process.env;
 const logGraphQLServerError = (error) => {
     try {
         const { message, extensions: { stacktrace, ...parameters }, ...rest } = error;
@@ -19,7 +18,7 @@ const logGraphQLServerError = (error) => {
     catch (e) { } // eslint-disable-line
 };
 export default async (options) => {
-    const { typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], engine = {}, events = [], workTypes = [], ...apolloServerOptions } = options || {};
+    const { typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], events = [], workTypes = [], ...apolloServerOptions } = options || {};
     const server = new ApolloServer({
         typeDefs: [
             ...buildDefaultTypeDefs({
@@ -34,13 +33,6 @@ export default async (options) => {
             logGraphQLServerError(error);
             return error;
         },
-        apollo: APOLLO_ENGINE_KEY
-            ? {
-                key: APOLLO_ENGINE_KEY,
-                privateVariables: ['email', 'plainPassword', 'oldPlainPassword', 'newPlainPassword'],
-                ...engine,
-            }
-            : undefined,
         ...apolloServerOptions,
     });
     return server;

package/lib/createGraphQLServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createGraphQLServer.js","sourceRoot":"","sources":["../src/createGraphQLServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1C,MAAM,qBAAqB,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7D,IAAI,CAAC;QACH,MAAM,EACJ,OAAO,EACP,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,EACzC,GAAG,IAAI,EACR,GAAG,KAAK,CAAC;QAEV,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,WAAW,CAAC,KAAK,GAAI,UAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,IAAc,CAAC;QAC7C,GAAG,CAAC,WAAW,EAAE;YACf,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,UAAU;YACb,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,sBAAsB;AACvC,CAAC,CAAC;AAEF,eAAe,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,EACJ,QAAQ,EAAE,kBAAkB,GAAG,EAAE,EACjC,SAAS,EAAE,mBAAmB,GAAG,EAAE,EACnC,MAAM,GAAG,EAAE,EACX,MAAM,GAAG,EAAE,EACX,SAAS,GAAG,EAAE,EACd,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,QAAQ,EAAE;YACR,GAAG,oBAAoB,CAAC;gBACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC7B,MAAM;gBACN,SAAS;aACV,CAAC;YACF,GAAG,kBAAkB;SACtB;QACD,SAAS,EAAE,CAAC,SAAS,EAAE,GAAG,mBAAmB,CAAC;QAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,EAAE,iBAAiB;YACvB,CAAC,CAAC;gBACE,GAAG,EAAE,iBAAiB;gBACtB,gBAAgB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;gBACpF,GAAG,MAAM;aACV;YACH,CAAC,CAAC,SAAS;QACb,GAAG,mBAAmB;KACvB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"createGraphQLServer.js","sourceRoot":"","sources":["../src/createGraphQLServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,qBAAqB,GAAG,CAAC,KAA4B,EAAE,EAAE;IAC7D,IAAI,CAAC;QACH,MAAM,EACJ,OAAO,EACP,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,EACzC,GAAG,IAAI,EACR,GAAG,KAAK,CAAC;QAEV,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QACvC,WAAW,CAAC,KAAK,GAAI,UAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,IAAc,CAAC;QAC7C,GAAG,CAAC,WAAW,EAAE;YACf,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,UAAU;YACb,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,sBAAsB;AACvC,CAAC,CAAC;AAEF,eAAe,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,EACJ,QAAQ,EAAE,kBAAkB,GAAG,EAAE,EACjC,SAAS,EAAE,mBAAmB,GAAG,EAAE,EACnC,MAAM,GAAG,EAAE,EACX,SAAS,GAAG,EAAE,EACd,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,QAAQ,EAAE;YACR,GAAG,oBAAoB,CAAC;gBACtB,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBAC7B,MAAM;gBACN,SAAS;aACV,CAAC;YACF,GAAG,kBAAkB;SACtB;QACD,SAAS,EAAE,CAAC,SAAS,EAAE,GAAG,mBAAmB,CAAC;QAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,GAAG,mBAAmB;KACvB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/express/createBulkImportMiddleware.js

@@ -1,9 +1,7 @@
-import fs from 'fs';
 import { createLogger } from '@unchainedshop/logger';
 import { checkAction } from '../acl.js';
 import { actions } from '../roles/index.js';
 const logger = createLogger('unchained:bulk-import');
-const { BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
 const errorHandler = (res) => (e) => {
     logger.error(e.message);
     res.writeHead(503);
@@ -14,19 +12,6 @@ const methodWrongHandler = (res) => () => {
     res.writeHead(404);
     res.end();
 };
-const createWriteStreamToFilesystem = (cacheDirectory) => {
-    const date = new Date().toISOString();
-    const payloadFilePath = `${cacheDirectory}/${date}.json`;
-    const stream = fs.createWriteStream(payloadFilePath, { flags: 'a' });
-    return stream;
-};
-const createWriteStreamToMongoDB = (BulkImportPayloads) => {
-    const date = new Date().toISOString();
-    const stream = BulkImportPayloads.openUploadStreamWithId(date, `${date}.json`, {
-        contentType: 'application/json',
-    });
-    return stream;
-};
 export default function bulkImportMiddleware(contextResolver) {
     return async (req, res) => {
         try {
@@ -39,37 +24,25 @@ export default function bulkImportMiddleware(contextResolver) {
             const input = {
                 createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
                 skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
-                fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
                 remoteAddress: context.remoteAddress,
             };
-            const stream = input.fsPayloadCacheDirectory
-                ? createWriteStreamToFilesystem(input.fsPayloadCacheDirectory)
-                : createWriteStreamToMongoDB(context.bulkImporter.BulkImportPayloads);
-            req
-                .pipe(stream)
-                .on('error', errorHandler(res))
-                .on('finish', async (file) => {
-                try {
-                    if (input.fsPayloadCacheDirectory) {
-                        input.payloadFilePath = stream.path;
-                    }
-                    else {
-                        input.payloadId = file._id;
-                        input.payloadSize = file.length;
-                    }
-                    const work = await context.modules.worker.addWork({
-                        type: 'BULK_IMPORT',
-                        input: Object.fromEntries(Object.entries(input).filter(([, value]) => Boolean(value))),
-                        retries: 0,
-                        priority: 10,
-                    });
-                    res.writeHead(200);
-                    res.end(JSON.stringify(work));
-                }
-                catch (e) {
-                    errorHandler(res)(e);
-                }
+            const date = new Date().toISOString();
+            const file = await context.services.files.uploadFileFromStream({
+                directoryName: 'bulk-import-streams',
+                rawFile: Promise.resolve({ filename: `${date}.json`, createReadStream: () => req }),
+                meta: {},
+            }, context);
+            input.payloadId = file._id;
+            input.payloadSize = file.size;
+            const purgedInput = Object.fromEntries(Object.entries(input).filter(([, value]) => Boolean(value)));
+            const work = await context.modules.worker.addWork({
+                type: 'BULK_IMPORT',
+                input: purgedInput,
+                retries: 0,
+                priority: 10,
             });
+            res.writeHead(200);
+            res.end(JSON.stringify(work));
         }
         catch (e) {
             errorHandler(res)(e);

package/lib/express/createBulkImportMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBulkImportMiddleware.js","sourceRoot":"","sources":["../../src/express/createBulkImportMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createBulkImportMiddleware.js","sourceRoot":"","sources":["../../src/express/createBulkImportMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;IAClC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACxB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE;IACvC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACjD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,eAAyC;IACpF,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACxB,IAAI,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;gBAC1B,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACpD,MAAM,WAAW,CAAC,OAAO,EAAG,OAAe,CAAC,UAAU,CAAC,CAAC;YAExD,MAAM,KAAK,GAAQ;gBACjB,4BAA4B,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,4BAA4B;gBACvE,qBAAqB,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB;gBACzD,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC;YAEF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAEtC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAC5D;gBACE,aAAa,EAAE,qBAAqB;gBACpC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;gBACnF,IAAI,EAAE,EAAE;aACT,EACD,OAAO,CACR,CAAC;YAEF,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;YAC3B,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;YAE9B,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAC5D,CAAC;YAEF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gBAChD,IAAI,EAAE,aAAa;gBACnB,KAAK,EAAE,WAAW;gBAClB,OAAO,EAAE,CAAC;gBACV,QAAQ,EAAE,EAAE;aACb,CAAC,CAAC;YAEH,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAChC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/lib/hashPassword.d.ts

@@ -1 +1 @@
-export declare const hashPassword: (password: any) => string;
+export declare const hashPassword: (password: string) => string;

package/lib/hashPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"hashPassword.js","sourceRoot":"","sources":["../src/hashPassword.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,EAAE;IACvC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC,CAAC"}
+{"version":3,"file":"hashPassword.js","sourceRoot":"","sources":["../src/hashPassword.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAU,EAAE;IACvD,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACpE,CAAC,CAAC"}

package/lib/locale-context.js

@@ -1,12 +1,12 @@
 import localePkg from 'locale';
 import 'abort-controller/polyfill.js';
-import { LRUCache } from 'lru-cache';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { resolveBestCountry, resolveBestSupported, resolveUserRemoteAddress, systemLocale, } from '@unchainedshop/utils';
+import * as lruCache from 'lru-cache';
 const { Locales } = localePkg;
 const { NODE_ENV } = process.env;
 const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second
-const localeContextCache = new LRUCache({
+const localeContextCache = new lruCache.LRUCache({
     max: 500,
     ttl,
 });

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/queries/events/event.d.ts

@@ -1,5 +1,4 @@
-import { _ID } from '@unchainedshop/types/common.js';
 import { Root, Context } from '@unchainedshop/types/api.js';
 export default function event(root: Root, { eventId }: {
-    eventId: _ID;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/events.js").Event>;
+    eventId: string;
+}, { modules, userId }: Context): Promise<Event>;

package/lib/resolvers/queries/events/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,KAAK,CACjC,IAAU,EACV,EAAE,OAAO,EAAoB,EAC7B,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,eAAe,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,KAAK,CACjC,IAAU,EACV,EAAE,OAAO,EAAuB,EAChC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,eAAe,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/C,CAAC"}

package/lib/resolvers/queries/events/events.d.ts

@@ -1,7 +1,4 @@
-import { Root, Context, SortOption } from '@unchainedshop/types/api.js';
-import { EventQuery } from '@unchainedshop/types/events.js';
-export default function events(root: Root, params: EventQuery & {
-    limit?: number;
-    offset?: number;
-    sort: Array<SortOption>;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/events.js").Event[]>;
+import { Root, Context } from '@unchainedshop/types/api.js';
+type FindEventsParams = Parameters<Context['modules']['events']['findEvents']>['0'];
+export default function events(root: Root, params: FindEventsParams, { modules, userId }: Context): Promise<Event[]>;
+export {};

package/lib/resolvers/queries/events/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAClC,IAAU,EACV,MAIC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CACD,gBAAgB,MAAM,CAAC,KAAK,YAAY,MAAM,CAAC,KAAK,YAAY,MAAM,CAAC,MAAM,iBAAiB,MAAM,CAAC,WAAW,EAAE,EAClH;QACE,MAAM;KACP,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAK5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAClC,IAAU,EACV,MAAwB,EACxB,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CACD,gBAAgB,MAAM,CAAC,KAAK,YAAY,MAAM,CAAC,KAAK,YAAY,MAAM,CAAC,MAAM,iBAAiB,MAAM,CAAC,WAAW,EAAE,EAClH;QACE,MAAM;KACP,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC"}

package/lib/resolvers/queries/events/eventsCounts.d.ts

@@ -1,3 +1,4 @@
 import { Root, Context } from '@unchainedshop/types/api.js';
-import { EventQuery } from '@unchainedshop/types/events.js';
-export default function eventsCount(root: Root, params: EventQuery, { modules, userId }: Context): Promise<number>;
+type CountEventsParams = Parameters<Context['modules']['events']['count']>['0'];
+export default function eventsCount(root: Root, params: CountEventsParams, { modules, userId }: Context): Promise<number>;
+export {};

package/lib/resolvers/queries/events/eventsCounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventsCounts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventsCounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,IAAU,EAAE,MAAkB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAW;IACpG,GAAG,CAAC,mCAAmC,MAAM,CAAC,WAAW,YAAY,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,EAAE;QAC9F,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"eventsCounts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/events/eventsCounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAK5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAAyB,EACzB,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,mCAAmC,MAAM,CAAC,WAAW,YAAY,MAAM,CAAC,KAAK,KAAK,MAAM,EAAE,EAAE;QAC9F,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACtC,CAAC"}

package/lib/resolvers/queries/payment/paymentProviders.d.ts

@@ -1,3 +1,4 @@
-import { PaymentProviderQuery } from '@unchainedshop/types/payments.js';
+import { mongodb } from '@unchainedshop/mongodb';
 import { Context, Root } from '@unchainedshop/types/api.js';
-export default function paymentProviders(root: Root, params: PaymentProviderQuery, { modules, userId }: Context): Promise<import("@unchainedshop/types/payments.js").PaymentProvider[]>;
+import { PaymentProvider } from '@unchainedshop/types/payments.js';
+export default function paymentProviders(root: Root, params: mongodb.Filter<PaymentProvider>, { modules, userId }: Context): Promise<PaymentProvider[]>;

package/lib/resolvers/queries/payment/paymentProviders.js.map

@@ -1 +1 @@
-{"version":3,"file":"paymentProviders.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/payment/paymentProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,MAA4B,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAExD,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"paymentProviders.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/payment/paymentProviders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAK5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,MAAuC,EACvC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAExD,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAChE,CAAC"}

package/lib/resolvers/queries/payment/paymentProvidersCount.d.ts

@@ -1,3 +1,4 @@
-import { PaymentProviderQuery } from '@unchainedshop/types/payments.js';
+import { mongodb } from '@unchainedshop/mongodb';
 import { Context, Root } from '@unchainedshop/types/api.js';
-export default function paymentProvidersCount(root: Root, params: PaymentProviderQuery, { modules, userId }: Context): Promise<number>;
+import { PaymentProvider } from '@unchainedshop/types/payments.js';
+export default function paymentProvidersCount(root: Root, params: mongodb.Filter<PaymentProvider>, { modules, userId }: Context): Promise<number>;

package/lib/resolvers/queries/payment/paymentProvidersCount.js.map

@@ -1 +1 @@
-{"version":3,"file":"paymentProvidersCount.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/payment/paymentProvidersCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAI5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,qBAAqB,CACjD,IAAU,EACV,MAA4B,EAC5B,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,+BAA+B,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9D,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"paymentProvidersCount.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/payment/paymentProvidersCount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAK5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,qBAAqB,CACjD,IAAU,EACV,MAAuC,EACvC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,+BAA+B,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9D,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC"}

package/lib/resolvers/type/assortment/assortment-types.js

@@ -16,12 +16,11 @@ export const Assortment = {
             parentAssortmentId: assortment._id,
         });
         const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
-        const selector = {
+        return modules.assortments.count({
             assortmentIds,
             includeInactive,
             includeLeaves: true,
-        };
-        return modules.assortments.count(selector);
+        });
     },
     filterAssignments: async (obj, _, { modules }) => {
         // TODO: Loader & move default sort to module

package/lib/resolvers/type/assortment/assortment-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-types.ts"],"names":[],"mappings":"AAgDA,MAAM,CAAC,MAAM,UAAU,GAA0B;IAC/C,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACvC,OAAO,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC;YACrC,YAAY,EAAE,GAAG,CAAC,GAAG;SACtB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxD,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC;YAClC,YAAY,EAAE,GAAG,CAAC,GAAG;YACrB,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,eAAe,GAAG,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC5E,eAAe;QACf,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;YACrE,kBAAkB,EAAE,UAAU,CAAC,GAAG;SACnC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;QAE7F,OAAO,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;YAC/B,aAAa;YACb,eAAe;YACf,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC/C,6CAA6C;QAC7C,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAC5C;YACE,YAAY,EAAE,GAAG,CAAC,GAAG;SACtB,EACD;YACE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;SACrB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QACzC,eAAe;QACf,OAAO,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;YACzC,YAAY,EAAE,GAAG,CAAC,GAAG;SACtB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;QAClC,OAAO,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC;YACpD,YAAY,EAAE,GAAG,CAAC,GAAG;YACrB,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC1C,kDAAkD;QAClD,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,YAAY,CAC9C;YACE,YAAY,EAAE,GAAG,CAAC,GAAG;SACtB,EACD;YACE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;SACrB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,cAAc;QAC9C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QAClD,OAAO,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC;YACvC,YAAY,EAAE,GAAG,CAAC,GAAG;YACrB,MAAM,EAAE,WAAW,IAAI,aAAa,CAAC,UAAU;SAChD,CAAC,CAAC;IACL,CAAC;IAED,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC5C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;YAClE,YAAY,EAAE,GAAG,CAAC,GAAG;YACrB,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;SACrD,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;YACxE,YAAY,EAAE,GAAG,CAAC,GAAG;SACtB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAClD,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,EACnC,EAAE,EACF,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/event-types.d.ts

@@ -1,5 +1,5 @@
 import { Context } from '@unchainedshop/types/api.js';
-import { Event as EventType } from '@unchainedshop/types/events.js';
+import { Event as EventType } from '@unchainedshop/core-events';
 export type HelperType<P, T> = (work: EventType, params: P, context: Context) => T;
 export interface EventHelperTypes {
     type: HelperType<never, string>;

package/lib/resolvers/type/work-types.d.ts

@@ -4,6 +4,9 @@ type HelperType<P, T> = (work: WorkType, params: P, context: Context) => T;
 export interface WorkHelperTypes {
     status: HelperType<never, string>;
     type: HelperType<never, string>;
+    result: HelperType<never, any>;
+    input: HelperType<never, any>;
+    error: HelperType<never, any>;
     original: HelperType<never, Promise<WorkType>>;
 }
 export declare const Work: WorkHelperTypes;

package/lib/resolvers/type/work-types.js

@@ -1,3 +1,4 @@
+import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
 export const Work = {
     status: (obj, _, { modules }) => {
         return modules.worker.status(obj);
@@ -10,5 +11,14 @@ export const Work = {
             return null;
         return modules.worker.findWork({ workId: obj.originalWorkId });
     },
+    input: (obj, _, { options }) => {
+        return buildObfuscatedFieldsFilter(options.worker?.blacklistedVariables)(obj.input);
+    },
+    result: (obj, _, { options }) => {
+        return buildObfuscatedFieldsFilter(options.worker?.blacklistedVariables)(obj.result);
+    },
+    error: (obj, _, { options }) => {
+        return buildObfuscatedFieldsFilter(options.worker?.blacklistedVariables)(obj.error);
+    },
 };
 //# sourceMappingURL=work-types.js.map

package/lib/resolvers/type/work-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/work-types.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,IAAI,GAAoB;IACnC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,IAAI,CAAC,GAAG,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QACrC,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IACjE,CAAC;CACF,CAAC"}
+{"version":3,"file":"work-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/work-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAanE,MAAM,CAAC,MAAM,IAAI,GAAoB;IACnC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,IAAI,CAAC,GAAG,CAAC,cAAc;YAAE,OAAO,IAAI,CAAC;QACrC,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACtC,OAAO,2BAA2B,CAAC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACvC,OAAO,2BAA2B,CAAC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACtC,OAAO,2BAA2B,CAAC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtF,CAAC;CACF,CAAC"}

package/lib/roles/index.d.ts

@@ -12,5 +12,4 @@ declare const configureRoles: ({ additionalRoles, additionalActions }: {
     LOGGEDIN: import("@unchainedshop/types/roles.js").RoleInterface;
     ALL: import("@unchainedshop/types/roles.js").RoleInterface;
 };
-declare const updateUserRole: (context: any, roleName: any) => Promise<any>;
-export { allRoles, actions, configureRoles, updateUserRole };
+export { allRoles, actions, configureRoles };

package/lib/roles/index.js

@@ -131,6 +131,5 @@ const configureRoles = ({ additionalRoles = {}, additionalActions = [] }) => {
     admin(allRoles.ADMIN, actions);
     return allRoles;
 };
-const updateUserRole = (context, roleName) => Roles.addUserToRoles(context, roles[roleName].name);
-export { allRoles, actions, configureRoles, updateUserRole };
+export { allRoles, actions, configureRoles };
 //# sourceMappingURL=index.js.map

package/lib/roles/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.5.11",
+  "version": "2.6.0",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@apollo/server": "^4.9.5",
+    "@apollo/server": "^4.10.0",
     "cookie": "^0.6.0",
     "graphql": "^16.6.0"
   },
@@ -49,28 +49,28 @@
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.1",
-    "@unchainedshop/core": "^2.5.11",
-    "@unchainedshop/events": "^2.5.11",
-    "@unchainedshop/logger": "^2.5.11",
-    "@unchainedshop/roles": "^2.5.11",
-    "@unchainedshop/utils": "^2.5.11",
+    "@unchainedshop/core": "^2.6.0",
+    "@unchainedshop/events": "^2.6.0",
+    "@unchainedshop/logger": "^2.6.0",
+    "@unchainedshop/roles": "^2.6.0",
+    "@unchainedshop/utils": "^2.6.0",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.22.4",
     "graphql-upload": "^16.0.2",
     "locale": "0.1.0",
     "lodash.isnumber": "3.0.3",
-    "lru-cache": "^10.0.0"
+    "lru-cache": "^10.1.0"
   },
   "devDependencies": {
-    "@types/graphql-upload": "^16.0.5",
+    "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.9.0",
-    "@unchainedshop/types": "^2.5.11",
+    "@types/node": "^20.11.6",
+    "@unchainedshop/types": "^2.6.0",
     "express": "^4.18.2",
     "graphql": "^16.8.1",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2"
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.3.3"
   }
 }

package/src/createGraphQLServer.ts

@@ -5,8 +5,6 @@ import { buildDefaultTypeDefs } from './schema/index.js';
 import resolvers from './resolvers/index.js';
 import { actions } from './roles/index.js';
 
-const { APOLLO_ENGINE_KEY } = process.env;
-
 const logGraphQLServerError = (error: GraphQLFormattedError) => {
   try {
     const {
@@ -30,7 +28,6 @@ export default async (options) => {
   const {
     typeDefs: additionalTypeDefs = [],
     resolvers: additionalResolvers = [],
-    engine = {},
     events = [],
     workTypes = [],
     ...apolloServerOptions
@@ -50,13 +47,6 @@ export default async (options) => {
       logGraphQLServerError(error);
       return error;
     },
-    apollo: APOLLO_ENGINE_KEY
-      ? {
-          key: APOLLO_ENGINE_KEY,
-          privateVariables: ['email', 'plainPassword', 'oldPlainPassword', 'newPlainPassword'],
-          ...engine,
-        }
-      : undefined,
     ...apolloServerOptions,
   });
 

package/src/express/createBulkImportMiddleware.ts

@@ -1,4 +1,3 @@
-import fs from 'fs';
 import { createLogger } from '@unchainedshop/logger';
 import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
 import { checkAction } from '../acl.js';
@@ -6,8 +5,6 @@ import { actions } from '../roles/index.js';
 
 const logger = createLogger('unchained:bulk-import');
 
-const { BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
-
 const errorHandler = (res) => (e) => {
   logger.error(e.message);
   res.writeHead(503);
@@ -20,21 +17,6 @@ const methodWrongHandler = (res) => () => {
   res.end();
 };
 
-const createWriteStreamToFilesystem = (cacheDirectory) => {
-  const date = new Date().toISOString();
-  const payloadFilePath = `${cacheDirectory}/${date}.json`;
-  const stream = fs.createWriteStream(payloadFilePath, { flags: 'a' });
-  return stream;
-};
-
-const createWriteStreamToMongoDB = (BulkImportPayloads) => {
-  const date = new Date().toISOString();
-  const stream = BulkImportPayloads.openUploadStreamWithId(date, `${date}.json`, {
-    contentType: 'application/json',
-  });
-  return stream;
-};
-
 export default function bulkImportMiddleware(contextResolver: UnchainedContextResolver) {
   return async (req, res) => {
     try {
@@ -49,37 +31,36 @@ export default function bulkImportMiddleware(contextResolver: UnchainedContextRe
       const input: any = {
         createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
         skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
-        fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
         remoteAddress: context.remoteAddress,
       };
 
-      const stream = input.fsPayloadCacheDirectory
-        ? createWriteStreamToFilesystem(input.fsPayloadCacheDirectory)
-        : createWriteStreamToMongoDB(context.bulkImporter.BulkImportPayloads);
+      const date = new Date().toISOString();
+
+      const file = await context.services.files.uploadFileFromStream(
+        {
+          directoryName: 'bulk-import-streams',
+          rawFile: Promise.resolve({ filename: `${date}.json`, createReadStream: () => req }),
+          meta: {},
+        },
+        context,
+      );
+
+      input.payloadId = file._id;
+      input.payloadSize = file.size;
+
+      const purgedInput = Object.fromEntries(
+        Object.entries(input).filter(([, value]) => Boolean(value)),
+      );
+
+      const work = await context.modules.worker.addWork({
+        type: 'BULK_IMPORT',
+        input: purgedInput,
+        retries: 0,
+        priority: 10,
+      });
 
-      req
-        .pipe(stream)
-        .on('error', errorHandler(res))
-        .on('finish', async (file) => {
-          try {
-            if (input.fsPayloadCacheDirectory) {
-              input.payloadFilePath = stream.path;
-            } else {
-              input.payloadId = file._id;
-              input.payloadSize = file.length;
-            }
-            const work = await context.modules.worker.addWork({
-              type: 'BULK_IMPORT',
-              input: Object.fromEntries(Object.entries(input).filter(([, value]) => Boolean(value))),
-              retries: 0,
-              priority: 10,
-            });
-            res.writeHead(200);
-            res.end(JSON.stringify(work));
-          } catch (e) {
-            errorHandler(res)(e);
-          }
-        });
+      res.writeHead(200);
+      res.end(JSON.stringify(work));
     } catch (e) {
       errorHandler(res)(e);
     }

package/src/hashPassword.ts

@@ -1,5 +1,5 @@
 import crypto from 'crypto';
 
-export const hashPassword = (password) => {
+export const hashPassword = (password: string): string => {
   return crypto.createHash('sha256').update(password).digest('hex');
 };

package/src/locale-context.ts

@@ -2,7 +2,6 @@ import { IncomingMessage, OutgoingMessage } from 'http';
 import { UnchainedLocaleContext } from '@unchainedshop/types/api.js';
 import localePkg from 'locale';
 import 'abort-controller/polyfill.js';
-import { LRUCache } from 'lru-cache';
 import { log, LogLevel } from '@unchainedshop/logger';
 import {
   resolveBestCountry,
@@ -11,6 +10,7 @@ import {
   systemLocale,
 } from '@unchainedshop/utils';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
+import * as lruCache from 'lru-cache';
 
 const { Locales } = localePkg;
 
@@ -18,7 +18,7 @@ const { NODE_ENV } = process.env;
 
 const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second
 
-const localeContextCache = new LRUCache({
+const localeContextCache = new lruCache.LRUCache({
   max: 500,
   ttl,
 });

package/src/resolvers/queries/events/event.ts

@@ -1,10 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { _ID } from '@unchainedshop/types/common.js';
 import { Root, Context } from '@unchainedshop/types/api.js';
 
 export default async function event(
   root: Root,
-  { eventId }: { eventId: _ID },
+  { eventId }: { eventId: string },
   { modules, userId }: Context,
 ) {
   log(`query event ${eventId}`, { userId });

package/src/resolvers/queries/events/events.ts

@@ -1,14 +1,11 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context, SortOption } from '@unchainedshop/types/api.js';
-import { EventQuery } from '@unchainedshop/types/events.js';
+import { Root, Context } from '@unchainedshop/types/api.js';
+
+type FindEventsParams = Parameters<Context['modules']['events']['findEvents']>['0'];
 
 export default async function events(
   root: Root,
-  params: EventQuery & {
-    limit?: number;
-    offset?: number;
-    sort: Array<SortOption>;
-  },
+  params: FindEventsParams,
   { modules, userId }: Context,
 ) {
   log(

package/src/resolvers/queries/events/eventsCounts.ts

@@ -1,8 +1,13 @@
 import { log } from '@unchainedshop/logger';
 import { Root, Context } from '@unchainedshop/types/api.js';
-import { EventQuery } from '@unchainedshop/types/events.js';
 
-export default async function eventsCount(root: Root, params: EventQuery, { modules, userId }: Context) {
+type CountEventsParams = Parameters<Context['modules']['events']['count']>['0'];
+
+export default async function eventsCount(
+  root: Root,
+  params: CountEventsParams,
+  { modules, userId }: Context,
+) {
   log(`query eventsCount  queryString: ${params.queryString}  types: ${params.types}  ${userId}`, {
     userId,
   });

package/src/resolvers/queries/payment/paymentProviders.ts

@@ -1,10 +1,11 @@
 import { log } from '@unchainedshop/logger';
-import { PaymentProviderQuery } from '@unchainedshop/types/payments.js';
+import { mongodb } from '@unchainedshop/mongodb';
 import { Context, Root } from '@unchainedshop/types/api.js';
+import { PaymentProvider } from '@unchainedshop/types/payments.js';
 
 export default async function paymentProviders(
   root: Root,
-  params: PaymentProviderQuery,
+  params: mongodb.Filter<PaymentProvider>,
   { modules, userId }: Context,
 ) {
   log(`query paymentProvider ${params.type}`, { userId });

package/src/resolvers/queries/payment/paymentProvidersCount.ts

@@ -1,10 +1,11 @@
 import { log } from '@unchainedshop/logger';
-import { PaymentProviderQuery } from '@unchainedshop/types/payments.js';
+import { mongodb } from '@unchainedshop/mongodb';
 import { Context, Root } from '@unchainedshop/types/api.js';
+import { PaymentProvider } from '@unchainedshop/types/payments.js';
 
 export default async function paymentProvidersCount(
   root: Root,
-  params: PaymentProviderQuery,
+  params: mongodb.Filter<PaymentProvider>,
   { modules, userId }: Context,
 ) {
   log(`query paymentProvidersCount ${params.type}`, { userId });

package/src/resolvers/type/assortment/assortment-types.ts

@@ -8,7 +8,6 @@ import {
   AssortmentText,
 } from '@unchainedshop/types/assortments.js';
 import { AssortmentMedia } from '@unchainedshop/types/assortments.media.js';
-import { Query } from '@unchainedshop/types/common.js';
 import { SearchFilterQuery, SearchProducts } from '@unchainedshop/types/filters.js';
 
 type HelperType<P, T> = (assortment: AssortmentType, params: P, context: Context) => T;
@@ -68,13 +67,11 @@ export const Assortment: AssortmentHelperTypes = {
     });
     const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
 
-    const selector: Query = {
+    return modules.assortments.count({
       assortmentIds,
       includeInactive,
       includeLeaves: true,
-    };
-
-    return modules.assortments.count(selector);
+    });
   },
 
   filterAssignments: async (obj, _, { modules }) => {

package/src/resolvers/type/event-types.ts

@@ -1,5 +1,5 @@
 import { Context } from '@unchainedshop/types/api.js';
-import { Event as EventType } from '@unchainedshop/types/events.js';
+import { Event as EventType } from '@unchainedshop/core-events';
 
 export type HelperType<P, T> = (work: EventType, params: P, context: Context) => T;
 

package/src/resolvers/type/work-types.ts

@@ -1,11 +1,15 @@
 import { Context } from '@unchainedshop/types/api.js';
 import { Work as WorkType } from '@unchainedshop/types/worker.js';
+import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
 
 type HelperType<P, T> = (work: WorkType, params: P, context: Context) => T;
 
 export interface WorkHelperTypes {
   status: HelperType<never, string>;
   type: HelperType<never, string>;
+  result: HelperType<never, any>;
+  input: HelperType<never, any>;
+  error: HelperType<never, any>;
   original: HelperType<never, Promise<WorkType>>;
 }
 
@@ -22,4 +26,16 @@ export const Work: WorkHelperTypes = {
     if (!obj.originalWorkId) return null;
     return modules.worker.findWork({ workId: obj.originalWorkId });
   },
+
+  input: (obj, _, { options }: Context) => {
+    return buildObfuscatedFieldsFilter(options.worker?.blacklistedVariables)(obj.input);
+  },
+
+  result: (obj, _, { options }: Context) => {
+    return buildObfuscatedFieldsFilter(options.worker?.blacklistedVariables)(obj.result);
+  },
+
+  error: (obj, _, { options }: Context) => {
+    return buildObfuscatedFieldsFilter(options.worker?.blacklistedVariables)(obj.error);
+  },
 };

package/src/roles/index.ts

@@ -1,5 +1,4 @@
 import { Roles, Role } from '@unchainedshop/roles';
-
 import { all } from './all.js';
 import { loggedIn } from './loggedIn.js';
 import { admin } from './admin.js';
@@ -139,6 +138,4 @@ const configureRoles = ({ additionalRoles = {}, additionalActions = [] }) => {
   return allRoles;
 };
 
-const updateUserRole = (context, roleName) => Roles.addUserToRoles(context, roles[roleName].name);
-
-export { allRoles, actions, configureRoles, updateUserRole };
+export { allRoles, actions, configureRoles };