@unchainedshop/platform 2.0.0-beta7 → 2.0.0-beta9

package/lib/bulk-importer/handlers/filter/update.d.ts

@@ -1,8 +1,7 @@
-import { Context } from '@unchainedshop/types/api';
-export default function updateFilter(payload: any, { authorId, logger }: {
-    authorId: string;
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function updateFilter(payload: any, { logger }: {
     logger: any;
-}, unchainedAPI: Context): Promise<{
+}, unchainedAPI: UnchainedCore): Promise<{
     entity: string;
     operation: string;
     _id: any;

package/lib/bulk-importer/handlers/filter/update.js

@@ -1,6 +1,6 @@
 import upsertFilterContent from './upsertFilterContent';
 import upsertFilterOptionContent from './upsertFilterOptionContent';
-export default async function updateFilter(payload, { authorId, logger }, unchainedAPI) {
+export default async function updateFilter(payload, { logger }, unchainedAPI) {
     const { modules } = unchainedAPI;
     const { specification, _id } = payload;
     if (!(await modules.filters.filterExists({ filterId: _id }))) {
@@ -12,12 +12,11 @@ export default async function updateFilter(payload, { authorId, logger }, unchai
         await modules.filters.update(_id, {
             ...filterData,
             options: options?.map((option) => option.value) || [],
-            authorId,
-        }, unchainedAPI, { skipInvalidation: true }, unchainedAPI.userId);
+        }, unchainedAPI, { skipInvalidation: true });
     }
     if (content) {
         logger.debug('replace localized content for filter', content);
-        await upsertFilterContent({ content, filterId: _id, authorId }, unchainedAPI);
+        await upsertFilterContent({ content, filterId: _id }, unchainedAPI);
     }
     if (options) {
         logger.debug('replace localized content for filter options', content);

package/lib/bulk-importer/handlers/filter/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/filter/update.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAEpE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,OAAY,EACZ,EAAE,QAAQ,EAAE,MAAM,EAAqC,EACvD,YAAqB;IAErB,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACjC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAC;KAC5D;IAED,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,aAAa,CAAC;IAE1D,IAAI,aAAa,EAAE;QACjB,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;QACpD,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAC1B,GAAG,EACH;YACE,GAAG,UAAU;YACb,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;YACrD,QAAQ;SACT,EACD,YAAY,EACZ,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAC1B,YAAY,CAAC,MAAM,CACpB,CAAC;KACH;IAED,IAAI,OAAO,EAAE;QACX,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;KAC/E;IAED,IAAI,OAAO,EAAE;QACX,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,OAAO,CAAC,CAAC;QACtE,MAAM,yBAAyB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;KAC3E;IAED,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/filter/update.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAEpE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,OAAY,EACZ,EAAE,MAAM,EAAmB,EAC3B,YAA2B;IAE3B,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACjC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAEvC,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CAAC,oCAAoC,GAAG,EAAE,CAAC,CAAC;KAC5D;IAED,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,aAAa,CAAC;IAE1D,IAAI,aAAa,EAAE;QACjB,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;QACpD,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAC1B,GAAG,EACH;YACE,GAAG,UAAU;YACb,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;SACtD,EACD,YAAY,EACZ,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC;KACH;IAED,IAAI,OAAO,EAAE;QACX,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;KACrE;IAED,IAAI,OAAO,EAAE;QACX,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,OAAO,CAAC,CAAC;QACtE,MAAM,yBAAyB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;KAC3E;IAED,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/filter/upsertFilterContent.d.ts

@@ -1,10 +1,8 @@
-import { Context } from '@unchainedshop/types/api';
-export default function upsertFilterContent({ content, filterId, authorId }: {
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function upsertFilterContent({ content, filterId }: {
     content: any;
     filterId: any;
-    authorId: any;
-}, unchainedAPI: Context): Promise<({
-    authorId: string;
+}, unchainedAPI: UnchainedCore): Promise<({
     filterId: string;
     filterOptionValue?: string;
     locale?: string;

package/lib/bulk-importer/handlers/filter/upsertFilterContent.js

@@ -1,6 +1,6 @@
-export default async function upsertFilterContent({ content, filterId, authorId }, unchainedAPI) {
-    return Promise.all(Object.entries(content).map(async ([locale, { authorId: tAuthorId, ...localizedData }]) => {
-        return unchainedAPI.modules.filters.texts.upsertLocalizedText({ filterId }, locale, localizedData, tAuthorId || authorId || unchainedAPI.userId);
+export default async function upsertFilterContent({ content, filterId }, unchainedAPI) {
+    return Promise.all(Object.entries(content).map(async ([locale, localizedData]) => {
+        return unchainedAPI.modules.filters.texts.upsertLocalizedText({ filterId }, locale, localizedData);
     }));
 }
 //# sourceMappingURL=upsertFilterContent.js.map

package/lib/bulk-importer/handlers/filter/upsertFilterContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsertFilterContent.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/filter/upsertFilterContent.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,mBAAmB,CAC/C,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAC/B,YAAqB;IAErB,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACzB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAuB,EAAE,EAAE;QAClF,OAAO,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAC3D,EAAE,QAAQ,EAAE,EACZ,MAAM,EACN,aAAa,EACb,SAAS,IAAI,QAAQ,IAAI,YAAY,CAAC,MAAM,CAC7C,CAAC;IACJ,CAAC,CACF,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upsertFilterContent.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/filter/upsertFilterContent.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,YAA2B;IAClG,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAuB,EAAE,EAAE;QAClF,OAAO,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IACrG,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/filter/upsertFilterOptionContent.d.ts

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 export default function upsertFilterOptionContent({ options, filterId }: {
     options: any;
     filterId: any;
-}, unchainedAPI: Context): Promise<any[]>;
+}, unchainedAPI: UnchainedCore): Promise<any[]>;

package/lib/bulk-importer/handlers/filter/upsertFilterOptionContent.js

@@ -1,7 +1,7 @@
 export default async function upsertFilterOptionContent({ options, filterId }, unchainedAPI) {
     return Promise.all((options || []).map(async ({ content: optionContent, value: optionValue }) => {
-        await Promise.all(Object.entries(optionContent).map(async ([locale, { authorId, ...localizedData }]) => {
-            return unchainedAPI.modules.filters.texts.upsertLocalizedText({ filterId, filterOptionValue: optionValue }, locale, localizedData, authorId || unchainedAPI.userId);
+        await Promise.all(Object.entries(optionContent).map(async ([locale, localizedData]) => {
+            return unchainedAPI.modules.filters.texts.upsertLocalizedText({ filterId, filterOptionValue: optionValue }, locale, localizedData);
         }));
     }));
 }

package/lib/bulk-importer/handlers/filter/upsertFilterOptionContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsertFilterOptionContent.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/filter/upsertFilterOptionContent.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,YAAqB;IAClG,OAAO,OAAO,CAAC,GAAG,CAChB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;QAC3E,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,GAAG,aAAa,EAAE,CAAuB,EAAE,EAAE;YACvE,OAAO,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAC3D,EAAE,QAAQ,EAAE,iBAAiB,EAAE,WAAW,EAAE,EAC5C,MAAM,EACN,aAAa,EACb,QAAQ,IAAI,YAAY,CAAC,MAAM,CAChC,CAAC;QACJ,CAAC,CACF,CACF,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upsertFilterOptionContent.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/filter/upsertFilterOptionContent.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,yBAAyB,CACrD,EAAE,OAAO,EAAE,QAAQ,EAAE,EACrB,YAA2B;IAE3B,OAAO,OAAO,CAAC,GAAG,CAChB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;QAC3E,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAuB,EAAE,EAAE;YACxF,OAAO,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAC3D,EAAE,QAAQ,EAAE,iBAAiB,EAAE,WAAW,EAAE,EAC5C,MAAM,EACN,aAAa,CACd,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/product/create.d.ts

@@ -1,9 +1,8 @@
-import { Context } from '@unchainedshop/types/api';
-export default function createProduct(payload: any, { logger, authorId, createShouldUpsertIfIDExists }: {
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function createProduct(payload: any, { logger, createShouldUpsertIfIDExists }: {
     logger: any;
-    authorId: any;
     createShouldUpsertIfIDExists: any;
-}, unchainedAPI: Context): Promise<{
+}, unchainedAPI: UnchainedCore): Promise<{
     entity: string;
     operation: string;
     _id: any;

package/lib/bulk-importer/handlers/product/create.js

@@ -2,8 +2,8 @@ import upsertVariations from './upsertVariations';
 import upsertMedia from './upsertMedia';
 import upsertProductContent from './upsertProductContent';
 import transformSpecificationToProductStructure from './transformSpecificationToProductStructure';
-export default async function createProduct(payload, { logger, authorId, createShouldUpsertIfIDExists }, unchainedAPI) {
-    const { modules, userId } = unchainedAPI;
+export default async function createProduct(payload, { logger, createShouldUpsertIfIDExists }, unchainedAPI) {
+    const { modules } = unchainedAPI;
     const { specification, media, variations, _id } = payload;
     if (!specification)
         throw new Error(`Specification is required when creating new product ${_id}`);
@@ -15,8 +15,7 @@ export default async function createProduct(payload, { logger, authorId, createS
         await modules.products.create({
             ...productData,
             _id,
-            authorId,
-        }, userId);
+        });
     }
     catch (e) {
         if (!createShouldUpsertIfIDExists)
@@ -24,8 +23,7 @@ export default async function createProduct(payload, { logger, authorId, createS
         logger.debug('entity already exists, falling back to update', specification);
         await modules.products.update(_id, {
             ...productData,
-            authorId,
-        }, userId);
+        });
     }
     if (!(await modules.products.productExists({ productId: _id }))) {
         throw new Error(`Can't create product ${_id}, fields missing?`);
@@ -34,16 +32,14 @@ export default async function createProduct(payload, { logger, authorId, createS
     await upsertProductContent({
         content: specification.content,
         productId: _id,
-        authorId,
     }, unchainedAPI);
     logger.debug('create product variations', variations);
     await upsertVariations({
         variations: variations || [],
         productId: _id,
-        authorId,
     }, unchainedAPI);
     logger.debug('create product media', media);
-    await upsertMedia({ media: media || [], productId: _id, authorId }, unchainedAPI);
+    await upsertMedia({ media: media || [], productId: _id }, unchainedAPI);
     return {
         entity: 'PRODUCT',
         operation: 'create',

package/lib/bulk-importer/handlers/product/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/create.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAElG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,OAAY,EACZ,EAAE,MAAM,EAAE,QAAQ,EAAE,4BAA4B,EAAE,EAClD,YAAqB;IAErB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IACzC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,GAAG,EAAE,CAAC,CAAC;IAElG,IAAI,CAAC,aAAa,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,GAAG,EAAE,CAAC,CAAC;IAEpG,MAAM,WAAW,GAAG,wCAAwC,CAAC,aAAa,CAAC,CAAC;IAC5E,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;IACnD,IAAI;QACF,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC3B;YACE,GAAG,WAAW;YACd,GAAG;YACH,QAAQ;SACT,EACD,MAAM,CACP,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,4BAA4B;YAAE,MAAM,CAAC,CAAC;QAE3C,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,aAAa,CAAC,CAAC;QAC7E,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC3B,GAAG,EACH;YACE,GAAG,WAAW;YACd,QAAQ;SACT,EACD,MAAM,CACP,CAAC;KACH;IAED,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,mBAAmB,CAAC,CAAC;KACjE;IAED,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,oBAAoB,CACxB;QACE,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,SAAS,EAAE,GAAG;QACd,QAAQ;KACT,EACD,YAAY,CACb,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,gBAAgB,CACpB;QACE,UAAU,EAAE,UAAU,IAAI,EAAE;QAC5B,SAAS,EAAE,GAAG;QACd,QAAQ;KACT,EACD,YAAY,CACb,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;IAElF,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/create.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAElG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,OAAY,EACZ,EAAE,MAAM,EAAE,4BAA4B,EAAE,EACxC,YAA2B;IAE3B,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACjC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAE1D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,GAAG,EAAE,CAAC,CAAC;IAElG,IAAI,CAAC,aAAa,CAAC,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,GAAG,EAAE,CAAC,CAAC;IAEpG,MAAM,WAAW,GAAG,wCAAwC,CAAC,aAAa,CAAC,CAAC;IAC5E,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;IACnD,IAAI;QACF,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC5B,GAAG,WAAW;YACd,GAAG;SACJ,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,4BAA4B;YAAE,MAAM,CAAC,CAAC;QAE3C,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,aAAa,CAAC,CAAC;QAC7E,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE;YACjC,GAAG,WAAW;SACf,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,mBAAmB,CAAC,CAAC;KACjE;IAED,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,oBAAoB,CACxB;QACE,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,SAAS,EAAE,GAAG;KACf,EACD,YAAY,CACb,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,gBAAgB,CACpB;QACE,UAAU,EAAE,UAAU,IAAI,EAAE;QAC5B,SAAS,EAAE,GAAG;KACf,EACD,YAAY,CACb,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;IAC5C,MAAM,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;IAExE,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/product/remove.d.ts

@@ -1,7 +1,7 @@
-import { Context } from '@unchainedshop/types/api';
+import { UnchainedCore } from '@unchainedshop/types/core';
 export default function removeProduct(payload: any, { logger }: {
     logger: any;
-}, unchainedAPI: Context): Promise<{
+}, unchainedAPI: UnchainedCore): Promise<{
     entity: string;
     operation: string;
     _id: any;

package/lib/bulk-importer/handlers/product/remove.js

@@ -1,7 +1,7 @@
 export default async function removeProduct(payload, { logger }, unchainedAPI) {
     const { services } = unchainedAPI;
     const { _id } = payload;
-    logger.debug('remove product');
+    logger.debug(`remove product ${_id}`);
     await services.products.removeProduct({ productId: _id }, unchainedAPI);
     return {
         entity: 'PRODUCT',

package/lib/bulk-importer/handlers/product/remove.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/remove.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CAAC,OAAY,EAAE,EAAE,MAAM,EAAE,EAAE,YAAqB;IACzF,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;IAClC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAE/B,MAAM,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;IAExE,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/remove.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CAAC,OAAY,EAAE,EAAE,MAAM,EAAE,EAAE,YAA2B;IAC/F,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;IAClC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IACxB,MAAM,CAAC,KAAK,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;IAEtC,MAAM,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;IAExE,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/product/update.d.ts

@@ -1,8 +1,7 @@
-import { Context } from '@unchainedshop/types/api';
-export default function createProduct(payload: any, { logger, authorId }: {
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function createProduct(payload: any, { logger }: {
     logger: any;
-    authorId: any;
-}, unchainedAPI: Context): Promise<{
+}, unchainedAPI: UnchainedCore): Promise<{
     entity: string;
     operation: string;
     _id: any;

package/lib/bulk-importer/handlers/product/update.js

@@ -2,8 +2,8 @@ import upsertVariations from './upsertVariations';
 import upsertMedia from './upsertMedia';
 import upsertProductContent from './upsertProductContent';
 import transformSpecificationToProductStructure from './transformSpecificationToProductStructure';
-export default async function createProduct(payload, { logger, authorId }, unchainedAPI) {
-    const { modules, userId } = unchainedAPI;
+export default async function createProduct(payload, { logger }, unchainedAPI) {
+    const { modules } = unchainedAPI;
     const { specification, media, variations, _id } = payload;
     if (!(await modules.products.productExists({ productId: _id }))) {
         throw new Error(`Can't update non-existing product ${_id}`);
@@ -13,14 +13,12 @@ export default async function createProduct(payload, { logger, authorId }, uncha
         logger.debug('update product object', productData);
         await modules.products.update(_id, {
             ...productData,
-            authorId,
-        }, userId);
+        });
         if (specification.content) {
             logger.debug('replace localized content for product', specification.content);
             await upsertProductContent({
                 content: specification.content,
                 productId: _id,
-                authorId,
             }, unchainedAPI);
         }
     }
@@ -29,12 +27,11 @@ export default async function createProduct(payload, { logger, authorId }, uncha
         await upsertVariations({
             variations: variations || [],
             productId: _id,
-            authorId,
         }, unchainedAPI);
     }
     if (media) {
         logger.debug('replace product media', media);
-        await upsertMedia({ media, productId: _id, authorId }, unchainedAPI);
+        await upsertMedia({ media, productId: _id }, unchainedAPI);
     }
     return {
         entity: 'PRODUCT',

package/lib/bulk-importer/handlers/product/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/update.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAElG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CAAC,OAAY,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,YAAqB;IACnG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IACzC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAE1D,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;KAC7D;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,WAAW,GAAG,wCAAwC,CAAC,aAAa,CAAC,CAAC;QAC5E,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QACnD,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC3B,GAAG,EACH;YACE,GAAG,WAAW;YACd,QAAQ;SACT,EACD,MAAM,CACP,CAAC;QAEF,IAAI,aAAa,CAAC,OAAO,EAAE;YACzB,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;YAC7E,MAAM,oBAAoB,CACxB;gBACE,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,SAAS,EAAE,GAAG;gBACd,QAAQ;aACT,EACD,YAAY,CACb,CAAC;SACH;KACF;IAED,IAAI,UAAU,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,gBAAgB,CACpB;YACE,UAAU,EAAE,UAAU,IAAI,EAAE;YAC5B,SAAS,EAAE,GAAG;YACd,QAAQ;SACT,EACD,YAAY,CACb,CAAC;KACH;IAED,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,WAAW,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;KACtE;IAED,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/update.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAElG,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CAAC,OAAY,EAAE,EAAE,MAAM,EAAE,EAAE,YAA2B;IAC/F,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACjC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAE1D,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,EAAE,CAAC,CAAC;KAC7D;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,WAAW,GAAG,wCAAwC,CAAC,aAAa,CAAC,CAAC;QAC5E,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;QACnD,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE;YACjC,GAAG,WAAW;SACf,CAAC,CAAC;QAEH,IAAI,aAAa,CAAC,OAAO,EAAE;YACzB,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;YAC7E,MAAM,oBAAoB,CACxB;gBACE,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,SAAS,EAAE,GAAG;aACf,EACD,YAAY,CACb,CAAC;SACH;KACF;IAED,IAAI,UAAU,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,gBAAgB,CACpB;YACE,UAAU,EAAE,UAAU,IAAI,EAAE;YAC5B,SAAS,EAAE,GAAG;SACf,EACD,YAAY,CACb,CAAC;KACH;IAED,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,WAAW,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC;KAC5D;IAED,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,QAAQ;QACnB,GAAG;QACH,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/product/upsertMedia.d.ts

@@ -1,6 +1,5 @@
-import { Context } from '@unchainedshop/types/api';
-export default function upsertMedia({ media, authorId, productId }: {
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function upsertMedia({ media, productId }: {
     media: any;
-    authorId: any;
     productId: any;
-}, unchainedAPI: Context): Promise<void>;
+}, unchainedAPI: UnchainedCore): Promise<void>;

package/lib/bulk-importer/handlers/product/upsertMedia.js

@@ -1,37 +1,8 @@
 import convertTagsToLowerCase from '../utils/convertTagsToLowerCase';
-const upsertAsset = async (asset, unchainedAPI) => {
-    const { modules, services, userId } = unchainedAPI;
-    const { _id, fileName, url, meta, headers, ...assetData } = asset;
-    const fileId = _id;
+import upsertAsset from '../../upsertAsset';
+const upsertProductMedia = async (productMedia, { modules }) => {
     try {
-        if (_id && (await modules.files.findFile({ fileId })))
-            throw new Error('Media already exists');
-        const assetObject = await services.files.uploadFileFromURL({
-            directoryName: 'product-media',
-            fileInput: {
-                fileLink: url,
-                fileName,
-                headers,
-            },
-            meta: { ...meta, fileId },
-            userId,
-        }, unchainedAPI);
-        if (!assetObject)
-            throw new Error('Media not created');
-        return assetObject;
-    }
-    catch (e) {
-        if (fileId) {
-            await modules.files.update(fileId, { meta: { ...meta, fileId }, ...assetData }, userId);
-            const file = await modules.files.findFile({ fileId });
-            return file;
-        }
-        return null;
-    }
-};
-const upsertProductMedia = async (productMedia, { modules, userId }) => {
-    try {
-        const productMediaObj = await modules.products.media.create(productMedia, userId);
+        const productMediaObj = await modules.products.media.create(productMedia);
         return productMediaObj;
     }
     catch (e) {
@@ -40,16 +11,15 @@ const upsertProductMedia = async (productMedia, { modules, userId }) => {
         return modules.products.media.update(productMediaId, productMediaData);
     }
 };
-export default async function upsertMedia({ media, authorId, productId }, unchainedAPI) {
-    const { modules, userId } = unchainedAPI;
+export default async function upsertMedia({ media, productId }, unchainedAPI) {
+    const { modules } = unchainedAPI;
     const productMediaObjects = await Promise.all(media.map(async ({ asset, content, ...mediaData }) => {
         const tags = convertTagsToLowerCase(mediaData?.tags);
-        const file = await upsertAsset({ meta: { ...(asset.meta || {}), productId }, ...asset }, unchainedAPI);
+        const file = await upsertAsset('product-media', { meta: { ...(asset.meta || {}), productId }, ...asset }, unchainedAPI);
         if (!file)
             throw new Error(`Unable to create binary ${asset._id}`);
         const fileId = file._id;
         const productMedia = await upsertProductMedia({
-            authorId,
             ...mediaData,
             tags,
             productId,
@@ -58,8 +28,8 @@ export default async function upsertMedia({ media, authorId, productId }, unchai
         if (!productMedia)
             throw new Error(`Unable to create product media object for file ${fileId}`);
         if (content) {
-            await Promise.all(Object.entries(content).map(async ([locale, { authorId: tAuthorId, ...localizedData }]) => {
-                return modules.products.media.texts.upsertLocalizedText(productMedia._id, locale, localizedData, tAuthorId || authorId || userId);
+            await Promise.all(Object.entries(content).map(async ([locale, localizedData]) => {
+                return modules.products.media.texts.upsertLocalizedText(productMedia._id, locale, localizedData);
             }));
         }
         return productMedia;

package/lib/bulk-importer/handlers/product/upsertMedia.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsertMedia.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/upsertMedia.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upsertMedia.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/upsertMedia.ts"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,MAAM,iCAAiC,CAAC;AACrE,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,MAAM,kBAAkB,GAAG,KAAK,EAAE,YAA0B,EAAE,EAAE,OAAO,EAAiB,EAAE,EAAE;IAC1F,IAAI;QACF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC1E,OAAO,eAAe,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,EAAE,GAAG,gBAAgB,EAAE,GAAG,YAAY,CAAC;QAClD,MAAM,cAAc,GAAG,GAAG,CAAC;QAC3B,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;KACxE;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,YAA2B;IACzF,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAEjC,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3C,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE;QACnD,MAAM,IAAI,GAAG,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,WAAW,CAC5B,eAAe,EACf,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,EACxD,YAAY,CACb,CAAC;QACF,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;QACxB,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C;YACE,GAAG,SAAS;YACZ,IAAI;YACJ,SAAS;YACT,OAAO,EAAE,IAAI,CAAC,GAAG;SACF,EACjB,YAAY,CACb,CAAC;QACF,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,kDAAkD,MAAM,EAAE,CAAC,CAAC;QAE/F,IAAI,OAAO,EAAE;YACX,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAA6B,EAAE,EAAE;gBACxF,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,mBAAmB,CACrD,YAAY,CAAC,GAAG,EAChB,MAAM,EACN,aAAa,CACd,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;SACH;QACD,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC;QAC5C,SAAS;QACT,uBAAuB,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;KACnE,CAAC,CAAC;AACL,CAAC"}

package/lib/bulk-importer/handlers/product/upsertProductContent.d.ts

@@ -1,6 +1,5 @@
-import { Context } from '@unchainedshop/types/api';
-export default function upsertProductContent({ productId, content, authorId }: {
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function upsertProductContent({ productId, content }: {
     productId: any;
     content: any;
-    authorId: any;
-}, { modules, userId }: Context): Promise<void>;
+}, { modules }: UnchainedCore): Promise<void>;

package/lib/bulk-importer/handlers/product/upsertProductContent.js

@@ -1,6 +1,6 @@
-export default async function upsertProductContent({ productId, content, authorId }, { modules, userId }) {
-    await Promise.all(Object.entries(content).map(async ([locale, { authorId: tAuthorId, ...localizedData }]) => {
-        return modules.products.texts.upsertLocalizedText(productId, locale, localizedData, tAuthorId || authorId || userId);
+export default async function upsertProductContent({ productId, content }, { modules }) {
+    await Promise.all(Object.entries(content).map(async ([locale, localizedData]) => {
+        return modules.products.texts.upsertLocalizedText(productId, locale, localizedData);
     }));
 }
 //# sourceMappingURL=upsertProductContent.js.map

package/lib/bulk-importer/handlers/product/upsertProductContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsertProductContent.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/upsertProductContent.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,EAChC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACzB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAwB,EAAE,EAAE;QACnF,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAC/C,SAAS,EACT,MAAM,EACN,aAAa,EACb,SAAS,IAAI,QAAQ,IAAI,MAAM,CAChC,CAAC;IACJ,CAAC,CACF,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"upsertProductContent.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/upsertProductContent.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAiB;IACnG,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAwB,EAAE,EAAE;QACnF,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IACtF,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/handlers/product/upsertVariations.d.ts

@@ -1,6 +1,5 @@
-import { Context } from '@unchainedshop/types/api';
-export default function upsertVariations({ variations, authorId, productId }: {
+import { UnchainedCore } from '@unchainedshop/types/core';
+export default function upsertVariations({ variations, productId }: {
     variations: any;
-    authorId: any;
     productId: any;
-}, unchainedAPI: Context): Promise<void>;
+}, unchainedAPI: UnchainedCore): Promise<void>;

package/lib/bulk-importer/handlers/product/upsertVariations.js

@@ -1,40 +1,43 @@
 const upsert = async (productVariation, unchainedAPI) => {
-    const { modules, userId } = unchainedAPI;
+    const { modules } = unchainedAPI;
     try {
-        const newVariation = await modules.products.variations.create(productVariation, userId);
+        const newVariation = await modules.products.variations.create(productVariation);
         return newVariation;
     }
     catch (e) {
         return modules.products.variations.update(productVariation._id, productVariation);
     }
 };
-export default async function upsertVariations({ variations, authorId, productId }, unchainedAPI) {
-    const { modules, userId } = unchainedAPI;
-    const productVariationObjects = await Promise.all(variations.map(async ({ content, options, ...variationsRest }) => {
+export default async function upsertVariations({ variations, productId }, unchainedAPI) {
+    const { modules } = unchainedAPI;
+    const upsertedProductVariationIds = await Promise.all(variations.map(async ({ content, options, ...variationsRest }) => {
         const variation = await upsert({
-            authorId,
             ...variationsRest,
             options: options.map((option) => option.value),
             productId,
         }, unchainedAPI);
         await Promise.all(options.map(async ({ content: optionContent, value: optionValue }) => {
-            await Promise.all(Object.entries(optionContent).map(async ([locale, { authorId: tAuthorId, ...localizedData }]) => {
+            await Promise.all(Object.entries(optionContent).map(async ([locale, localizedData]) => {
                 return modules.products.variations.texts.upsertLocalizedText({
                     productVariationId: variation._id,
                     productVariationOptionValue: optionValue,
-                }, locale, localizedData, tAuthorId || authorId || userId);
+                }, locale, localizedData);
             }));
         }));
-        await Promise.all(Object.entries(content).map(async ([locale, { authorId: tAuthorId, ...localizedData }]) => {
+        await Promise.all(Object.entries(content).map(async ([locale, localizedData]) => {
             return modules.products.variations.texts.upsertLocalizedText({
                 productVariationId: variation._id,
-            }, locale, localizedData, tAuthorId || authorId || userId);
+            }, locale, localizedData);
         }));
-        return variation;
+        return variation._id;
     }));
-    await modules.products.variations.deleteVariations({
+    const allVariations = await modules.products.variations.findProductVariations({
         productId,
-        excludedProductVariationIds: productVariationObjects.map((obj) => obj._id),
     });
+    await Promise.all(allVariations.map(async (variation) => {
+        if (!upsertedProductVariationIds.includes(variation._id)) {
+            await modules.products.variations.delete(variation._id);
+        }
+    }));
 }
 //# sourceMappingURL=upsertVariations.js.map

package/lib/bulk-importer/handlers/product/upsertVariations.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsertVariations.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/upsertVariations.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,GAAG,KAAK,EAAE,gBAAkC,EAAE,YAAqB,EAAE,EAAE;IACjF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IACzC,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QACxF,OAAO,YAAY,CAAC;KACrB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;KACnF;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,EACnC,YAAqB;IAErB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;IAEzC,MAAM,uBAAuB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/C,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,EAAE,EAAE;QAC/D,MAAM,SAAS,GAAG,MAAM,MAAM,CAC5B;YACE,QAAQ;YACR,GAAG,cAAc;YACjB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9C,SAAS;SACV,EACD,YAAY,CACb,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;YACnE,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAGxD,EAAE,EAAE;gBACH,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAC1D;oBACE,kBAAkB,EAAE,SAAS,CAAC,GAAG;oBACjC,2BAA2B,EAAE,WAAW;iBACzC,EACD,MAAM,EACN,aAAa,EACb,SAAS,IAAI,QAAQ,IAAI,MAAM,CAChC,CAAC;YACJ,CAAC,CACF,CACF,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CACzB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAGxD,EAAE,EAAE;YACH,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAC1D;gBACE,kBAAkB,EAAE,SAAS,CAAC,GAAG;aAClC,EACD,MAAM,EACN,aAAa,EACb,SAAS,IAAI,QAAQ,IAAI,MAAM,CAChC,CAAC;QACJ,CAAC,CACF,CACF,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CACH,CAAC;IACF,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACjD,SAAS;QACT,2BAA2B,EAAE,uBAAuB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;KAC3E,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"upsertVariations.js","sourceRoot":"","sources":["../../../../src/bulk-importer/handlers/product/upsertVariations.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,GAAG,KAAK,EAAE,gBAAkC,EAAE,YAA2B,EAAE,EAAE;IACvF,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACjC,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChF,OAAO,YAAY,CAAC;KACrB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;KACnF;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,YAA2B;IACnG,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAEjC,MAAM,2BAA2B,GAAG,MAAM,OAAO,CAAC,GAAG,CACnD,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,EAAE,EAAE;QAC/D,MAAM,SAAS,GAAG,MAAM,MAAM,CAC5B;YACE,GAAG,cAAc;YACjB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9C,SAAS;SACV,EACD,YAAY,CACb,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;YACnE,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAC/B,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAiC,EAAE,EAAE;gBAChE,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAC1D;oBACE,kBAAkB,EAAE,SAAS,CAAC,GAAG;oBACjC,2BAA2B,EAAE,WAAW;iBACzC,EACD,MAAM,EACN,aAAa,CACd,CAAC;YACJ,CAAC,CACF,CACF,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,aAAa,CAAiC,EAAE,EAAE;YAC5F,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAC1D;gBACE,kBAAkB,EAAE,SAAS,CAAC,GAAG;aAClC,EACD,MAAM,EACN,aAAa,CACd,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,OAAO,SAAS,CAAC,GAAG,CAAC;IACvB,CAAC,CAAC,CACH,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QAC5E,SAAS;KACV,CAAC,CAAC;IACH,MAAM,OAAO,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QACpC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YACxD,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SACzD;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/lib/bulk-importer/upsertAsset.d.ts

@@ -0,0 +1,7 @@
+import { UnchainedCore } from '@unchainedshop/types/core';
+import { File } from '@unchainedshop/types/files';
+declare const upsertAsset: (directoryName: string, asset: File & {
+    fileName: string;
+    headers?: Record<string, unknown>;
+}, unchainedAPI: UnchainedCore) => Promise<File>;
+export default upsertAsset;

package/lib/bulk-importer/upsertAsset.js

@@ -0,0 +1,33 @@
+const upsertAsset = async (directoryName, asset, unchainedAPI) => {
+    const { modules, services } = unchainedAPI;
+    const { _id: fileId, fileName, url, meta, headers, ...assetData } = asset;
+    try {
+        const existingFile = fileId && (await modules.files.findFile({ fileId }));
+        if (existingFile) {
+            const newMeta = { ...meta, fileId };
+            if (JSON.stringify(newMeta) === JSON.stringify(existingFile.meta)) {
+                return existingFile;
+            }
+            await modules.files.update(fileId, { meta: newMeta, ...assetData });
+            const updatedFile = await modules.files.findFile({ fileId });
+            return updatedFile;
+        }
+        const assetObject = await services.files.uploadFileFromURL({
+            directoryName,
+            fileInput: {
+                fileLink: url,
+                fileName,
+                headers,
+            },
+            meta: { ...meta, fileId },
+        }, unchainedAPI);
+        if (!assetObject)
+            throw new Error('Media not created');
+        return assetObject;
+    }
+    catch (e) {
+        return null;
+    }
+};
+export default upsertAsset;
+//# sourceMappingURL=upsertAsset.js.map

package/lib/bulk-importer/upsertAsset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upsertAsset.js","sourceRoot":"","sources":["../../src/bulk-importer/upsertAsset.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,GAAG,KAAK,EACvB,aAAqB,EACrB,KAAqE,EACrE,YAA2B,EAC3B,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;IAC3C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAC;IAE1E,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1E,IAAI,YAAY,EAAE;YAChB,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;gBACjE,OAAO,YAAY,CAAC;aACrB;YACD,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC7D,OAAO,WAAW,CAAC;SACpB;QAED,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CACxD;YACE,aAAa;YACb,SAAS,EAAE;gBACT,QAAQ,EAAE,GAAG;gBACb,QAAQ;gBACR,OAAO;aACR;YACD,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;SAC1B,EACD,YAAY,CACb,CAAC;QAEF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACvD,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/lib/context/setAccessToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"setAccessToken.js","sourceRoot":"","sources":["../../src/context/setAccessToken.ts"],"names":[],"mappings":"AAEA,eAAe,KAAK,EAAE,YAA2B,EAAE,QAAgB,EAAE,MAAc,EAAE,EAAE;IACrF,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CACzC,EAAE,QAAQ,EAAE,EACZ;QACE,IAAI,EAAE;YACJ,gBAAgB,EAAE;gBAChB,MAAM;aACP;SACF;KACK,EACR,EAAE,CACH,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"setAccessToken.js","sourceRoot":"","sources":["../../src/context/setAccessToken.ts"],"names":[],"mappings":"AAEA,eAAe,KAAK,EAAE,YAA2B,EAAE,QAAgB,EAAE,MAAc,EAAiB,EAAE;IACpG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CACzC,EAAE,QAAQ,EAAE,EACZ;QACE,IAAI,EAAE;YACJ,gBAAgB,EAAE;gBAChB,MAAM;aACP;SACF;KACK,EACR,EAAE,CACH,CAAC;AACJ,CAAC,CAAC"}

package/lib/context/withAccessToken.d.ts

@@ -1,2 +1,3 @@
-declare const _default: (fn?: (params: any) => any) => (params: any, unchainedContextFn: any) => Promise<any>;
+import { Context } from '@unchainedshop/types/api';
+declare const _default: (fn?: (context: Context) => any) => any;
 export default _default;

package/lib/context/withAccessToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"withAccessToken.js","sourceRoot":"","sources":["../../src/context/withAccessToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,MAAM,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC;AAElD,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;AAE3C,eAAe,CAAC,EAAE,GAAG,eAAe,EAAE,EAAE;IACtC,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE;QAC1C,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG;YACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,IAAI,EAAE,gBAAgB,CAAC,IAAI;SAC5B,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;YAChE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtE,IAAI,IAAI,KAAK,QAAQ,IAAI,SAAS,EAAE;gBAClC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;oBACzD,QAAQ;iBACT,CAAC,CAAC;gBACH,IAAI,MAAM,IAAI,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EAAE;oBACrD,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;oBAC7B,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;iBACxB;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;iBACnC;aACF;SACF;QACD,OAAO,EAAE,CAAC;YACR,GAAG,gBAAgB;YACnB,GAAG,UAAU;SACd,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"withAccessToken.js","sourceRoot":"","sources":["../../src/context/withAccessToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,MAAM,MAAM,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC;AAElD,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;AAE3C,eAAe,CAAC,KAAgC,eAAe,EAAO,EAAE;IACtE,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE;QAC1C,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG;YACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,IAAI,EAAE,gBAAgB,CAAC,IAAI;SAC5B,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;YAChE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtE,IAAI,IAAI,KAAK,QAAQ,IAAI,SAAS,EAAE;gBAClC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;oBACzD,QAAQ;iBACT,CAAC,CAAC;gBACH,IAAI,MAAM,IAAI,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,EAAE;oBACrD,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;oBAC7B,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;iBACxB;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;iBACnC;aACF;SACF;QACD,OAAO,EAAE,CAAC;YACR,GAAG,gBAAgB;YACnB,GAAG,UAAU;SACd,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/lib/platform-index.d.ts

@@ -1,2 +1,6 @@
 export * from './startPlatform';
 export * from './context';
+declare const connectPlatformToExpress4: (expressApp: import("express").Express, { apolloGraphQLServer }: {
+    apolloGraphQLServer: import("@apollo/server").ApolloServer<import("@apollo/server").BaseContext>;
+}) => void;
+export { connectPlatformToExpress4 };

package/lib/platform-index.js

@@ -1,3 +1,6 @@
+import { express } from '@unchainedshop/api';
 export * from './startPlatform';
 export * from './context';
+const connectPlatformToExpress4 = express.connect;
+export { connectPlatformToExpress4 };
 //# sourceMappingURL=platform-index.js.map

package/lib/platform-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform-index.js","sourceRoot":"","sources":["../src/platform-index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"platform-index.js","sourceRoot":"","sources":["../src/platform-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAE1B,MAAM,yBAAyB,GAAG,OAAO,CAAC,OAAO,CAAC;AAElD,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/lib/setup/setupAccounts.js

@@ -23,7 +23,7 @@ export const setupAccounts = (unchainedAPI) => {
             type: 'MESSAGE',
             retries: 0,
             input,
-        }, undefined);
+        });
     };
     accountsServer.services.guest = {
         async authenticate(params) {
@@ -31,10 +31,8 @@ export const setupAccounts = (unchainedAPI) => {
             const guestUserId = await unchainedAPI.modules.accounts.createUser({
                 email: params.email || `${guestname}@unchained.local`,
                 guest: true,
-                profile: {},
                 password: null,
                 initialPassword: true,
-                lastBillingAddress: {},
             }, {});
             return unchainedAPI.modules.users.findUserById(guestUserId);
         },
@@ -52,6 +50,7 @@ export const setupAccounts = (unchainedAPI) => {
     };
     accountsServer.on('LoginTokenCreated', async (props) => {
         const { userId, connection = {} } = props;
+        // TODO: Doubt that there is countryContext etc. here?
         const { userIdBeforeLogin, countryContext, remoteAddress, remotePort, userAgent, normalizedLocale } = connection;
         await unchainedAPI.modules.users.updateHeartbeat(userId, {
             remoteAddress,