@unchainedshop/plugins 3.0.0-alpha7 → 3.0.0-rc10

package/src/delivery/pick-mup.ts

@@ -1,6 +1,5 @@
-/// <reference lib="dom" />
-import { DeliveryProviderType, IDeliveryAdapter } from '@unchainedshop/core-delivery';
-import { DeliveryAdapter, DeliveryDirector, DeliveryError } from '@unchainedshop/core-delivery';
+import { DeliveryAdapter, DeliveryDirector, DeliveryError, IDeliveryAdapter } from '@unchainedshop/core';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 
 const fetchPickMupLocations = async (key: string, idsFilter?: string) => {
   // const pickMupUrl = `https://web-api.migros.ch/widgets/stores?key=${key}&verbosity=detail&limit=5000&aggregation_options%5Bempty_buckets%5D=true&filters%5Bmarkets%5D%5B0%5D%5B%5D=super&filters%5Bmarkets%5D%5B0%5D%5B%5D=mno&filters%5Bmarkets%5D%5B0%5D%5B%5D=voi&filters%5Bmarkets%5D%5B0%5D%5B%5D=mp&filters%5Bmarkets%5D%5B0%5D%5B%5D=out&filters%5Bmarkets%5D%5B0%5D%5B%5D=spx&filters%5Bmarkets%5D%5B0%5D%5B%5D=doi&filters%5Bmarkets%5D%5B0%5D%5B%5D=mec&filters%5Bmarkets%5D%5B0%5D%5B%5D=mica&filters%5Bmarkets%5D%5B0%5D%5B%5D=res&filters%5Bmarkets%5D%5B0%5D%5B%5D=flori&filters%5Bmarkets%5D%5B0%5D%5B%5D=gour&filters%5Bmarkets%5D%5B0%5D%5B%5D=alna&filters%5Bmarkets%5D%5B0%5D%5B%5D=cof&filters%5Bmarkets%5D%5B0%5D%5B%5D=chng&filters%5Bservices%5D%5Bsub_type%5D%5B%5D=pickmup&aggregation_groups%5B_custom%5D%5Bopen_on%5D%5Bnow%5D=20190923T11%3A45&aggregation_groups%5B_custom%5D%5Bopen_on%5D%5Bafter_1900%5D=20190923T19%3A01&aggregation_groups%5B_custom%5D%5Bopen_on%5D%5Bsundays%5D=sunday&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=super&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=voi&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=mp&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=mec&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=spx&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=doi&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=mica&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=out&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=flori&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=alna&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=res&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=gour&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=cof&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=res&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=gour&aggregation_groups%5Bmarkets%5D%5B_terms%5D%5B%5D=cof&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=market-service-mig_clean&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=market-service-mig_online&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=pickmup&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=post-service-point&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=subito-selfscanning&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=subito-selfcheckout&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=market-service-mig_bakery&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=counter-mez&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=counter-fisch&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=counter-kaes&aggregation_groups%5Bservices%5D%5Bsub_type%5D%5B_terms%5D%5B%5D=srv`;

package/src/delivery/post.ts

@@ -1,5 +1,5 @@
-import { IDeliveryAdapter } from '@unchainedshop/core-delivery';
-import { DeliveryAdapter, DeliveryDirector, DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { IDeliveryAdapter, DeliveryAdapter, DeliveryDirector } from '@unchainedshop/core';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 
 const Post: IDeliveryAdapter = {
   ...DeliveryAdapter,

package/src/delivery/send-message.ts

@@ -1,5 +1,5 @@
-import { IDeliveryAdapter } from '@unchainedshop/core-delivery';
-import { DeliveryAdapter, DeliveryDirector, DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { DeliveryAdapter, DeliveryDirector, IDeliveryAdapter } from '@unchainedshop/core';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 
 const SendMessage: IDeliveryAdapter = {
   ...DeliveryAdapter,

package/src/delivery/stores.ts

@@ -1,5 +1,5 @@
-import { IDeliveryAdapter } from '@unchainedshop/core-delivery';
-import { DeliveryAdapter, DeliveryDirector, DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { DeliveryAdapter, DeliveryDirector, IDeliveryAdapter } from '@unchainedshop/core';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 
 const PickMup: IDeliveryAdapter = {
   ...DeliveryAdapter,

package/src/enrollments/licensed.ts

@@ -1,5 +1,4 @@
-import { IEnrollmentAdapter } from '@unchainedshop/core-enrollments';
-import { EnrollmentDirector, EnrollmentAdapter } from '@unchainedshop/core-enrollments';
+import { IEnrollmentAdapter, EnrollmentDirector, EnrollmentAdapter } from '@unchainedshop/core';
 
 export const rangeMatcher = (date = new Date()) => {
   const timestamp = date.getTime();

package/src/events/aws-eventbridge.ts

@@ -0,0 +1,43 @@
+import { EmitAdapter, setEmitAdapter } from '@unchainedshop/events';
+import { EventBridgeClient, PutEventsCommand, PutEventsRequestEntry } from '@aws-sdk/client-eventbridge';
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:eventbridge');
+
+const EventBridgeEventEmitter = ({ region, source, busName }): EmitAdapter => {
+  const ebClient = new EventBridgeClient({ region });
+
+  return {
+    publish: (eventName, payload) => {
+      const entry: PutEventsRequestEntry = {
+        Source: source,
+        DetailType: eventName,
+        EventBusName: busName,
+        Detail: JSON.stringify(payload),
+      };
+      ebClient
+        .send(
+          new PutEventsCommand({
+            Entries: [entry],
+          }),
+        )
+        .catch((e) => {
+          logger.warn(e);
+        });
+    },
+    subscribe: () => {
+      throw new Error("You can't subscribe to EventBridge connected Events");
+    },
+  };
+};
+
+const { EVENT_BRIDGE_REGION, EVENT_BRIDGE_SOURCE, EVENT_BRIDGE_BUS_NAME } = process.env;
+if (EVENT_BRIDGE_REGION && EVENT_BRIDGE_SOURCE && EVENT_BRIDGE_BUS_NAME) {
+  setEmitAdapter(
+    EventBridgeEventEmitter({
+      source: EVENT_BRIDGE_SOURCE,
+      region: EVENT_BRIDGE_REGION,
+      busName: EVENT_BRIDGE_BUS_NAME,
+    }),
+  );
+}

package/src/events/node-event-emitter.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { setEmitAdapter, EmitAdapter } from '@unchainedshop/events';
 
 const NodeEventEmitter = (): EmitAdapter => {
@@ -15,5 +15,4 @@ const NodeEventEmitter = (): EmitAdapter => {
   };
 };
 
-const adapter = NodeEventEmitter();
-setEmitAdapter(adapter);
+setEmitAdapter(NodeEventEmitter());

package/src/events/redis.ts

@@ -1,7 +1,7 @@
 import { createClient } from '@redis/client';
 import { setEmitAdapter, EmitAdapter } from '@unchainedshop/events';
 
-const { REDIS_PORT = '6379', REDIS_HOST = '127.0.0.1', REDIS_DB = '0' } = process.env;
+const { REDIS_PORT = '6379', REDIS_HOST, REDIS_DB = '0' } = process.env;
 
 const subscribedEvents = new Set();
 
@@ -29,4 +29,6 @@ const RedisEventEmitter = (): EmitAdapter => {
   };
 };
 
-setEmitAdapter(RedisEventEmitter());
+if (REDIS_HOST && REDIS_PORT && REDIS_DB) {
+  setEmitAdapter(RedisEventEmitter());
+}

package/src/files/gridfs/gridfs-adapter.ts

@@ -1,7 +1,5 @@
-/// <reference lib="dom" />
-import { URL } from 'url';
-import { Readable, PassThrough } from 'stream';
-import { pipeline } from 'stream/promises';
+import { Readable, PassThrough } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import mimeType from 'mime-types';
 import {
   FileAdapter,
@@ -12,6 +10,9 @@ import {
 } from '@unchainedshop/file-upload';
 import { UploadFileData } from '@unchainedshop/file-upload';
 import sign from './sign.js';
+import { filesSettings } from '@unchainedshop/core-files';
+import { UnchainedCore } from '@unchainedshop/core';
+import { GridFSFileUploadsModule } from './index.js';
 
 const { ROOT_URL } = process.env;
 
@@ -23,17 +24,33 @@ const bufferToStream = (buffer: any) => {
   return stream;
 };
 
-export const GridFSAdapter: IFileAdapter = {
+export const GridFSAdapter: IFileAdapter<
+  UnchainedCore & {
+    modules: {
+      gridfsFileUploads: GridFSFileUploadsModule;
+    };
+  }
+> = {
   key: 'shop.unchained.file-upload-plugin.gridfs',
   label: 'Uploads files to Database using GridFS',
   version: '1.0.0',
 
   ...FileAdapter,
+  async createDownloadURL(file, expiry) {
+    // If public, just return the stored path from the db
+    if (!file.meta?.isPrivate) return file?.url;
 
+    const expiryTimestamp =
+      expiry ||
+      new Date(new Date().getTime() + (filesSettings?.privateFileSharingMaxAge || 0)).getTime();
+
+    const signature = await sign(file.path, file._id, expiryTimestamp);
+    return `${file.url}?s=${signature}&e=${expiryTimestamp}`;
+  },
   async createSignedURL(directoryName, fileName) {
     const expiryDate = resolveExpirationDate();
-    const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
-    const signature = sign(directoryName, hashedFilename, expiryDate.getTime());
+    const hashedFilename = await buildHashedFilename(directoryName, fileName, expiryDate);
+    const signature = await sign(directoryName, hashedFilename, expiryDate.getTime());
 
     const putURL = new URL(
       `/gridfs/${directoryName}/${encodeURIComponent(
@@ -54,8 +71,8 @@ export const GridFSAdapter: IFileAdapter = {
     } as UploadFileData & { putURL: string };
   },
 
-  async uploadFileFromStream(directoryName: string, rawFile: any, { modules }: any) {
-    let stream;
+  async uploadFileFromStream(directoryName: string, rawFile: any, { modules }) {
+    let stream: Readable;
     let fileName;
     if (rawFile instanceof Promise) {
       const { filename: f, createReadStream } = await rawFile;
@@ -67,7 +84,7 @@ export const GridFSAdapter: IFileAdapter = {
     }
 
     const expiryDate = resolveExpirationDate();
-    const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
+    const hashedFilename = await buildHashedFilename(directoryName, fileName, expiryDate);
     const type = mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype;
 
     const writeStream = await modules.gridfsFileUploads.createWriteStream(
@@ -94,13 +111,13 @@ export const GridFSAdapter: IFileAdapter = {
   async uploadFileFromURL(
     directoryName: string,
     { fileLink, fileName: fname, fileId, headers }: any,
-    { modules }: any,
+    { modules },
   ) {
     const { href } = new URL(fileLink);
     const fileName = decodeURIComponent(fname || href.split('/').pop());
 
     const expiryDate = resolveExpirationDate();
-    const hashedFilename = buildHashedFilename(directoryName, fileName, expiryDate);
+    const hashedFilename = await buildHashedFilename(directoryName, fileName, expiryDate);
 
     const response = await fetch(href, { headers });
     if (!response.ok) throw new Error(`Unexpected response for ${href}: ${response.statusText}`);

package/src/files/gridfs/gridfs-webhook.ts

@@ -1,14 +1,17 @@
-import { pipeline, finished } from 'stream/promises';
-import { PassThrough } from 'stream';
-import { log, LogLevel } from '@unchainedshop/logger';
+import { pipeline, finished } from 'node:stream/promises';
+import { PassThrough } from 'node:stream';
 import { buildHashedFilename } from '@unchainedshop/file-upload';
-import { Context } from '@unchainedshop/api';
 import express from 'express';
 import sign from './sign.js';
 import { configureGridFSFileUploadModule } from './index.js';
+import { Context } from '@unchainedshop/api';
+import { createLogger } from '@unchainedshop/logger';
+import { getFileAdapter } from '@unchainedshop/core-files';
 
 const { ROOT_URL } = process.env;
 
+const logger = createLogger('unchained:plugins:gridfs');
+
 export const gridfsHandler = async (
   req: express.Request & {
     unchainedContext: Context & {
@@ -39,15 +42,14 @@ export const gridfsHandler = async (
     if (req.method === 'PUT') {
       const { s: signature, e: expiryTimestamp } = req.query;
       const expiryDate = new Date(parseInt(expiryTimestamp as string, 10));
-      const fileId = buildHashedFilename(directoryName, fileName, expiryDate);
-      if (sign(directoryName, fileId, expiryDate.getTime()) === signature) {
+      const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
+      if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
         if (file.expires === null) {
           res.statusCode = 400;
           res.end('File already linked');
           return;
         }
-
         // If the type is octet-stream, prefer mimetype lookup from the filename
         // Else prefer the content-type header
         const type =
@@ -64,7 +66,7 @@ export const gridfsHandler = async (
         await pipeline(req, new PassThrough(), writeStream);
 
         const { length } = writeStream;
-        await services.files.linkFile({ fileId, size: length, type }, req.unchainedContext);
+        await services.files.linkFile({ fileId, size: length, type });
 
         res.statusCode = 200;
         res.end();
@@ -77,8 +79,26 @@ export const gridfsHandler = async (
 
     if (req.method === 'GET') {
       const fileId = fileName;
-
+      const { s: signature, e: expiryTimestamp } = req.query;
       const file = await modules.gridfsFileUploads.getFileInfo(directoryName, fileId);
+      const fileDocument = await modules.files.findFile({ fileId });
+      if (fileDocument?.meta?.isPrivate) {
+        const expiry = parseInt(expiryTimestamp as string, 10);
+        if (expiry <= Date.now()) {
+          res.statusCode = 403;
+          res.end('Access restricted: Expired.');
+          return;
+        }
+
+        const fileUploadAdapter = getFileAdapter();
+        const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
+
+        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+          res.statusCode = 403;
+          res.end('Access restricted: Invalid signature.');
+          return;
+        }
+      }
       if (file?.metadata?.['content-type']) {
         res.setHeader('Content-Type', file.metadata['content-type']);
       }
@@ -97,11 +117,11 @@ export const gridfsHandler = async (
     res.end();
   } catch (e) {
     if (e.code === 'ENOENT') {
-      log(e.message, { level: LogLevel.Warning });
+      logger.warn(e);
       res.statusCode = 404;
       res.end(e.message);
     } else {
-      log(e.message, { level: LogLevel.Error });
+      logger.warn(e);
       res.statusCode = 503;
       res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
     }

package/src/files/gridfs/index.ts

@@ -27,3 +27,5 @@ export const configureGridFSFileUploadModule = ({ db }) => {
     },
   };
 };
+
+export type GridFSFileUploadsModule = ReturnType<typeof configureGridFSFileUploadModule>;

package/src/files/gridfs/sign.ts

@@ -1,16 +1,28 @@
-import crypto from 'crypto';
-
 const { UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET } = process.env;
 
-const sign = (directoryName, hash, expiryTimestamp) => {
+const sign = async (directoryName, hash, expiryTimestamp) => {
   if (!UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET)
     throw new Error(
-      'To enable PUT based uploads you have to provide a random UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET environment variable',
+      'To enable PUT based uploads or signed downloads you have to provide a random UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET environment variable',
     );
-  const hmac = crypto.createHmac('sha256', UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET);
-  const signature = [directoryName, hash, expiryTimestamp].join(':');
-  hmac.update(signature);
-  return hmac.digest('hex');
+
+  const key = await crypto.subtle.importKey(
+    'raw',
+    new TextEncoder().encode(UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET),
+    { name: 'HMAC', hash: 'SHA-256' },
+    false,
+    ['sign'],
+  );
+  const signatureBinary = await crypto.subtle.sign(
+    'HMAC',
+    key,
+    new TextEncoder().encode([directoryName, hash, expiryTimestamp].join(':')),
+  );
+
+  const hmacSubtle = Array.from(new Uint8Array(signatureBinary))
+    .map((byte) => byte.toString(16).padStart(2, '0'))
+    .join('');
+  return hmacSubtle;
 };
 
 export default sign;

package/src/files/minio/minio-adapter.ts

@@ -1,7 +1,5 @@
-import https from 'https';
-import http, { OutgoingHttpHeaders } from 'http';
-import { Readable } from 'stream';
-import { URL } from 'url';
+import { Readable } from 'node:stream';
+import type { ReadableStream } from 'node:stream/web';
 import { UploadFileData } from '@unchainedshop/file-upload';
 import {
   FileAdapter,
@@ -10,12 +8,13 @@ import {
   resolveExpirationDate,
   IFileAdapter,
 } from '@unchainedshop/file-upload';
-
-import { log, LogLevel } from '@unchainedshop/logger';
 import mimeType from 'mime-types';
 import { Client } from 'minio';
 import { AssumeRoleProvider } from 'minio/dist/esm/AssumeRoleProvider.mjs';
-import { expiryOffsetInMs } from '@unchainedshop/file-upload/put-expiration.js';
+import { expiryOffsetInMs } from '@unchainedshop/file-upload/lib/put-expiration.js';
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:plugins:minio');
 
 const {
   MINIO_ACCESS_KEY,
@@ -33,9 +32,8 @@ let client: Client;
 
 export async function connectToMinio() {
   if (!MINIO_ENDPOINT || !MINIO_BUCKET_NAME) {
-    log(
+    logger.error(
       'Please configure Minio/S3 by providing MINIO_ENDPOINT & MINIO_BUCKET_NAME to use upload features',
-      { level: LogLevel.Error },
     );
     return null;
   }
@@ -67,9 +65,7 @@ export async function connectToMinio() {
     }
     return minioClient;
   } catch (error) {
-    log(`Exception while creating Minio client: ${error.message}`, {
-      level: LogLevel.Error,
-    });
+    logger.error(`Exception while creating Minio client: ${error.message}`);
   }
   return null;
 }
@@ -87,24 +83,6 @@ connectToMinio().then(function setClient(c) {
   client = c;
 });
 
-const createHttpDownloadStream = async (
-  fileUrl: string,
-  headers: OutgoingHttpHeaders,
-): Promise<http.IncomingMessage> => {
-  const { href, protocol } = new URL(fileUrl);
-  return new Promise((resolve, reject) => {
-    try {
-      if (protocol === 'http:') {
-        http.get(href, { headers }, resolve);
-      } else {
-        https.get(href, { headers }, resolve);
-      }
-    } catch (e) {
-      reject(e);
-    }
-  });
-};
-
 const getObjectStats = async (fileName: string) => {
   if (!client) throw new Error('Minio not connected, check env variables');
 
@@ -126,11 +104,16 @@ export const MinioAdapter: IFileAdapter = {
 
   ...FileAdapter,
 
+  async createDownloadURL(file) {
+    if (file.meta?.isPrivate) throw new Error("Minio Plugin doesn't support private files yet");
+    return generateMinioUrl(file.name, file._id);
+  },
+
   async createSignedURL(directoryName, fileName) {
     if (!client) throw new Error('Minio not connected, check env variables');
 
     const expiryDate = resolveExpirationDate();
-    const _id = buildHashedFilename(directoryName, fileName, expiryDate);
+    const _id = await buildHashedFilename(directoryName, fileName, expiryDate);
 
     const url = await client.presignedPutObject(
       MINIO_BUCKET_NAME,
@@ -173,7 +156,7 @@ export const MinioAdapter: IFileAdapter = {
       stream = bufferToStream(Buffer.from(rawFile.buffer, 'base64'));
     }
 
-    const _id = buildHashedFilename(directoryName, fileName, new Date());
+    const _id = await buildHashedFilename(directoryName, fileName, new Date());
     const type = mimeType.lookup(fileName) || (await Promise.resolve(rawFile)).mimetype;
 
     const metaData = {
@@ -206,11 +189,12 @@ export const MinioAdapter: IFileAdapter = {
 
     const { href } = new URL(fileLink);
     const fileName = fname || href.split('/').pop();
-    const hashedFilename = buildHashedFilename(directoryName, fileName, new Date());
-
-    const stream = await createHttpDownloadStream(fileLink, headers);
-    const type = mimeType.lookup(fileName) || stream.headers['content-type'];
+    const hashedFilename = await buildHashedFilename(directoryName, fileName, new Date());
 
+    const url = new URL(fileLink);
+    const response = await fetch(url, { headers });
+    const type = mimeType.lookup(fileName) || response.headers['content-type'];
+    const readable = Readable.fromWeb(response.body as ReadableStream<Uint8Array<ArrayBufferLike>>);
     const metaData = {
       'Content-Type': type,
     };
@@ -218,7 +202,7 @@ export const MinioAdapter: IFileAdapter = {
     await client.putObject(
       MINIO_BUCKET_NAME,
       generateMinioPath(directoryName, hashedFilename),
-      stream,
+      readable,
       undefined,
       metaData,
     );

package/src/files/minio/minio-webhook.ts

@@ -1,4 +1,6 @@
-import { log, LogLevel } from '@unchainedshop/logger';
+import { createLogger } from '@unchainedshop/logger';
+
+const logger = createLogger('unchained:plugins:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 
@@ -18,7 +20,7 @@ export const minioHandler = async (req, res) => {
         const { size, contentType: type } = object;
         const [fileId] = object.key.split('.');
         const { services } = req.unchainedContext;
-        await services.files.linkFile({ fileId, type, size }, req.unchainedContext);
+        await services.files.linkFile({ fileId, type, size });
         res.writeHead(200);
         res.end();
         return;
@@ -27,7 +29,7 @@ export const minioHandler = async (req, res) => {
     res.writeHead(404);
     res.end();
   } catch (e) {
-    log(e.message, { level: LogLevel.Error });
+    logger.error(e);
     res.writeHead(503);
     res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
   }

package/src/filters/local-search.ts

@@ -1,8 +1,7 @@
-import { FilterDirector, FilterAdapter } from '@unchainedshop/core-filters';
-import { IFilterAdapter } from '@unchainedshop/core-filters';
 import { mongodb } from '@unchainedshop/mongodb';
 import { ProductText } from '@unchainedshop/core-products';
 import { AssortmentText } from '@unchainedshop/core-assortments';
+import { FilterDirector, FilterAdapter, IFilterAdapter } from '@unchainedshop/core';
 
 function escapeStringRegexp(string) {
   if (typeof string !== 'string') {

package/src/filters/strict-equal.ts

@@ -1,5 +1,4 @@
-import { IFilterAdapter } from '@unchainedshop/core-filters';
-import { FilterDirector, FilterAdapter } from '@unchainedshop/core-filters';
+import { IFilterAdapter, FilterDirector, FilterAdapter } from '@unchainedshop/core';
 
 const StrictQualFilter: IFilterAdapter = {
   ...FilterAdapter,