@unchainedshop/core 3.0.0-rc9 → 3.0.1

package/src/directors/WarehousingAdapter.ts

@@ -1,5 +1,4 @@
-import { log, LogLevel } from '@unchainedshop/logger';
-import { IBaseAdapter } from '@unchainedshop/utils';
+import { BaseAdapter, IBaseAdapter } from '@unchainedshop/utils';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { Product } from '@unchainedshop/core-products';
 import { Order, OrderPosition } from '@unchainedshop/core-orders';
@@ -48,6 +47,7 @@ export type IWarehousingAdapter = IBaseAdapter & {
 };
 
 export const WarehousingAdapter: Omit<IWarehousingAdapter, 'key' | 'label' | 'version'> = {
+  ...BaseAdapter,
   orderIndex: 0,
 
   typeSupported: () => {
@@ -75,9 +75,4 @@ export const WarehousingAdapter: Omit<IWarehousingAdapter, 'key' | 'label' | 've
       isInvalidateable: async () => true,
     };
   },
-
-  log(message, { level = LogLevel.Debug, ...options } = {}) {
-    // eslint-disable-line
-    return log(message, { level, ...options });
-  },
 };

package/src/directors/WorkerAdapter.ts

@@ -1,5 +1,4 @@
-import { log, LogLevel } from '@unchainedshop/logger';
-import { IBaseAdapter } from '@unchainedshop/utils';
+import { BaseAdapter, IBaseAdapter } from '@unchainedshop/utils';
 import { WorkResult } from '@unchainedshop/core-worker';
 import { Modules } from '../modules.js';
 import { Services } from '../services/index.js';
@@ -18,13 +17,10 @@ export type IWorkerAdapter<Input, Output> = IBaseAdapter & {
 };
 
 export const WorkerAdapter: Omit<IWorkerAdapter<any, void>, 'key' | 'label' | 'type' | 'version'> = {
+  ...BaseAdapter,
   external: false,
 
   async doWork() {
     return { success: false, result: null };
   },
-
-  log(message: string, { level = LogLevel.Debug, ...options } = {}) {
-    return log(message, { level, ...options });
-  },
 };

package/src/directors/WorkerDirector.ts

@@ -73,14 +73,10 @@ export const WorkerDirector: IWorkerDirector = {
   },
 
   configureAutoscheduling: (workItemConfiguration) => {
-    const adapter = WorkerDirector.getAdapterByType(workItemConfiguration.type);
     AutoScheduleMap.set(
       workItemConfiguration.scheduleId || workItemConfiguration.type,
       workItemConfiguration,
     );
-    logger.info(
-      `WorkerDirector -> Configured ${adapter.type} ${adapter.key}@${adapter.version} (${adapter.label}) for Autorun at ${JSON.stringify(workItemConfiguration.schedule?.schedules)}`,
-    );
   },
 
   getAutoSchedules: () => Array.from(AutoScheduleMap),
@@ -98,7 +94,7 @@ export const WorkerDirector: IWorkerDirector = {
     const adapter = WorkerDirector.getAdapterByType(type);
 
     if (!adapter) {
-      logger.info(`WorkerDirector: No registered adapter for type: ${type}`);
+      logger.warn(`WorkerDirector: No registered adapter for type: ${type}`);
     }
 
     try {
@@ -107,7 +103,7 @@ export const WorkerDirector: IWorkerDirector = {
     } catch (error) {
       // DO not use this as flow control. The adapter should catch expected errors and return status: FAILED
       logger.debug('DO not use this as flow control.');
-      logger.info(`WorkerDirector -> Error doing work ${type}: ${error.message}`);
+      logger.error(`WorkerDirector -> Error doing work ${type}: ${error.message}`);
 
       const errorOutput = { error, success: false };
       return errorOutput;

package/src/services/deleteUser.ts

@@ -8,6 +8,8 @@ export async function deleteUserService(this: Modules, { userId }: { userId: str
   await this.bookmarks.deleteByUserId(userId);
   await this.quotations.deleteRequestedUserQuotations(userId);
   await this.enrollments.deleteInactiveUserEnrollments(userId);
+  await this.payment.paymentCredentials.deleteUserPaymentCredentials(userId);
+  await this.users.webAuthn.deleteUserWebAuthnCredentials(user.username);
 
   const carts = await this.orders.findOrders({ userId, status: null });
 
@@ -24,8 +26,16 @@ export async function deleteUserService(this: Modules, { userId }: { userId: str
   const reviewsCount = await this.products.reviews.count({ authorId: userId });
   const enrollmentsCount = await this.enrollments.count({ userId });
   const tokens = await this.warehousing.findTokensForUser({ userId });
-
-  if (!ordersCount && !reviewsCount && !enrollmentsCount && !quotationsCount && !tokens?.length) {
+  const paymentCredentials = await this.payment.paymentCredentials.count({ userId });
+
+  if (
+    !ordersCount &&
+    !reviewsCount &&
+    !enrollmentsCount &&
+    !quotationsCount &&
+    !tokens?.length &&
+    !paymentCredentials
+  ) {
     await this.users.deletePermanently({ userId });
   }
 

package/src/services/index.ts

@@ -45,7 +45,7 @@ import { simulateProductDispatchingService } from './simulateProductDispatching.
 import { simulateProductInventoryService } from './simulateProductInventory.js';
 import { findOrInitCartService } from './findOrInitCart.js';
 
-// TODO: Auto-Inject Unchained API as last parameter
+// Auto-Inject Unchained API as last parameter
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy
 
 function bindMethodsToModules(modules: Modules) {
@@ -63,15 +63,14 @@ function bindMethodsToModules(modules: Modules) {
 }
 
 export interface ServiceInterface {
-  (this: Modules, ...args: any[]): any;
+  (this: Modules, ...args: any[]): Promise<any> | any;
 }
 
 export type Bound<T extends ServiceInterface> = OmitThisParameter<T>;
 
-export default function initServices(
-  modules: Modules,
-  customServices: Record<string, ServiceInterface> = {},
-) {
+export type CustomServices = Record<string, ServiceInterface | Record<string, ServiceInterface>>;
+
+export default function initServices(modules: Modules, customServices: CustomServices = {}) {
   const services = {
     bookmarks: {
       migrateBookmarks: migrateBookmarksService as Bound<typeof migrateBookmarksService>,

package/src/services/linkFileService.ts

@@ -3,15 +3,15 @@ import { Modules } from '../modules.js';
 
 export async function linkFileService(
   this: Modules,
-  { fileId, size, type }: { fileId: string; size: number; type?: string },
+  { fileId, size, type }: { fileId: string; size?: number; type?: string },
 ) {
   const file = await this.files.findFile({ fileId });
+  await this.files.update(file._id, {
+    size: size || file.size,
+    type: type || file.type,
+    expires: null,
+  });
   if (file?.expires) {
-    await this.files.update(file._id, {
-      size: size || file.size,
-      type: type || file.type,
-      expires: null,
-    });
     const callback = FileDirector.getFileUploadCallback(file.path);
     if (callback) {
       await callback(file, { modules: this });

package/src/services/migrateUserData.ts

@@ -10,13 +10,13 @@ export async function migrateUserDataService(userIdBeforeLogin: string, userId:
     fromUserId: userIdBeforeLogin,
     toUserId: userId,
     shouldMerge: userSettings.mergeUserCartsOnLogin,
-    countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
+    countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
   });
 
   await migrateBookmarksService.bind(this)({
     fromUserId: userIdBeforeLogin,
     toUserId: userId,
     shouldMerge: userSettings.mergeUserCartsOnLogin,
-    countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
+    countryContext: userBeforeLogin?.lastLogin?.countryCode || user?.lastLogin?.countryCode,
   });
 }