@unchainedshop/core-users 3.0.0-alpha6 → 3.0.0-rc1

package/lib/types.d.ts

@@ -1,4 +1,5 @@
-import type { TimestampFields, Address, Contact, mongodb } from '@unchainedshop/mongodb';
+import { TimestampFields, Address, Contact, mongodb } from '@unchainedshop/mongodb';
+import { DateFilterInput } from '@unchainedshop/utils';
 export interface PushSubscription {
     _id: string;
     userAgent: string;
@@ -47,7 +48,7 @@ export interface PushSubscriptionObject {
     };
 }
 export type User = {
-    _id?: string;
+    _id: string;
     deleted?: Date;
     avatarId?: string;
     emails: Array<Email>;
@@ -67,6 +68,8 @@ export type User = {
 export type UserQuery = mongodb.Filter<User> & {
     includeGuests?: boolean;
     queryString?: string;
+    emailVerified?: boolean;
+    lastLogin?: DateFilterInput;
 };
 export interface WebAuthnCredentialsCreationRequest {
     challenge: string;

package/lib/types.d.ts.map

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

package/lib/users-index.d.ts

@@ -1,5 +1,4 @@
 export * from './types.js';
 export * from './module/configureUsersModule.js';
-export * from './services/userServices.js';
 export * from './users-settings.js';
 //# sourceMappingURL=users-index.d.ts.map

package/lib/users-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users-index.d.ts","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"users-index.d.ts","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kCAAkC,CAAC;AACjD,cAAc,qBAAqB,CAAC"}

package/lib/users-index.js

@@ -1,5 +1,4 @@
 export * from './types.js';
 export * from './module/configureUsersModule.js';
-export * from './services/userServices.js';
 export * from './users-settings.js';
 //# sourceMappingURL=users-index.js.map

package/lib/users-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"users-index.js","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"users-index.js","sourceRoot":"","sources":["../src/users-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kCAAkC,CAAC;AACjD,cAAc,qBAAqB,CAAC"}

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@unchainedshop/core-users",
-  "version": "3.0.0-alpha6",
+  "version": "3.0.0-rc1",
   "main": "lib/users-index.js",
-  "exports": {
-    ".": "./lib/users-index.js",
-    "./*": "./lib/*"
-  },
   "types": "lib/users-index.d.ts",
   "type": "module",
   "scripts": {
-    "clean": "rm -rf lib",
-    "prepublishOnly": "npm run clean && tsc",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b",
+    "prepublishOnly": "npm run clean && npm run build",
     "watch": "tsc -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
@@ -31,19 +28,19 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^3.0.0-alpha4",
-    "@unchainedshop/file-upload": "^3.0.0-alpha4",
-    "@unchainedshop/logger": "^3.0.0-alpha4",
-    "@unchainedshop/roles": "^3.0.0-alpha4",
-    "@unchainedshop/utils": "^3.0.0-alpha4",
-    "bcryptjs": "^2.4.3",
-    "fido2-lib": "^3.5.3",
-    "uuid": "^10.0.0"
+    "@node-rs/bcrypt": "^1.10.7",
+    "@unchainedshop/events": "^3.0.0-rc1",
+    "@unchainedshop/file-upload": "^3.0.0-rc1",
+    "@unchainedshop/logger": "^3.0.0-rc1",
+    "@unchainedshop/mongodb": "^3.0.0-rc1",
+    "@unchainedshop/roles": "^3.0.0-rc1",
+    "@unchainedshop/utils": "^3.0.0-rc1",
+    "fido2-lib": "^3.5.3"
   },
   "devDependencies": {
-    "@types/node": "^22.8.1",
+    "@types/node": "^22.10.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }

package/src/module/configureUsersModule.ts

@@ -1,5 +1,5 @@
-import bcrypt from 'bcryptjs';
-import { ModuleInput } from '@unchainedshop/mongodb';
+import bcrypt from '@node-rs/bcrypt';
+import { ModuleInput, Address, Contact } from '@unchainedshop/mongodb';
 import { User, UserQuery, Email, UserLastLogin, UserProfile, UserData } from '../types.js';
 import { emit, registerEvents } from '@unchainedshop/events';
 import {
@@ -8,18 +8,12 @@ import {
   mongodb,
   generateDbObjectId,
 } from '@unchainedshop/mongodb';
-import { systemLocale } from '@unchainedshop/utils';
-import { FileDirector } from '@unchainedshop/file-upload';
-import { SortDirection, SortOption } from '@unchainedshop/utils';
+import { systemLocale, SortDirection, SortOption, sha256 } from '@unchainedshop/utils';
 import { UsersCollection } from '../db/UsersCollection.js';
 import addMigrations from './addMigrations.js';
 import { userSettings, UserSettingsOptions } from '../users-settings.js';
 import { configureUsersWebAuthnModule, UsersWebAuthnModule } from './configureUsersWebAuthnModule.js';
 import * as pbkdf2 from './pbkdf2.js';
-import * as sha256 from './sha256.js';
-import type { Address, Contact } from '@unchainedshop/mongodb';
-import { UserServices } from '../services/userServices.js';
-import { FileServices, FilesModule } from '@unchainedshop/core-files';
 
 export type UsersModule = {
   // Submodules
@@ -76,7 +70,8 @@ export type UsersModule = {
     _id: string,
     { profile, meta }: { profile?: UserProfile; meta?: any },
   ) => Promise<User>;
-  delete: (userId: string) => Promise<User>;
+  markDeleted: (userId: string) => Promise<User>;
+  deletePermanently: (params: { userId: string }) => Promise<User>;
   updateRoles: (_id: string, roles: Array<string>) => Promise<User>;
   updateTags: (_id: string, tags: Array<string>) => Promise<User>;
   updateUser: (
@@ -93,6 +88,9 @@ export type UsersModule = {
     },
   ) => Promise<void>;
   removePushSubscription: (userId: string, p256dh: string) => Promise<void>;
+  hashPassword(password: string): Promise<{
+    pbkdf2: string;
+  }>;
 };
 
 const USER_EVENTS = [
@@ -118,36 +116,44 @@ export const removeConfidentialServiceHashes = (rawUser: User): User => {
   return user;
 };
 
-export const buildFindSelector = ({ includeGuests, queryString, ...rest }: UserQuery) => {
+export const buildFindSelector = ({
+  includeGuests,
+  queryString,
+  emailVerified,
+  lastLogin,
+  ...rest
+}: UserQuery) => {
   const selector: mongodb.Filter<User> = { ...rest, deleted: null };
   if (!includeGuests) selector.guest = { $in: [false, null] };
+  if (emailVerified === true) {
+    selector['emails.verified'] = true;
+  }
+  if (emailVerified === false) {
+    // We need to use $ne here else we'd also find users with many emails where one is
+    // unverified
+    selector['emails.verified'] = { $ne: true };
+  }
+  if (lastLogin?.start) {
+    selector['lastLogin.timestamp'] = { $exists: true };
+  }
+  if (lastLogin?.end) {
+    selector['lastLogin.timestamp'].$lte = new Date(lastLogin.end);
+  }
+  if (lastLogin?.start) {
+    selector['lastLogin.timestamp'].$gte = new Date(lastLogin.start);
+  }
   if (queryString) {
     (selector as any).$text = { $search: queryString };
   }
   return selector;
 };
 
-FileDirector.registerFileUploadCallback<{
-  services: {
-    users: UserServices;
-    files: FileServices;
-  };
-  modules: {
-    users: UsersModule;
-    files: FilesModule;
-  };
-}>('user-avatars', async (file, context) => {
-  const { services } = context;
-  return services.users.updateUserAvatarAfterUpload({ file }, context);
-});
-
 export const configureUsersModule = async ({
   db,
   options,
   migrationRepository,
-}: ModuleInput<UserSettingsOptions>) => {
+}: ModuleInput<UserSettingsOptions>): Promise<UsersModule> => {
   userSettings.configureSettings(options || {}, db);
-
   registerEvents(USER_EVENTS);
   const Users = await UsersCollection(db);
 
@@ -185,13 +191,13 @@ export const configureUsersModule = async ({
       when: Date;
     }> {
       if (!plainToken) return null;
-      const token = await sha256.hash(plainToken);
+      const token = await sha256(plainToken);
       const user = await Users.findOne(
         {
           'services.email.verificationTokens': {
             $elemMatch: {
               token,
-              when: { $gt: new Date().getTime() },
+              when: { $gt: new Date(new Date().getTime() - 1000 * 60 * 60) },
             },
           },
         },
@@ -231,13 +237,13 @@ export const configureUsersModule = async ({
     },
 
     async findUserByResetToken(plainToken: string): Promise<User> {
-      const token = await sha256.hash(plainToken);
+      const token = await sha256(plainToken);
       const user = await Users.findOne(
         {
           'services.password.reset': {
             $elemMatch: {
               token,
-              when: { $gt: new Date().getTime() },
+              when: { $gt: new Date(new Date().getTime() - 1000 * 60 * 60) },
             },
           },
         },
@@ -247,7 +253,7 @@ export const configureUsersModule = async ({
     },
 
     async findUserByToken(plainToken?: string): Promise<User> {
-      const token = await sha256.hash(plainToken);
+      const token = await sha256(plainToken);
 
       if (token) {
         return Users.findOne({
@@ -276,7 +282,7 @@ export const configureUsersModule = async ({
       offset?: number;
     }): Promise<Array<User>> {
       const defaultSort = [{ key: 'created', value: SortDirection.ASC }] as SortOption[];
-      const selector = buildFindSelector(query);
+      const selector = buildFindSelector({ ...query });
 
       if (query.queryString) {
         return Users.find(selector, {
@@ -295,9 +301,7 @@ export const configureUsersModule = async ({
     },
 
     async userExists({ userId }: { userId: string }): Promise<boolean> {
-      const selector = generateDbFilterById<User>(userId);
-      selector.deleted = null; // skip deleted users when checked for existance!
-      const userCount = await Users.countDocuments(selector, { limit: 1 });
+      const userCount = await Users.countDocuments({ _id: userId, deleted: null }, { limit: 1 });
       return userCount === 1;
     },
 
@@ -359,6 +363,7 @@ export const configureUsersModule = async ({
         _id: normalizedUserData._id || generateDbObjectId(),
         roles: roles || [],
         initialPassword: Boolean(initialPassword),
+        services,
         emails: email ? [{ address: email, verified: false }] : [],
         created: new Date(),
       };
@@ -409,7 +414,7 @@ export const configureUsersModule = async ({
       plainPassword: string,
     ): Promise<boolean> {
       if (bcryptHash) {
-        const password = await sha256.hash(plainPassword);
+        const password = await sha256(plainPassword);
         return bcrypt.compare(password, bcryptHash);
       }
       if (pbkdf2SaltAndHash) {
@@ -450,9 +455,9 @@ export const configureUsersModule = async ({
     async sendResetPasswordEmail(userId: string, email: string, isEnrollment?: boolean): Promise<void> {
       const plainToken = crypto.randomUUID();
       const resetToken = {
-        token: await sha256.hash(plainToken),
+        token: await sha256(plainToken),
         address: email,
-        when: new Date().getTime() + 1000 * 60 * 60, // 1 hour
+        when: new Date(),
       };
 
       await Users.updateOne(
@@ -475,9 +480,9 @@ export const configureUsersModule = async ({
     async sendVerificationEmail(userId: string, email: string): Promise<void> {
       const plainToken = crypto.randomUUID();
       const verificationToken = {
-        token: await sha256.hash(plainToken),
+        token: await sha256(plainToken),
         address: email,
-        when: new Date().getTime() + 1000 * 60 * 60, // 1 hour
+        when: new Date(),
       };
 
       await Users.updateOne(
@@ -601,42 +606,38 @@ export const configureUsersModule = async ({
       return user;
     },
 
-    delete: async (userId: string): Promise<User> => {
-      const userFilter = generateDbFilterById(userId);
-
-      const existingUser = await Users.findOne(userFilter, {
-        projection: { emails: true, username: true },
-      });
-      if (!existingUser) return null;
-
-      const uuid = crypto.randomUUID();
-      const obfuscatedEmails = existingUser.emails?.flatMap(({ address, verified }) => {
-        if (!verified) return [];
-        return [
-          {
-            address: `${address}@${uuid}.unchained.local`,
-            verified: true,
+    markDeleted: async (userId: string): Promise<User> => {
+      const user = await Users.findOneAndUpdate(
+        { _id: userId },
+        {
+          $set: {
+            username: `deleted-${Date.now()}`,
+            deleted: new Date(),
+            emails: [],
+            roles: [],
+            profile: null,
+            lastBillingAddress: null,
+            services: {},
+            pushSubscriptions: [],
+            avatarId: null,
+            initialPassword: false,
+            lastContact: null,
+            lastLogin: null,
           },
-        ];
-      });
-
-      const obfuscatedUsername = existingUser.username ? `${existingUser.username}-${uuid}` : null;
-
-      Users.updateOne(userFilter, {
-        $set: {
-          emails: obfuscatedEmails,
-          username: obfuscatedUsername,
-          services: {},
         },
-      });
+        { returnDocument: 'after' },
+      );
 
-      const user = await Users.findOneAndDelete(userFilter);
       await emit('USER_REMOVE', {
-        user: removeConfidentialServiceHashes(user),
+        user,
       });
       return user;
     },
 
+    deletePermanently: async ({ userId }: { userId: string }): Promise<User> => {
+      return Users.findOneAndDelete({ _id: userId });
+    },
+
     updateProfile: async (
       userId: string,
       updatedData: { profile?: UserProfile; meta?: any },
@@ -679,6 +680,8 @@ export const configureUsersModule = async ({
       const userFilter = generateDbFilterById(_id);
       const user = await Users.findOne(userFilter, {});
 
+      if (!lastBillingAddress) return user;
+
       const modifier = {
         $set: {
           lastBillingAddress,
@@ -701,9 +704,12 @@ export const configureUsersModule = async ({
         returnDocument: 'after',
       });
 
-      await emit('USER_UPDATE_BILLING_ADDRESS', {
-        user: removeConfidentialServiceHashes(user),
-      });
+      if (updatedUser) {
+        await emit('USER_UPDATE_BILLING_ADDRESS', {
+          user: removeConfidentialServiceHashes(updatedUser),
+        });
+      }
+
       return updatedUser;
     },
 

package/src/module/configureUsersWebAuthnModule.ts

@@ -1,4 +1,3 @@
-/// <reference lib="dom" />
 import { ModuleInput } from '@unchainedshop/mongodb';
 import {
   Fido2Lib,

package/src/types.ts

@@ -1,4 +1,5 @@
-import type { TimestampFields, Address, Contact, mongodb } from '@unchainedshop/mongodb';
+import { TimestampFields, Address, Contact, mongodb } from '@unchainedshop/mongodb';
+import { DateFilterInput } from '@unchainedshop/utils';
 
 export interface PushSubscription {
   _id: string;
@@ -55,7 +56,7 @@ export interface PushSubscriptionObject {
 }
 
 export type User = {
-  _id?: string;
+  _id: string;
   deleted?: Date;
   avatarId?: string;
   emails: Array<Email>;
@@ -76,6 +77,8 @@ export type User = {
 export type UserQuery = mongodb.Filter<User> & {
   includeGuests?: boolean;
   queryString?: string;
+  emailVerified?: boolean;
+  lastLogin?: DateFilterInput;
 };
 
 export interface WebAuthnCredentialsCreationRequest {

package/src/users-index.ts

@@ -1,4 +1,3 @@
 export * from './types.js';
 export * from './module/configureUsersModule.js';
-export * from './services/userServices.js';
 export * from './users-settings.js';

package/tests/mock/user-mock.ts

@@ -2,7 +2,7 @@ export default {
   _id: 'PKve0k9fLCUzn2EUi',
   guest: false,
   initialPassword: false,
-  lastBillingAddress: {},
+  lastBillingAddress: null,
   profile: {
     address: {
       firstName: null,
@@ -65,9 +65,8 @@ export default {
     remotePort: '42978',
     userAgent:
       'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36',
-    locale: 'de_CH',
+    locale: 'de-CH',
     countryCode: 'CH',
   },
   updated: new Date('2022-11-30T11:02:19.624Z'),
-  updatedBy: 'PKve0k9fLCUzn2EUi',
 };

package/tsconfig.json

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

package/lib/services/migrateUserDataService.d.ts

@@ -1,4 +0,0 @@
-import { UnchainedCore } from '@unchainedshop/core';
-export type MigrateUserDataService = (userIdBeforeLogin: any, userId: any, unchainedAPI: UnchainedCore) => Promise<void>;
-export declare const migrateUserDataService: MigrateUserDataService;
-//# sourceMappingURL=migrateUserDataService.d.ts.map

package/lib/services/migrateUserDataService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"migrateUserDataService.d.ts","sourceRoot":"","sources":["../../src/services/migrateUserDataService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,MAAM,sBAAsB,GAAG,CACnC,iBAAiB,KAAA,EACjB,MAAM,KAAA,EACN,YAAY,EAAE,aAAa,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,eAAO,MAAM,sBAAsB,EAAE,sBA2BpC,CAAC"}

package/lib/services/migrateUserDataService.js

@@ -1,18 +0,0 @@
-import { userSettings } from '../users-settings.js';
-export const migrateUserDataService = async (userIdBeforeLogin, userId, unchainedAPI) => {
-    const user = await unchainedAPI.modules.users.findUserById(userId);
-    const userBeforeLogin = await unchainedAPI.modules.users.findUserById(userIdBeforeLogin);
-    await unchainedAPI.services.orders.migrateOrderCarts({
-        fromUserId: userIdBeforeLogin,
-        toUserId: userId,
-        shouldMerge: userSettings.mergeUserCartsOnLogin,
-        countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
-    }, unchainedAPI);
-    await unchainedAPI.services.bookmarks.migrateBookmarks({
-        fromUserId: userIdBeforeLogin,
-        toUserId: userId,
-        shouldMerge: userSettings.mergeUserCartsOnLogin,
-        countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
-    }, unchainedAPI);
-};
-//# sourceMappingURL=migrateUserDataService.js.map

package/lib/services/migrateUserDataService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"migrateUserDataService.js","sourceRoot":"","sources":["../../src/services/migrateUserDataService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,EACjE,iBAAiB,EACjB,MAAM,EACN,YAAY,EACZ,EAAE;IACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,eAAe,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEzF,MAAM,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAClD;QACE,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,cAAc,EAAE,eAAe,CAAC,SAAS,EAAE,WAAW,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW;KACtF,EACD,YAAY,CACb,CAAC;IAEF,MAAM,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CACpD;QACE,UAAU,EAAE,iBAAiB;QAC7B,QAAQ,EAAE,MAAM;QAChB,WAAW,EAAE,YAAY,CAAC,qBAAqB;QAC/C,cAAc,EAAE,eAAe,CAAC,SAAS,EAAE,WAAW,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW;KACtF,EACD,YAAY,CACb,CAAC;AACJ,CAAC,CAAC"}

package/lib/services/updateUserAvatarAfterUploadService.d.ts

@@ -1,15 +0,0 @@
-import { File, FileServices, FilesModule } from '@unchainedshop/core-files';
-import { UsersModule } from '../users-index.js';
-export type UpdateUserAvatarAfterUploadService = (params: {
-    file: File;
-}, context: {
-    modules: {
-        files: FilesModule;
-        users: UsersModule;
-    };
-    services: {
-        files: FileServices;
-    };
-}) => Promise<void>;
-export declare const updateUserAvatarAfterUploadService: UpdateUserAvatarAfterUploadService;
-//# sourceMappingURL=updateUserAvatarAfterUploadService.d.ts.map

package/lib/services/updateUserAvatarAfterUploadService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateUserAvatarAfterUploadService.d.ts","sourceRoot":"","sources":["../../src/services/updateUserAvatarAfterUploadService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,kCAAkC,GAAG,CAC/C,MAAM,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,EACtB,OAAO,EAAE;IACP,OAAO,EAAE;QAAE,KAAK,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,WAAW,CAAA;KAAE,CAAC;IACpD,QAAQ,EAAE;QAAE,KAAK,EAAE,YAAY,CAAA;KAAE,CAAC;CACnC,KACE,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,eAAO,MAAM,kCAAkC,EAAE,kCA6BhD,CAAC"}

package/lib/services/updateUserAvatarAfterUploadService.js

@@ -1,24 +0,0 @@
-import { log, LogLevel } from '@unchainedshop/logger';
-export const updateUserAvatarAfterUploadService = async ({ file }, context) => {
-    const { modules, services } = context;
-    const { userId } = file.meta;
-    const files = await modules.files.findFiles({
-        _id: { $ne: file._id },
-        path: file.path,
-        'meta.userId': userId,
-    });
-    const fileIds = files.map((f) => f._id);
-    try {
-        if (fileIds?.length) {
-            await services.files.removeFiles({
-                fileIds,
-            }, context);
-        }
-    }
-    catch (e) {
-        // cleanup error, not critical
-        log(`could not clean up all old avatars: ${e.message}`, { level: LogLevel.Warning });
-    }
-    await modules.users.updateAvatar(userId, file._id);
-};
-//# sourceMappingURL=updateUserAvatarAfterUploadService.js.map

package/lib/services/updateUserAvatarAfterUploadService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateUserAvatarAfterUploadService.js","sourceRoot":"","sources":["../../src/services/updateUserAvatarAfterUploadService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAWtD,MAAM,CAAC,MAAM,kCAAkC,GAAuC,KAAK,EACzF,EAAE,IAAI,EAAE,EACR,OAAO,EACP,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAA0B,CAAC;IAEnD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;QAC1C,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE;QACtB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,aAAa,EAAE,MAAM;KACtB,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAExC,IAAI,CAAC;QACH,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,CAC9B;gBACE,OAAO;aACR,EACD,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,8BAA8B;QAC9B,GAAG,CAAC,uCAAwC,CAAW,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AACrD,CAAC,CAAC"}

package/lib/services/userServices.d.ts

@@ -1,8 +0,0 @@
-import { UpdateUserAvatarAfterUploadService } from './updateUserAvatarAfterUploadService.js';
-import { MigrateUserDataService } from './migrateUserDataService.js';
-export interface UserServices {
-    updateUserAvatarAfterUpload: UpdateUserAvatarAfterUploadService;
-    migrateUserData: MigrateUserDataService;
-}
-export declare const userServices: UserServices;
-//# sourceMappingURL=userServices.d.ts.map

package/lib/services/userServices.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"userServices.d.ts","sourceRoot":"","sources":["../../src/services/userServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kCAAkC,EACnC,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAA0B,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAE7F,MAAM,WAAW,YAAY;IAC3B,2BAA2B,EAAE,kCAAkC,CAAC;IAChE,eAAe,EAAE,sBAAsB,CAAC;CACzC;AAED,eAAO,MAAM,YAAY,EAAE,YAG1B,CAAC"}

package/lib/services/userServices.js

@@ -1,7 +0,0 @@
-import { updateUserAvatarAfterUploadService, } from './updateUserAvatarAfterUploadService.js';
-import { migrateUserDataService } from './migrateUserDataService.js';
-export const userServices = {
-    updateUserAvatarAfterUpload: updateUserAvatarAfterUploadService,
-    migrateUserData: migrateUserDataService,
-};
-//# sourceMappingURL=userServices.js.map

package/lib/services/userServices.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"userServices.js","sourceRoot":"","sources":["../../src/services/userServices.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,GAEnC,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,sBAAsB,EAA0B,MAAM,6BAA6B,CAAC;AAO7F,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,2BAA2B,EAAE,kCAAkC;IAC/D,eAAe,EAAE,sBAAsB;CACxC,CAAC"}

package/src/module/sha256.ts

@@ -1,5 +0,0 @@
-export const hash = async (message) => {
-  const bytes = new TextEncoder().encode(message);
-  const hashBuffer = await crypto.subtle.digest('SHA-256', bytes);
-  return Buffer.from(hashBuffer).toString('hex');
-};

package/src/services/migrateUserDataService.ts

@@ -1,37 +0,0 @@
-import { UnchainedCore } from '@unchainedshop/core';
-import { userSettings } from '../users-settings.js';
-
-export type MigrateUserDataService = (
-  userIdBeforeLogin,
-  userId,
-  unchainedAPI: UnchainedCore,
-) => Promise<void>;
-
-export const migrateUserDataService: MigrateUserDataService = async (
-  userIdBeforeLogin,
-  userId,
-  unchainedAPI,
-) => {
-  const user = await unchainedAPI.modules.users.findUserById(userId);
-  const userBeforeLogin = await unchainedAPI.modules.users.findUserById(userIdBeforeLogin);
-
-  await unchainedAPI.services.orders.migrateOrderCarts(
-    {
-      fromUserId: userIdBeforeLogin,
-      toUserId: userId,
-      shouldMerge: userSettings.mergeUserCartsOnLogin,
-      countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
-    },
-    unchainedAPI,
-  );
-
-  await unchainedAPI.services.bookmarks.migrateBookmarks(
-    {
-      fromUserId: userIdBeforeLogin,
-      toUserId: userId,
-      shouldMerge: userSettings.mergeUserCartsOnLogin,
-      countryContext: userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
-    },
-    unchainedAPI,
-  );
-};