@unchainedshop/core-users 4.0.0-rc.2 → 4.0.0-rc.21

package/src/module/pbkdf2.ts

@@ -5,7 +5,11 @@ const PBKDF2_SALT_LENGTH = 16; // Bytes
 
 export function generateSalt(saltLength = PBKDF2_SALT_LENGTH) {
   const array = new Uint8Array(saltLength);
-  return Buffer.from(crypto.getRandomValues(array)).toString('hex');
+  crypto.getRandomValues(array);
+  // Convert to hex string without using Buffer
+  return Array.from(array)
+    .map((b) => b.toString(16).padStart(2, '0'))
+    .join('');
 }
 
 export async function getDerivedKey(
@@ -30,7 +34,10 @@ export async function getDerivedKey(
     importedKey,
     keyLength,
   );
-  return Buffer.from(bits).toString('hex');
+  // Convert ArrayBuffer to hex string without using Buffer
+  return Array.from(new Uint8Array(bits))
+    .map((b) => b.toString(16).padStart(2, '0'))
+    .join('');
 }
 
 export async function compare(password: string, hash: string, salt: string) {

package/src/module/removeConfidentialServiceHashes.test.ts

@@ -7,7 +7,6 @@ import { User } from '../db/UsersCollection.js';
 describe('removeConfidentialServiceHashes', () => {
   it('Should remove sensitive user credentials ', () => {
     assert.notStrictEqual(user.services, undefined);
-    removeConfidentialServiceHashes(user as unknown as User);
-    assert.strictEqual(user.services, undefined);
+    assert.strictEqual(removeConfidentialServiceHashes(user as unknown as User)?.services, undefined);
   });
 });

package/src/users-settings.ts

@@ -1,22 +1,24 @@
 import { insensitiveTrimmedRegexOperator, mongodb } from '@unchainedshop/mongodb';
 import { User } from './db/UsersCollection.js';
-
 export interface UserRegistrationData extends Partial<User> {
   email?: string;
   password: string | null;
   webAuthnPublicKeyCredentials?: any;
 }
-export interface UserSettingsOptions {
-  mergeUserCartsOnLogin?: boolean;
-  autoMessagingAfterUserCreation?: boolean;
-  validateEmail?: (email: string) => Promise<boolean>;
-  validateUsername?: (username: string) => Promise<boolean>;
-  validateNewUser?: (user: UserRegistrationData) => Promise<UserRegistrationData>;
-  validatePassword?: (password: string) => Promise<boolean>;
+
+export enum UserAccountAction {
+  RESET_PASSWORD = 'reset-password',
+  VERIFY_EMAIL = 'verify-email',
+  ENROLL_ACCOUNT = 'enroll-account',
+  PASSWORD_RESETTED = 'password-resetted',
+  EMAIL_VERIFIED = 'email-verified',
 }
 export interface UserSettings {
   mergeUserCartsOnLogin: boolean;
   autoMessagingAfterUserCreation: boolean;
+  earliestValidTokenDate: (
+    type: UserAccountAction.VERIFY_EMAIL | UserAccountAction.RESET_PASSWORD,
+  ) => Date;
   validateEmail: (email: string) => Promise<boolean>;
   validateUsername: (username: string) => Promise<boolean>;
   validateNewUser: (user: UserRegistrationData) => Promise<UserRegistrationData>;
@@ -24,28 +26,50 @@ export interface UserSettings {
   configureSettings: (options: UserSettingsOptions, db: mongodb.Db) => void;
 }
 
+export type UserSettingsOptions = Omit<Partial<UserSettings>, 'configureSettings'>;
+
+const defaultAutoMessagingAfterUserCreation = true;
+const defaultMergeUserCartsOnLogin = true;
+
+const defaultEarliestValidTokenDate = () => {
+  // 1 hour ago
+  return new Date(new Date().getTime() - 1000 * 60 * 60);
+};
+
+const defaultValidateNewUser = async (user: UserRegistrationData) => {
+  return {
+    ...user,
+    username: user.username?.trim().toLowerCase(),
+    email: user.email?.trim().toLowerCase(),
+    password: user.password ?? null,
+  };
+};
+
+const defaultValidatePassword = async (password: string) => {
+  return password?.length >= 8;
+};
+
 export const userSettings: UserSettings = {
-  autoMessagingAfterUserCreation: null,
-  mergeUserCartsOnLogin: null,
-  validateEmail: null,
-  validateUsername: null,
-  validateNewUser: null,
-  validatePassword: null,
+  autoMessagingAfterUserCreation: defaultAutoMessagingAfterUserCreation,
+  mergeUserCartsOnLogin: defaultMergeUserCartsOnLogin,
+  earliestValidTokenDate: defaultEarliestValidTokenDate,
+  validateNewUser: defaultValidateNewUser,
+  validateEmail: () => Promise.resolve(true),
+  validateUsername: () => Promise.resolve(true),
+  validatePassword: () => Promise.resolve(true),
 
   configureSettings: (
     {
       mergeUserCartsOnLogin,
       autoMessagingAfterUserCreation,
+      earliestValidTokenDate,
       validateEmail,
       validateUsername,
       validateNewUser,
       validatePassword,
-    }: UserSettingsOptions,
+    },
     db: mongodb.Db,
   ) => {
-    const defaultAutoMessagingAfterUserCreation = true;
-    const defaultMergeUserCartsOnLogin = true;
-
     const defaultValidateEmail = async (rawEmail: string) => {
       if (!rawEmail?.includes?.('@')) return false;
       const emailAlreadyExists = await db
@@ -62,22 +86,11 @@ export const userSettings: UserSettings = {
       if (usernameAlreadyExists) return false;
       return true;
     };
-    const defaultValidateNewUser = async (user: UserRegistrationData) => {
-      return {
-        ...user,
-        username: user.username?.trim().toLowerCase(),
-        email: user.email?.trim().toLowerCase(),
-        password: user.password ?? null,
-      };
-    };
-
-    const defaultValidatePassword = async (password: string) => {
-      return password?.length >= 8;
-    };
 
     userSettings.mergeUserCartsOnLogin = mergeUserCartsOnLogin ?? defaultMergeUserCartsOnLogin;
     userSettings.autoMessagingAfterUserCreation =
       autoMessagingAfterUserCreation ?? defaultAutoMessagingAfterUserCreation;
+    userSettings.earliestValidTokenDate = earliestValidTokenDate || defaultEarliestValidTokenDate;
     userSettings.validateEmail = validateEmail || defaultValidateEmail;
     userSettings.validateUsername = validateUsername || defaultValidateUsername;
     userSettings.validateNewUser = validateNewUser || defaultValidateNewUser;

package/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "declarationDir": "./lib",
     "rootDir": "./src",
-    "outDir": "./lib"
+    "outDir": "./lib",
+    
   },
   "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
 }