@unchainedshop/api 2.10.4 → 2.10.6

package/lib/express/createApolloMiddleware.d.ts

@@ -1,3 +1,3 @@
-export default function createApolloMiddleware(contextResolver: any, apolloGraphQLServer: any, { corsOrigins }?: {
+export default function createApolloMiddleware(apolloGraphQLServer: any, { corsOrigins }?: {
     corsOrigins?: any;
 }): any[];

package/lib/express/createApolloMiddleware.js

@@ -2,7 +2,9 @@ import cors from 'cors';
 import { expressMiddleware } from '@apollo/server/express4';
 import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.mjs';
 import e from 'express';
-export default function createApolloMiddleware(contextResolver, apolloGraphQLServer, { corsOrigins = undefined } = {}) {
+import { getCurrentContextResolver } from '../context.js';
+export default function createApolloMiddleware(apolloGraphQLServer, { corsOrigins = undefined } = {}) {
+    const contextResolver = getCurrentContextResolver();
     const originFn = corsOrigins && Array.isArray(corsOrigins)
         ? (origin, callback) => {
             if (corsOrigins.length === 0 || !origin) {

package/lib/express/createApolloMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"createApolloMiddleware.js","sourceRoot":"","sources":["../../src/express/createApolloMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,oBAAoB,MAAM,yCAAyC,CAAC;AAC3E,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,eAAe,EACf,mBAAmB,EACnB,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,EAAE;IAEhC,MAAM,QAAQ,GACZ,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QACvC,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YACnB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACxC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACvC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QACH,CAAC,CAAC,WAAW,CAAC;IAElB,OAAO;QACL,IAAI,CACF,CAAC,QAAQ;YACP,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACE,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,IAAI;aAClB,CACN;QACD,CAAC,CAAC,IAAI,EAAE;QACR,oBAAoB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC7D,iBAAiB,CAAC,mBAAmB,EAAE;YACrC,OAAO,EAAE,eAAe;SACzB,CAAC;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"createApolloMiddleware.js","sourceRoot":"","sources":["../../src/express/createApolloMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,oBAAoB,MAAM,yCAAyC,CAAC;AAC3E,OAAO,CAAC,MAAM,SAAS,CAAC;AACxB,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,mBAAmB,EAAE,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,EAAE;IAClG,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,MAAM,QAAQ,GACZ,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QACvC,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YACnB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACxC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrB,OAAO;YACT,CAAC;YACD,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACvC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QACH,CAAC,CAAC,WAAW,CAAC;IAElB,OAAO;QACL,IAAI,CACF,CAAC,QAAQ;YACP,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACE,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,IAAI;aAClB,CACN;QACD,CAAC,CAAC,IAAI,EAAE;QACR,oBAAoB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC7D,iBAAiB,CAAC,mBAAmB,EAAE;YACrC,OAAO,EAAE,eAAe;SACzB,CAAC;KACH,CAAC;AACJ,CAAC"}

package/lib/express/createBulkImportMiddleware.d.ts

@@ -1,2 +1 @@
-import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
-export default function bulkImportMiddleware(contextResolver: UnchainedContextResolver): (req: any, res: any) => Promise<void>;
+export default function bulkImportMiddleware(req: any, res: any): Promise<void>;

package/lib/express/createBulkImportMiddleware.js

@@ -1,6 +1,7 @@
 import { createLogger } from '@unchainedshop/logger';
 import { checkAction } from '../acl.js';
 import { actions } from '../roles/index.js';
+import { getCurrentContextResolver } from '../context.js';
 const logger = createLogger('unchained:bulk-import');
 const errorHandler = (res) => (e) => {
     logger.error(e.message);
@@ -12,41 +13,40 @@ const methodWrongHandler = (res) => () => {
     res.writeHead(404);
     res.end();
 };
-export default function bulkImportMiddleware(contextResolver) {
-    return async (req, res) => {
-        try {
-            if (req.method !== 'POST') {
-                methodWrongHandler(res)();
-                return;
-            }
-            const context = await contextResolver({ req, res });
-            await checkAction(context, actions.bulkImport);
-            const input = {
-                createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
-                skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
-                remoteAddress: context.remoteAddress,
-            };
-            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));
+export default async function bulkImportMiddleware(req, res) {
+    try {
+        if (req.method !== 'POST') {
+            methodWrongHandler(res)();
+            return;
         }
-        catch (e) {
-            errorHandler(res)(e);
-        }
-    };
+        const contextResolver = getCurrentContextResolver();
+        const context = await contextResolver({ req, res });
+        await checkAction(context, actions.bulkImport);
+        const input = {
+            createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
+            skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
+            remoteAddress: context.remoteAddress,
+        };
+        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);
+    }
 }
 //# sourceMappingURL=createBulkImportMiddleware.js.map

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":"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"}

package/lib/express/createERCMetadataMiddleware.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="node" resolution-mode="require"/>
 import { IncomingMessage } from 'http';
-import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
-export default function ercMetadataMiddleware(contextResolver: UnchainedContextResolver): (req: IncomingMessage, res: any) => Promise<void>;
+export default function ercMetadataMiddleware(req: IncomingMessage, res: any): Promise<void>;

package/lib/express/createERCMetadataMiddleware.js

@@ -2,6 +2,7 @@ import path from 'path';
 import { createLogger } from '@unchainedshop/logger';
 import { systemLocale } from '@unchainedshop/utils';
 import localePkg from 'locale';
+import { getCurrentContextResolver } from '../context.js';
 const { Locale } = localePkg;
 const logger = createLogger('unchained:erc-metadata');
 const errorHandler = (res) => (e) => {
@@ -14,44 +15,43 @@ const methodWrongHandler = (res) => () => {
     res.writeHead(404);
     res.end();
 };
-export default function ercMetadataMiddleware(contextResolver) {
-    return async (req, res) => {
-        try {
-            if (req.method !== 'GET') {
-                methodWrongHandler(res)();
-                return;
-            }
-            const context = await contextResolver({ req, res });
-            const url = new URL(req.url, process.env.ROOT_URL);
-            const parsedPath = path.parse(url.pathname);
-            if (parsedPath.ext !== '.json')
-                throw new Error('Invalid ERC Metadata URI');
-            const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
-            const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
-            const chainTokenId = parsedPath.name;
-            const product = await context.modules.products.findProduct({
-                productId,
-            });
-            const [token] = await context.modules.warehousing.findTokens({
-                chainTokenId,
-                contractAddress: product?.tokenization?.contractAddress,
-            });
-            const ercMetadata = await context.modules.warehousing.tokenMetadata(chainTokenId, {
-                token,
-                product,
-                locale: new Locale(locale),
-                referenceDate: new Date(),
-            }, context);
-            const body = JSON.stringify(ercMetadata);
-            res.writeHead(200, {
-                'Content-Length': Buffer.byteLength(body),
-                'Content-Type': 'text/plain',
-            });
-            res.end(body);
+export default async function ercMetadataMiddleware(req, res) {
+    try {
+        if (req.method !== 'GET') {
+            methodWrongHandler(res)();
+            return;
         }
-        catch (e) {
-            errorHandler(res)(e);
-        }
-    };
+        const contextResolver = getCurrentContextResolver();
+        const context = await contextResolver({ req, res });
+        const url = new URL(req.url, process.env.ROOT_URL);
+        const parsedPath = path.parse(url.pathname);
+        if (parsedPath.ext !== '.json')
+            throw new Error('Invalid ERC Metadata URI');
+        const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
+        const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
+        const chainTokenId = parsedPath.name;
+        const product = await context.modules.products.findProduct({
+            productId,
+        });
+        const [token] = await context.modules.warehousing.findTokens({
+            chainTokenId,
+            contractAddress: product?.tokenization?.contractAddress,
+        });
+        const ercMetadata = await context.modules.warehousing.tokenMetadata(chainTokenId, {
+            token,
+            product,
+            locale: new Locale(locale),
+            referenceDate: new Date(),
+        }, context);
+        const body = JSON.stringify(ercMetadata);
+        res.writeHead(200, {
+            'Content-Length': Buffer.byteLength(body),
+            'Content-Type': 'text/plain',
+        });
+        res.end(body);
+    }
+    catch (e) {
+        errorHandler(res)(e);
+    }
 }
 //# sourceMappingURL=createERCMetadataMiddleware.js.map

package/lib/express/createERCMetadataMiddleware.js.map

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

package/lib/express/createSingleSignOnMiddleware.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference lib="dom" />
 import { IncomingMessage } from 'http';
-import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
-export default function singleSignOnMiddleware(contextResolver: UnchainedContextResolver): (req: IncomingMessage & {
+export default function singleSignOnMiddleware(req: IncomingMessage & {
     query?: any;
-}, res: any, next: any) => Promise<void>;
+}, res: any, next: any): Promise<void>;

package/lib/express/createSingleSignOnMiddleware.js

@@ -1,5 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 import cookie from 'cookie';
+import { getCurrentContextResolver } from '../context.js';
 const { ROOT_URL, NODE_ENV, UNCHAINED_CLOUD_ENDPOINT } = process.env;
 const logger = createLogger('unchained:unchained-cloud-sso');
 const loginWithSingleSignOn = async (remoteToken, context) => {
@@ -48,26 +49,25 @@ const loginWithSingleSignOn = async (remoteToken, context) => {
     }
     throw new Error('Invalid token/domain pair');
 };
-export default function singleSignOnMiddleware(contextResolver) {
-    return async (req, res, next) => {
-        try {
-            if (req.query?.token && UNCHAINED_CLOUD_ENDPOINT) {
-                const context = await contextResolver({ req, res });
-                const authCookie = await loginWithSingleSignOn(req.query.token, context);
-                if (authCookie) {
-                    res.writeHead(303, {
-                        'Set-Cookie': authCookie,
-                        Location: '/',
-                    });
-                    res.end();
-                    return;
-                }
+export default async function singleSignOnMiddleware(req, res, next) {
+    try {
+        if (req.query?.token && UNCHAINED_CLOUD_ENDPOINT) {
+            const contextResolver = getCurrentContextResolver();
+            const context = await contextResolver({ req, res });
+            const authCookie = await loginWithSingleSignOn(req.query.token, context);
+            if (authCookie) {
+                res.writeHead(303, {
+                    'Set-Cookie': authCookie,
+                    Location: '/',
+                });
+                res.end();
+                return;
             }
         }
-        catch (e) {
-            logger.error(e.message);
-        }
-        next();
-    };
+    }
+    catch (e) {
+        logger.error(e.message);
+    }
+    next();
 }
 //# sourceMappingURL=createSingleSignOnMiddleware.js.map

package/lib/express/createSingleSignOnMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createSingleSignOnMiddleware.js","sourceRoot":"","sources":["../../src/express/createSingleSignOnMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAErE,MAAM,MAAM,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAC;AAE7D,MAAM,qBAAqB,GAAG,KAAK,EAAE,WAAW,EAAE,OAAsB,EAAE,EAAE;IAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,IAAI,WAAW,CAAC;IAChG,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,wBAAwB,EAAE;QACnD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;SACnC;QACD,2BAA2B;QAC3B,aAAa;QACb,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,aAAa,EAAE,SAAS;YACxB,SAAS,EAAE;gBACT,KAAK,EAAE,WAAW;aACnB;YACD,KAAK,EACH,6FAA6F;SAChG,CAAC;KACH,CAAC,CAAC;IACH,MAAM,IAAI,GAAQ,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtC,IAAI,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,IAAI,EAAE,IAAI,EAAE,+BAA+B,EAAE,MAAM,EAAE,CAAC;QAC7F,yCAAyC;QACzC,MAAM,SAAS,GACb,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG;YAChE,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CACxC;gBACE,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,CAAC,OAAO,CAAC;gBAChB,KAAK,EAAE,qBAAqB;gBAC5B,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,KAAK;aACb,EACD,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC,CAAC;QACL,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpG,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC;QACxE,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,KAAK,EAAE;YAC5E,MAAM;YACN,QAAQ,EAAE,IAAI;YACd,OAAO;YACP,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,QAAQ,KAAK,YAAY;SAClC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,sBAAsB,CAAC,GAAsC,EAAE,GAAG,EAAE,IAAI;IACpG,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,IAAI,wBAAwB,EAAE,CAAC;YACjD,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;YACpD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAEzE,IAAI,UAAU,EAAE,CAAC;gBACf,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;oBACjB,YAAY,EAAE,UAAU;oBACxB,QAAQ,EAAE,GAAG;iBACd,CAAC,CAAC;gBACH,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IACD,IAAI,EAAE,CAAC;AACT,CAAC"}

package/lib/express/index.js

@@ -4,24 +4,26 @@ 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;
+const addContext = async function middlewareWithContext(req, res, next) {
+    try {
+        const context = getCurrentContextResolver();
+        req.unchainedContext = await context({ req, res });
+        next();
+    }
+    catch (error) {
+        next(error);
+    }
+};
 export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
-    const context = getCurrentContextResolver();
-    const addContext = async function middlewareWithContext(req, res, next) {
-        try {
-            req.unchainedContext = await context({ req, res });
-            next();
-        }
-        catch (error) {
-            next(error);
-        }
-    };
+    if (!path) {
+        throw new Error('Path is required for useMiddlewareWithCurrentContext');
+    }
     expressApp.use(path, addContext, ...middleware);
 };
 export const connect = (expressApp, { apolloGraphQLServer }, options) => {
-    const contextResolver = getCurrentContextResolver();
-    expressApp.use(GRAPHQL_API_PATH, createApolloMiddleware(contextResolver, apolloGraphQLServer, options));
-    expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware(contextResolver));
-    expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware(contextResolver));
-    expressApp.use(['/', '/.well-known/unchained/cloud-sso'], createSingleSignOnMiddleware(contextResolver));
+    expressApp.use(GRAPHQL_API_PATH, createApolloMiddleware(apolloGraphQLServer, options));
+    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,CAAC,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,yBAAyB,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,KAAK,UAAU,qBAAqB,CACrD,GAA0D,EAC1D,GAAoB,EACpB,IAAI;QAEJ,IAAI,CAAC;YACH,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,UAAqB,EACrB,EAAE,mBAAmB,EAAyC,EAC9D,OAA+B,EAC/B,EAAE;IACF,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,UAAU,CAAC,GAAG,CACZ,gBAAgB,EAChB,sBAAsB,CAAC,eAAe,EAAE,mBAAmB,EAAE,OAAO,CAAC,CACtE,CAAC;IACF,UAAU,CAAC,GAAG,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,eAAe,CAAC,CAAC,CAAC;IACpF,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC;IAClF,UAAU,CAAC,GAAG,CACZ,CAAC,GAAG,EAAE,kCAAkC,CAAC,EACzC,4BAA4B,CAAC,eAAe,CAAC,CAC9C,CAAC;AACJ,CAAC,CAAC"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.10.4",
+  "version": "2.10.6",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -19,7 +19,7 @@
   "type": "module",
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "npm run clean && tsc",
+    "prepublishOnly": "npm run clean && tsc",
     "watch": "tsc -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
@@ -41,18 +41,18 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
     "@apollo/server": "^4.10.4",
-    "cookie": "^0.6.0"
+    "cookie": "~0.6"
   },
   "optionalDependencies": {
-    "express": "^4.x"
+    "express": "~4"
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.2",
-    "@unchainedshop/core": "^2.10.4",
-    "@unchainedshop/events": "^2.10.4",
-    "@unchainedshop/logger": "^2.10.4",
-    "@unchainedshop/roles": "^2.10.4",
-    "@unchainedshop/utils": "^2.10.4",
+    "@unchainedshop/core": "^2.10.6",
+    "@unchainedshop/events": "^2.10.6",
+    "@unchainedshop/logger": "^2.10.6",
+    "@unchainedshop/roles": "^2.10.6",
+    "@unchainedshop/utils": "^2.10.6",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
@@ -64,11 +64,11 @@
   "devDependencies": {
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.14.2",
-    "@unchainedshop/types": "^2.10.4",
+    "@types/node": "^20.14.5",
+    "@unchainedshop/types": "^2.10.6",
     "express": "^4.19.2",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.4",
+    "ts-jest": "^29.1.5",
     "typescript": "^5.4.5"
   }
 }

package/src/express/createApolloMiddleware.ts

@@ -2,12 +2,11 @@ import cors from 'cors';
 import { expressMiddleware } from '@apollo/server/express4';
 import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.mjs';
 import e from 'express';
+import { getCurrentContextResolver } from '../context.js';
+
+export default function createApolloMiddleware(apolloGraphQLServer, { corsOrigins = undefined } = {}) {
+  const contextResolver = getCurrentContextResolver();
 
-export default function createApolloMiddleware(
-  contextResolver,
-  apolloGraphQLServer,
-  { corsOrigins = undefined } = {},
-) {
   const originFn =
     corsOrigins && Array.isArray(corsOrigins)
       ? (origin, callback) => {

package/src/express/createBulkImportMiddleware.ts

@@ -1,7 +1,7 @@
 import { createLogger } from '@unchainedshop/logger';
-import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
 import { checkAction } from '../acl.js';
 import { actions } from '../roles/index.js';
+import { getCurrentContextResolver } from '../context.js';
 
 const logger = createLogger('unchained:bulk-import');
 
@@ -17,52 +17,49 @@ const methodWrongHandler = (res) => () => {
   res.end();
 };
 
-export default function bulkImportMiddleware(contextResolver: UnchainedContextResolver) {
-  return async (req, res) => {
-    try {
-      if (req.method !== 'POST') {
-        methodWrongHandler(res)();
-        return;
-      }
+export default async function bulkImportMiddleware(req, res) {
+  try {
+    if (req.method !== 'POST') {
+      methodWrongHandler(res)();
+      return;
+    }
 
-      const context = await contextResolver({ req, res });
-      await checkAction(context, (actions as any).bulkImport);
+    const contextResolver = getCurrentContextResolver();
+    const context = await contextResolver({ req, res });
+    await checkAction(context, (actions as any).bulkImport);
 
-      const input: any = {
-        createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
-        skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
-        remoteAddress: context.remoteAddress,
-      };
+    const input: any = {
+      createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
+      skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
+      remoteAddress: context.remoteAddress,
+    };
 
-      const date = new Date().toISOString();
+    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,
-      );
+    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;
+    input.payloadId = file._id;
+    input.payloadSize = file.size;
 
-      const purgedInput = Object.fromEntries(
-        Object.entries(input).filter(([, value]) => Boolean(value)),
-      );
+    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,
-      });
+    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);
-    }
-  };
+    res.writeHead(200);
+    res.end(JSON.stringify(work));
+  } catch (e) {
+    errorHandler(res)(e);
+  }
 }

package/src/express/createERCMetadataMiddleware.ts

@@ -1,9 +1,9 @@
 import { IncomingMessage } from 'http';
 import path from 'path';
 import { createLogger } from '@unchainedshop/logger';
-import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
 import { systemLocale } from '@unchainedshop/utils';
 import localePkg from 'locale';
+import { getCurrentContextResolver } from '../context.js';
 
 const { Locale } = localePkg;
 
@@ -21,53 +21,52 @@ const methodWrongHandler = (res) => () => {
   res.end();
 };
 
-export default function ercMetadataMiddleware(contextResolver: UnchainedContextResolver) {
-  return async (req: IncomingMessage, res) => {
-    try {
-      if (req.method !== 'GET') {
-        methodWrongHandler(res)();
-        return;
-      }
+export default async function ercMetadataMiddleware(req: IncomingMessage, res) {
+  try {
+    if (req.method !== 'GET') {
+      methodWrongHandler(res)();
+      return;
+    }
 
-      const context = await contextResolver({ req, res });
-      const url = new URL(req.url, process.env.ROOT_URL);
-      const parsedPath = path.parse(url.pathname);
+    const contextResolver = getCurrentContextResolver();
+    const context = await contextResolver({ req, res });
+    const url = new URL(req.url, process.env.ROOT_URL);
+    const parsedPath = path.parse(url.pathname);
 
-      if (parsedPath.ext !== '.json') throw new Error('Invalid ERC Metadata URI');
+    if (parsedPath.ext !== '.json') throw new Error('Invalid ERC Metadata URI');
 
-      const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
+    const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
 
-      const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
-      const chainTokenId = parsedPath.name;
+    const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
+    const chainTokenId = parsedPath.name;
 
-      const product = await context.modules.products.findProduct({
-        productId,
-      });
+    const product = await context.modules.products.findProduct({
+      productId,
+    });
 
-      const [token] = await context.modules.warehousing.findTokens({
-        chainTokenId,
-        contractAddress: product?.tokenization?.contractAddress,
-      });
+    const [token] = await context.modules.warehousing.findTokens({
+      chainTokenId,
+      contractAddress: product?.tokenization?.contractAddress,
+    });
 
-      const ercMetadata = await context.modules.warehousing.tokenMetadata(
-        chainTokenId,
-        {
-          token,
-          product,
-          locale: new Locale(locale),
-          referenceDate: new Date(),
-        },
-        context,
-      );
+    const ercMetadata = await context.modules.warehousing.tokenMetadata(
+      chainTokenId,
+      {
+        token,
+        product,
+        locale: new Locale(locale),
+        referenceDate: new Date(),
+      },
+      context,
+    );
 
-      const body = JSON.stringify(ercMetadata);
-      res.writeHead(200, {
-        'Content-Length': Buffer.byteLength(body),
-        'Content-Type': 'text/plain',
-      });
-      res.end(body);
-    } catch (e) {
-      errorHandler(res)(e);
-    }
-  };
+    const body = JSON.stringify(ercMetadata);
+    res.writeHead(200, {
+      'Content-Length': Buffer.byteLength(body),
+      'Content-Type': 'text/plain',
+    });
+    res.end(body);
+  } catch (e) {
+    errorHandler(res)(e);
+  }
 }

package/src/express/createSingleSignOnMiddleware.ts

@@ -4,6 +4,7 @@ import { createLogger } from '@unchainedshop/logger';
 import { UnchainedContextResolver } from '@unchainedshop/types/api.js';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
 import cookie from 'cookie';
+import { getCurrentContextResolver } from '../context.js';
 
 const { ROOT_URL, NODE_ENV, UNCHAINED_CLOUD_ENDPOINT } = process.env;
 
@@ -63,25 +64,24 @@ const loginWithSingleSignOn = async (remoteToken, context: UnchainedCore) => {
   throw new Error('Invalid token/domain pair');
 };
 
-export default function singleSignOnMiddleware(contextResolver: UnchainedContextResolver) {
-  return async (req: IncomingMessage & { query?: any }, res, next) => {
-    try {
-      if (req.query?.token && UNCHAINED_CLOUD_ENDPOINT) {
-        const context = await contextResolver({ req, res });
-        const authCookie = await loginWithSingleSignOn(req.query.token, context);
+export default async function singleSignOnMiddleware(req: IncomingMessage & { query?: any }, res, next) {
+  try {
+    if (req.query?.token && UNCHAINED_CLOUD_ENDPOINT) {
+      const contextResolver = getCurrentContextResolver();
+      const context = await contextResolver({ req, res });
+      const authCookie = await loginWithSingleSignOn(req.query.token, context);
 
-        if (authCookie) {
-          res.writeHead(303, {
-            'Set-Cookie': authCookie,
-            Location: '/',
-          });
-          res.end();
-          return;
-        }
+      if (authCookie) {
+        res.writeHead(303, {
+          'Set-Cookie': authCookie,
+          Location: '/',
+        });
+        res.end();
+        return;
       }
-    } catch (e) {
-      logger.error(e.message);
     }
-    next();
-  };
+  } catch (e) {
+    logger.error(e.message);
+  }
+  next();
 }

package/src/express/index.ts

@@ -14,20 +14,24 @@ const {
   GRAPHQL_API_PATH = '/graphql',
 } = process.env;
 
+const addContext = async function middlewareWithContext(
+  req: IncomingMessage & { unchainedContext: UnchainedCore },
+  res: OutgoingMessage,
+  next,
+) {
+  try {
+    const context = getCurrentContextResolver();
+    req.unchainedContext = await context({ req, res });
+    next();
+  } catch (error) {
+    next(error);
+  }
+};
+
 export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
-  const context = getCurrentContextResolver();
-  const addContext = async function middlewareWithContext(
-    req: IncomingMessage & { unchainedContext: UnchainedCore },
-    res: OutgoingMessage,
-    next,
-  ) {
-    try {
-      req.unchainedContext = await context({ req, res });
-      next();
-    } catch (error) {
-      next(error);
-    }
-  };
+  if (!path) {
+    throw new Error('Path is required for useMiddlewareWithCurrentContext');
+  }
 
   expressApp.use(path, addContext, ...middleware);
 };
@@ -37,16 +41,8 @@ export const connect = (
   { apolloGraphQLServer }: { apolloGraphQLServer: ApolloServer },
   options?: { corsOrigins?: any },
 ) => {
-  const contextResolver = getCurrentContextResolver();
-
-  expressApp.use(
-    GRAPHQL_API_PATH,
-    createApolloMiddleware(contextResolver, apolloGraphQLServer, options),
-  );
-  expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware(contextResolver));
-  expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware(contextResolver));
-  expressApp.use(
-    ['/', '/.well-known/unchained/cloud-sso'],
-    createSingleSignOnMiddleware(contextResolver),
-  );
+  expressApp.use(GRAPHQL_API_PATH, createApolloMiddleware(apolloGraphQLServer, options));
+  expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware);
+  expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware);
+  expressApp.use(['/', '/.well-known/unchained/cloud-sso'], createSingleSignOnMiddleware);
 };

package/tsconfig.json

@@ -2,10 +2,8 @@
   "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib",
+    "outDir": "lib"
   },
   "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
-  "include": [
-    "./src"
-  ]
-}
+  "include": ["./src"]
+}