@unchainedshop/plugins 3.0.0-alpha6 → 3.0.0-rc.11

package/lib/delivery/pick-mup.js

@@ -1,6 +1,5 @@
-/// <reference lib="dom" />
+import { DeliveryAdapter, DeliveryDirector, DeliveryError } from '@unchainedshop/core';
 import { DeliveryProviderType } from '@unchainedshop/core-delivery';
-import { DeliveryAdapter, DeliveryDirector, DeliveryError } from '@unchainedshop/core-delivery';
 const fetchPickMupLocations = async (key, idsFilter) => {
     // 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`;
     const pickMupUrl = '';

package/lib/delivery/pick-mup.js.map

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

package/lib/delivery/post.js

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

package/lib/delivery/post.js.map

@@ -1 +1 @@
-{"version":3,"file":"post.js","sourceRoot":"","sources":["../../src/delivery/post.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEvG,MAAM,IAAI,GAAqB;IAC7B,GAAG,eAAe;IAElB,GAAG,EAAE,qBAAqB;IAC1B,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,OAAO;IAEhB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"post.js","sourceRoot":"","sources":["../../src/delivery/post.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,eAAe,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,IAAI,GAAqB;IAC7B,GAAG,eAAe;IAElB,GAAG,EAAE,qBAAqB;IAC1B,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,OAAO;IAEhB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC"}

package/lib/delivery/send-message.js

@@ -1,4 +1,5 @@
-import { DeliveryAdapter, DeliveryDirector, DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { DeliveryAdapter, DeliveryDirector } from '@unchainedshop/core';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 const SendMessage = {
     ...DeliveryAdapter,
     key: 'shop.unchained.delivery.send-message',

package/lib/delivery/send-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"send-message.js","sourceRoot":"","sources":["../../src/delivery/send-message.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEvG,MAAM,WAAW,GAAqB;IACpC,GAAG,eAAe;IAElB,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE;QACpB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1B,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACxB,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;KACzB;IAED,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;gBAEnC,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;oBAC5B,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,CAAC;oBACV,KAAK,EAAE;wBACL,QAAQ,EAAE,UAAU;wBACpB,OAAO,EAAE,KAAK,CAAC,GAAG;wBAClB,MAAM;qBACP;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"send-message.js","sourceRoot":"","sources":["../../src/delivery/send-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAoB,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,WAAW,GAAqB;IACpC,GAAG,eAAe;IAElB,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAEhB,oBAAoB,EAAE;QACpB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;QAC1B,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACxB,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;KACzB;IAED,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;IAChD,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;gBAEnC,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;oBAC5B,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,CAAC;oBACV,KAAK,EAAE;wBACL,QAAQ,EAAE,UAAU;wBACpB,OAAO,EAAE,KAAK,CAAC,GAAG;wBAClB,MAAM;qBACP;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC"}

package/lib/delivery/stores.js

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

package/lib/delivery/stores.js.map

@@ -1 +1 @@
-{"version":3,"file":"stores.js","sourceRoot":"","sources":["../../src/delivery/stores.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEvG,MAAM,OAAO,GAAqB;IAChC,GAAG,eAAe;IAElB,GAAG,EAAE,uBAAuB;IAC5B,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAEhB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,MAAM,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;gBACrC,IAAI,IAAI,CAAC,GAAG,KAAK,QAAQ;oBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzD,OAAO,OAAO,CAAC;YACjB,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC,CAAC;QAEF,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ;gBACN,OAAO,IAAI,CAAC;YACd,CAAC;YAED,oBAAoB;gBAClB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,kBAAkB;gBAChB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC/B,OAAO,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;YACvD,CAAC;YAED,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,OAAO,SAAS,EAAE,CAAC;YACrB,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"stores.js","sourceRoot":"","sources":["../../src/delivery/stores.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAoB,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,OAAO,GAAqB;IAChC,GAAG,eAAe;IAElB,GAAG,EAAE,uBAAuB;IAC5B,KAAK,EAAE,uBAAuB;IAC9B,OAAO,EAAE,OAAO;IAEhB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACtB,OAAO,IAAI,KAAK,oBAAoB,CAAC,MAAM,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3B,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;gBACrC,IAAI,IAAI,CAAC,GAAG,KAAK,QAAQ;oBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzD,OAAO,OAAO,CAAC;YACjB,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC,CAAC;QAEF,OAAO;YACL,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;YAE3C,QAAQ;gBACN,OAAO,IAAI,CAAC;YACd,CAAC;YAED,oBAAoB;gBAClB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,kBAAkB;gBAChB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,kBAAkB,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC/B,OAAO,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;YACvD,CAAC;YAED,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,OAAO,SAAS,EAAE,CAAC;YACrB,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC"}

package/lib/enrollments/licensed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"licensed.d.ts","sourceRoot":"","sources":["../../src/enrollments/licensed.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;aAOxB,CAAC"}
+{"version":3,"file":"licensed.d.ts","sourceRoot":"","sources":["../../src/enrollments/licensed.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,YAAY;;;aAOxB,CAAC"}

package/lib/enrollments/licensed.js

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

package/lib/enrollments/licensed.js.map

@@ -1 +1 @@
-{"version":3,"file":"licensed.js","sourceRoot":"","sources":["../../src/enrollments/licensed.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAExF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QACjD,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7C,OAAO,cAAc,IAAI,SAAS,IAAI,YAAY,IAAI,SAAS,CAAC;IAClE,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAuB;IAC9C,GAAG,iBAAiB;IAEpB,GAAG,EAAE,qCAAqC;IAC1C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,6BAA6B;IAEpC,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;QAC9B,OAAO,WAAW,EAAE,oBAAoB,KAAK,UAAU,CAAC;IAC1D,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,OAAO;YACL,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC;YAEpC,oBAAoB,EAAE,KAAK,IAAI,EAAE;gBAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,OAAO,IAAI,EAAE,CAAC;gBACjD,OAAO,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAClD,CAAC;YAED,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAC3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;gBACzE,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,OAAO,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,kBAAkB,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"licensed.js","sourceRoot":"","sources":["../../src/enrollments/licensed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEhG,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IACjC,OAAO,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,MAAM,cAAc,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QACjD,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7C,OAAO,cAAc,IAAI,SAAS,IAAI,YAAY,IAAI,SAAS,CAAC;IAClE,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAuB;IAC9C,GAAG,iBAAiB;IAEpB,GAAG,EAAE,qCAAqC;IAC1C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,6BAA6B;IAEpC,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;QAC9B,OAAO,WAAW,EAAE,oBAAoB,KAAK,UAAU,CAAC;IAC1D,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,OAAO;YACL,GAAG,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC;YAEpC,oBAAoB,EAAE,KAAK,IAAI,EAAE;gBAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,OAAO,IAAI,EAAE,CAAC;gBACjD,OAAO,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAClD,CAAC;YAED,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACvC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;gBAC3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;gBACzE,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,OAAO,CAAC;gBACjB,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,kBAAkB,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC"}

package/lib/events/aws-eventbridge.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=aws-eventbridge.d.ts.map

package/lib/events/aws-eventbridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-eventbridge.d.ts","sourceRoot":"","sources":["../../src/events/aws-eventbridge.ts"],"names":[],"mappings":""}

package/lib/events/aws-eventbridge.js

@@ -0,0 +1,36 @@
+import { setEmitAdapter } from '@unchainedshop/events';
+import { EventBridgeClient, PutEventsCommand } from '@aws-sdk/client-eventbridge';
+import { createLogger } from '@unchainedshop/logger';
+const logger = createLogger('unchained:eventbridge');
+const EventBridgeEventEmitter = ({ region, source, busName }) => {
+    const ebClient = new EventBridgeClient({ region });
+    return {
+        publish: (eventName, payload) => {
+            const entry = {
+                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,
+    }));
+}
+//# sourceMappingURL=aws-eventbridge.js.map

package/lib/events/aws-eventbridge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aws-eventbridge.js","sourceRoot":"","sources":["../../src/events/aws-eventbridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAyB,MAAM,6BAA6B,CAAC;AACzG,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,uBAAuB,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAe,EAAE;IAC3E,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnD,OAAO;QACL,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;YAC9B,MAAM,KAAK,GAA0B;gBACnC,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,SAAS;gBACrB,YAAY,EAAE,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;aAChC,CAAC;YACF,QAAQ;iBACL,IAAI,CACH,IAAI,gBAAgB,CAAC;gBACnB,OAAO,EAAE,CAAC,KAAK,CAAC;aACjB,CAAC,CACH;iBACA,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,SAAS,EAAE,GAAG,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AACxF,IAAI,mBAAmB,IAAI,mBAAmB,IAAI,qBAAqB,EAAE,CAAC;IACxE,cAAc,CACZ,uBAAuB,CAAC;QACtB,MAAM,EAAE,mBAAmB;QAC3B,MAAM,EAAE,mBAAmB;QAC3B,OAAO,EAAE,qBAAqB;KAC/B,CAAC,CACH,CAAC;AACJ,CAAC"}

package/lib/events/node-event-emitter.js

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { setEmitAdapter } from '@unchainedshop/events';
 const NodeEventEmitter = () => {
     const eventEmitter = new EventEmitter();
@@ -11,6 +11,5 @@ const NodeEventEmitter = () => {
         },
     };
 };
-const adapter = NodeEventEmitter();
-setEmitAdapter(adapter);
+setEmitAdapter(NodeEventEmitter());
 //# sourceMappingURL=node-event-emitter.js.map

package/lib/events/node-event-emitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-event-emitter.js","sourceRoot":"","sources":["../../src/events/node-event-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,cAAc,EAAe,MAAM,uBAAuB,CAAC;AAEpE,MAAM,gBAAgB,GAAG,GAAgB,EAAE;IACzC,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAExC,OAAO;QACL,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QAED,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YACjC,OAAO,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;AACnC,cAAc,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"node-event-emitter.js","sourceRoot":"","sources":["../../src/events/node-event-emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAe,MAAM,uBAAuB,CAAC;AAEpE,MAAM,gBAAgB,GAAG,GAAgB,EAAE;IACzC,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAExC,OAAO;QACL,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QAED,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YACjC,OAAO,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9C,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC"}

package/lib/events/redis.js

@@ -1,6 +1,6 @@
 import { createClient } from '@redis/client';
 import { setEmitAdapter } 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();
 const RedisEventEmitter = () => {
     const redisPublisher = createClient({
@@ -23,5 +23,7 @@ const RedisEventEmitter = () => {
         },
     };
 };
-setEmitAdapter(RedisEventEmitter());
+if (REDIS_HOST && REDIS_PORT && REDIS_DB) {
+    setEmitAdapter(RedisEventEmitter());
+}
 //# sourceMappingURL=redis.js.map

package/lib/events/redis.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/events/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAe,MAAM,uBAAuB,CAAC;AAEpE,MAAM,EAAE,UAAU,GAAG,MAAM,EAAE,UAAU,GAAG,WAAW,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEtF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEnC,MAAM,iBAAiB,GAAG,GAAgB,EAAE;IAC1C,MAAM,cAAc,GAAG,YAAY,CAAC;QAClC,GAAG,EAAE,WAAW,UAAU,IAAI,UAAU,EAAE;QAC1C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,YAAY,CAAC;QACnC,GAAG,EAAE,WAAW,UAAU,IAAI,UAAU,EAAE;QAC1C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3F,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YACjC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;oBAC/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;gBACH,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC"}
+{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/events/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAe,MAAM,uBAAuB,CAAC;AAEpE,MAAM,EAAE,UAAU,GAAG,MAAM,EAAE,UAAU,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAExE,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;AAEnC,MAAM,iBAAiB,GAAG,GAAgB,EAAE;IAC1C,MAAM,cAAc,GAAG,YAAY,CAAC;QAClC,GAAG,EAAE,WAAW,UAAU,IAAI,UAAU,EAAE;QAC1C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,YAAY,CAAC;QACnC,GAAG,EAAE,WAAW,UAAU,IAAI,UAAU,EAAE;QAC1C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;KACjC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3F,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YACjC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;oBAC/C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;gBACH,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,IAAI,UAAU,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;IACzC,cAAc,CAAC,iBAAiB,EAAE,CAAC,CAAC;AACtC,CAAC"}

package/lib/files/gridfs/gridfs-adapter.d.ts

@@ -1,3 +1,9 @@
 import { IFileAdapter } from '@unchainedshop/file-upload';
-export declare const GridFSAdapter: IFileAdapter;
+import { UnchainedCore } from '@unchainedshop/core';
+import { GridFSFileUploadsModule } from './index.js';
+export declare const GridFSAdapter: IFileAdapter<UnchainedCore & {
+    modules: {
+        gridfsFileUploads: GridFSFileUploadsModule;
+    };
+}>;
 //# sourceMappingURL=gridfs-adapter.d.ts.map

package/lib/files/gridfs/gridfs-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridfs-adapter.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,YAAY,EACb,MAAM,4BAA4B,CAAC;AAcpC,eAAO,MAAM,aAAa,EAAE,YAkH3B,CAAC"}
+{"version":3,"file":"gridfs-adapter.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAKL,YAAY,EACb,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAYrD,eAAO,MAAM,aAAa,EAAE,YAAY,CACtC,aAAa,GAAG;IACd,OAAO,EAAE;QACP,iBAAiB,EAAE,uBAAuB,CAAC;KAC5C,CAAC;CACH,CA6HF,CAAC"}

package/lib/files/gridfs/gridfs-adapter.js

@@ -1,10 +1,9 @@
-/// <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, FileDirector, buildHashedFilename, resolveExpirationDate, } from '@unchainedshop/file-upload';
 import sign from './sign.js';
+import { filesSettings } from '@unchainedshop/core-files';
 const { ROOT_URL } = process.env;
 const bufferToStream = (buffer) => {
     const stream = new Readable();
@@ -17,10 +16,19 @@ export const GridFSAdapter = {
     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(fileName)}?e=${expiryDate.getTime()}&s=${signature}`, ROOT_URL).href;
         const url = `/gridfs/${directoryName}/${hashedFilename}`;
         return {
@@ -46,7 +54,7 @@ export const GridFSAdapter = {
             stream = bufferToStream(Buffer.from(rawFile.buffer, 'base64'));
         }
         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(directoryName, hashedFilename, fileName, { 'content-type': type });
         await pipeline(stream, new PassThrough({ allowHalfOpen: true }), writeStream);
@@ -66,7 +74,7 @@ export const GridFSAdapter = {
         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/lib/files/gridfs/gridfs-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"gridfs-adapter.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EACL,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,qBAAqB,GAEtB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,cAAc,GAAG,CAAC,MAAW,EAAE,EAAE;IACrC,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAiB;IACzC,GAAG,EAAE,0CAA0C;IAC/C,KAAK,EAAE,wCAAwC;IAC/C,OAAO,EAAE,OAAO;IAEhB,GAAG,WAAW;IAEd,KAAK,CAAC,eAAe,CAAC,aAAa,EAAE,QAAQ;QAC3C,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChF,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,cAAc,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5E,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,WAAW,aAAa,IAAI,kBAAkB,CAC5C,QAAQ,CACT,MAAM,UAAU,CAAC,OAAO,EAAE,MAAM,SAAS,EAAE,EAC5C,QAAQ,CACT,CAAC,IAAI,CAAC;QACP,MAAM,GAAG,GAAG,WAAW,aAAa,IAAI,cAAc,EAAE,CAAC;QAEzD,OAAO;YACL,GAAG,EAAE,cAAc;YACnB,aAAa;YACb,UAAU;YACV,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC/B,MAAM;YACN,GAAG;SACmC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,aAAqB,EAAE,OAAY,EAAE,EAAE,OAAO,EAAO;QAC9E,IAAI,MAAM,CAAC;QACX,IAAI,QAAQ,CAAC;QACb,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;YAC/B,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC;YACxD,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChF,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEpF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CACnE,aAAa,EACb,cAAc,EACd,QAAQ,EACR,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;QACF,MAAM,QAAQ,CAAC,MAAM,EAAE,IAAI,WAAW,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;QAC9E,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAC/B,MAAM,GAAG,GAAG,WAAW,aAAa,IAAI,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;QAE7E,OAAO;YACL,GAAG,EAAE,cAAc;YACnB,aAAa;YACb,UAAU,EAAE,IAAI;YAChB,QAAQ;YACR,IAAI,EAAE,MAAM;YACZ,IAAI;YACJ,GAAG;SACc,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,aAAqB,EACrB,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAO,EACnD,EAAE,OAAO,EAAO;QAEhB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAEpE,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,MAAM,cAAc,GAAG,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEhF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAC7F,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE/E,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CACnE,aAAa,EACb,cAAc,EACd,QAAQ,EACR,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;QACF,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAA2B,EAAE,IAAI,WAAW,EAAE,EAAE,WAAW,CAAC,CAAC;QACrF,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;QAC/B,MAAM,GAAG,GAAG,WAAW,aAAa,IAAI,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;QAE7E,OAAO;YACL,GAAG,EAAE,MAAM,IAAI,cAAc;YAC7B,aAAa;YACb,UAAU,EAAE,IAAI;YAChB,QAAQ;YACR,IAAI,EAAE,MAAM;YACZ,IAAI;YACJ,GAAG;SACc,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAO;QAC/C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACzF,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,OAAO,EAAO;QACvC,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAC9F,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,YAAY,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"gridfs-adapter.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-adapter.ts"],"names":[],"mappings":"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"}

package/lib/files/gridfs/gridfs-webhook.d.ts

@@ -1,6 +1,6 @@
-import { Context } from '@unchainedshop/api';
 import express from 'express';
 import { configureGridFSFileUploadModule } from './index.js';
+import { Context } from '@unchainedshop/api';
 export declare const gridfsHandler: (req: express.Request & {
     unchainedContext: Context & {
         modules: {

package/lib/files/gridfs/gridfs-webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridfs-webhook.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAC;AAI7D,eAAO,MAAM,aAAa,QACnB,OAAO,CAAC,OAAO,GAAG;IACrB,gBAAgB,EAAE,OAAO,GAAG;QAC1B,OAAO,EAAE;YAAE,iBAAiB,EAAE,UAAU,CAAC,OAAO,+BAA+B,CAAC,CAAA;SAAE,CAAC;KACpF,CAAC;CACH,OACI,OAAO,CAAC,QAAQ,kBA2FtB,CAAC"}
+{"version":3,"file":"gridfs-webhook.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAQ7C,eAAO,MAAM,aAAa,QACnB,OAAO,CAAC,OAAO,GAAG;IACrB,gBAAgB,EAAE,OAAO,GAAG;QAC1B,OAAO,EAAE;YAAE,iBAAiB,EAAE,UAAU,CAAC,OAAO,+BAA+B,CAAC,CAAA;SAAE,CAAC;KACpF,CAAC;CACH,OACI,OAAO,CAAC,QAAQ,kBA4GtB,CAAC"}

package/lib/files/gridfs/gridfs-webhook.js

@@ -1,9 +1,11 @@
-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 sign from './sign.js';
+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, res) => {
     try {
         const { services, modules } = req.unchainedContext;
@@ -24,8 +26,8 @@ export const gridfsHandler = async (req, res) => {
         if (req.method === 'PUT') {
             const { s: signature, e: expiryTimestamp } = req.query;
             const expiryDate = new Date(parseInt(expiryTimestamp, 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;
@@ -40,7 +42,7 @@ export const gridfsHandler = async (req, res) => {
                 const writeStream = await modules.gridfsFileUploads.createWriteStream(directoryName, fileId, fileName, { 'content-type': type });
                 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();
                 return;
@@ -51,7 +53,24 @@ export const gridfsHandler = async (req, res) => {
         }
         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, 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']);
             }
@@ -70,12 +89,12 @@ export const gridfsHandler = async (req, res) => {
     }
     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/lib/files/gridfs/gridfs-webhook.js.map

@@ -1 +1 @@
-{"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gridfs-webhook.js","sourceRoot":"","sources":["../../../src/files/gridfs/gridfs-webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,MAAM,GAAG,YAAY,CAAC,0BAA0B,CAAC,CAAC;AAExD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,GAIC,EACD,GAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,gBAAgB,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,gBAAgB,EAAE,WAAW,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEjD;yEACiE;QACjE,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,UAAU,CAAC,CAAC;QAC1D,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;QAC9D,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QAElD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC7B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACzB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YACvD,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,eAAyB,EAAE,EAAE,CAAC,CAAC,CAAC;YACrE,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC9E,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC5E,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;gBACtD,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;oBAC1B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;oBAC/B,OAAO;gBACT,CAAC;gBACD,wEAAwE;gBACxE,sCAAsC;gBACtC,MAAM,IAAI,GACR,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,0BAA0B;oBACvD,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;oBACzC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC;gBAE9C,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,iBAAiB,CACnE,aAAa,EACb,MAAM,EACN,QAAQ,EACR,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;gBACF,MAAM,QAAQ,CAAC,GAAG,EAAE,IAAI,WAAW,EAAE,EAAE,WAAW,CAAC,CAAC;gBAEpD,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;gBAC/B,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE9D,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACrB,GAAG,CAAC,GAAG,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,QAAQ,CAAC;YACxB,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAChF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9D,IAAI,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAyB,EAAE,EAAE,CAAC,CAAC;gBACvD,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;oBACzB,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;oBACvC,OAAO;gBACT,CAAC;gBAED,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;gBAC3C,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAElF,IAAI,IAAI,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oBACtE,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;oBACjD,OAAO;gBACT,CAAC;YACH,CAAC;YACD,IAAI,IAAI,EAAE,QAAQ,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;gBACrC,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;YAC/D,CAAC;YACD,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC;gBACjB,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3D,CAAC;YAED,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAC3F,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YACrC,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3B,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;QACrB,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,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;QAC9E,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/lib/files/gridfs/index.d.ts

@@ -7,4 +7,5 @@ export declare const configureGridFSFileUploadModule: ({ db }: {
     createReadStream: (directoryName: any, fileId: any) => Promise<mongodb.GridFSBucketReadStream>;
     removeFileFromBucket: (directoryName: any, fileId: any) => Promise<void>;
 };
+export type GridFSFileUploadsModule = ReturnType<typeof configureGridFSFileUploadModule>;
 //# sourceMappingURL=index.d.ts.map

package/lib/files/gridfs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,eAAO,MAAM,+BAA+B;;;;;;;CA0B3C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,eAAO,MAAM,+BAA+B;;;;;;;CA0B3C,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,UAAU,CAAC,OAAO,+BAA+B,CAAC,CAAC"}

package/lib/files/gridfs/sign.d.ts

@@ -1,3 +1,3 @@
-declare const sign: (directoryName: any, hash: any, expiryTimestamp: any) => string;
+declare const sign: (directoryName: any, hash: any, expiryTimestamp: any) => Promise<string>;
 export default sign;
 //# sourceMappingURL=sign.d.ts.map

package/lib/files/gridfs/sign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sign.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/sign.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,IAAI,iEAST,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"sign.d.ts","sourceRoot":"","sources":["../../../src/files/gridfs/sign.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,IAAI,0EAuBT,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/lib/files/gridfs/sign.js

@@ -1,12 +1,13 @@
-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');
-    const hmac = crypto.createHmac('sha256', UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET);
-    const signature = [directoryName, hash, expiryTimestamp].join(':');
-    hmac.update(signature);
-    return hmac.digest('hex');
+        throw new Error('To enable PUT based uploads or signed downloads you have to provide a random UNCHAINED_GRIDFS_PUT_UPLOAD_SECRET environment variable');
+    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;
 //# sourceMappingURL=sign.js.map

package/lib/files/gridfs/sign.js.map

@@ -1 +1 @@
-{"version":3,"file":"sign.js","sourceRoot":"","sources":["../../../src/files/gridfs/sign.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,EAAE,kCAAkC,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE3D,MAAM,IAAI,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE;IACpD,IAAI,CAAC,kCAAkC;QACrC,MAAM,IAAI,KAAK,CACb,kHAAkH,CACnH,CAAC;IACJ,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,kCAAkC,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"sign.js","sourceRoot":"","sources":["../../../src/files/gridfs/sign.ts"],"names":[],"mappings":"AAAA,MAAM,EAAE,kCAAkC,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE3D,MAAM,IAAI,GAAG,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE;IAC1D,IAAI,CAAC,kCAAkC;QACrC,MAAM,IAAI,KAAK,CACb,sIAAsI,CACvI,CAAC;IAEJ,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CACvC,KAAK,EACL,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,kCAAkC,CAAC,EAC5D,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EACjC,KAAK,EACL,CAAC,MAAM,CAAC,CACT,CAAC;IACF,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAC9C,MAAM,EACN,GAAG,EACH,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAC3E,CAAC;IAEF,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,eAAe,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACjD,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/lib/files/minio/minio-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"minio-adapter.d.ts","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,YAAY,EACb,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAkB/B,wBAAsB,cAAc,oBAyCnC;AA+CD,eAAO,MAAM,YAAY,EAAE,YA0H1B,CAAC;AAIF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"minio-adapter.d.ts","sourceRoot":"","sources":["../../../src/files/minio/minio-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAKL,YAAY,EACb,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAqB/B,wBAAsB,cAAc,oBAsCnC;AA6BD,eAAO,MAAM,YAAY,EAAE,YAgI1B,CAAC;AAIF,eAAe,YAAY,CAAC"}

package/lib/files/minio/minio-adapter.js

@@ -1,18 +1,16 @@
-import https from 'https';
-import http from 'http';
-import { Readable } from 'stream';
-import { URL } from 'url';
+import { Readable } from 'node:stream';
 import { FileAdapter, FileDirector, buildHashedFilename, resolveExpirationDate, } 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, MINIO_REGION, MINIO_STS_ENDPOINT, MINIO_SECRET_KEY, MINIO_ENDPOINT, MINIO_BUCKET_NAME, MINIO_UPLOAD_PREFIX, NODE_ENV, AMAZON_S3_SESSION_TOKEN, } = process.env;
 let client;
 export async function connectToMinio() {
     if (!MINIO_ENDPOINT || !MINIO_BUCKET_NAME) {
-        log('Please configure Minio/S3 by providing MINIO_ENDPOINT & MINIO_BUCKET_NAME to use upload features', { level: LogLevel.Error });
+        logger.error('Please configure Minio/S3 by providing MINIO_ENDPOINT & MINIO_BUCKET_NAME to use upload features');
         return null;
     }
     try {
@@ -43,9 +41,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;
 }
@@ -59,22 +55,6 @@ const generateMinioUrl = (directoryName, hashedFilename) => {
 connectToMinio().then(function setClient(c) {
     client = c;
 });
-const createHttpDownloadStream = async (fileUrl, headers) => {
-    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) => {
     if (!client)
         throw new Error('Minio not connected, check env variables');
@@ -91,11 +71,16 @@ export const MinioAdapter = {
     label: 'Uploads files into an S3 bucket using minio',
     version: '1.1.0',
     ...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, generateMinioPath(directoryName, _id), expiryOffsetInMs() / 1000);
         return {
             _id,
@@ -129,7 +114,7 @@ export const MinioAdapter = {
             fileName = rawFile.filename;
             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 = {
             'Content-Type': type,
@@ -151,13 +136,15 @@ export const MinioAdapter = {
             throw new Error('Minio not connected, check env variables');
         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);
         const metaData = {
             'Content-Type': type,
         };
-        await client.putObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, hashedFilename), stream, undefined, metaData);
+        await client.putObject(MINIO_BUCKET_NAME, generateMinioPath(directoryName, hashedFilename), readable, undefined, metaData);
         const { size } = await getObjectStats(generateMinioPath(directoryName, hashedFilename));
         return {
             _id: fileId || hashedFilename,