@unchainedshop/core-users 4.8.4 → 5.0.0-alpha.1

package/lib/db/UsersCollection.d.ts

@@ -45,6 +45,8 @@ export type User = {
     pushSubscriptions: PushSubscriptionObject[];
     username?: string;
     meta?: any;
+    tokenVersion?: number;
+    oidcLogoutAt?: Date;
 } & TimestampFields;
 export interface UserQuery {
     includeGuests?: boolean;

package/lib/module/configureUsersModule.d.ts

@@ -124,6 +124,10 @@ export declare const configureUsersModule: (moduleInput: ModuleInput<UserSetting
     updateLastBillingAddress: (_id: string, lastBillingAddress: Address) => Promise<mongodb.WithId<User> | null>;
     updateLastContact: (_id: string, lastContact: Contact) => Promise<mongodb.WithId<User> | null>;
     updateRoles: (_id: string, roles: string[]) => Promise<mongodb.WithId<User> | null>;
+    incrementTokenVersion: (userId: string) => Promise<{
+        tokenVersion: number;
+    } | null>;
+    updateOidcLogoutAt: (userId: string, date: Date) => Promise<User | null>;
     updateTags: (_id: string, tags: string[]) => Promise<mongodb.WithId<User> | null>;
     updateUser: (selector: mongodb.Filter<User>, modifier: mongodb.UpdateFilter<User>, updateOptions?: mongodb.FindOneAndUpdateOptions) => Promise<mongodb.WithId<User> | null>;
     addPushSubscription: (userId: string, subscription: any, subscriptionOptions?: {

package/lib/module/configureUsersModule.js

@@ -588,9 +588,7 @@ export const configureUsersModule = async (moduleInput) => {
             return user;
         },
         markDeleted: async (userId) => {
-            await db.collection('sessions').deleteMany({
-                session: insensitiveTrimmedRegexOperator(`"user":"${userId}"`),
-            });
+            await Users.updateOne({ _id: userId }, { $inc: { tokenVersion: 1 } });
             const user = await Users.findOneAndUpdate({ _id: userId }, {
                 $set: {
                     username: `deleted-${Date.now()}`,
@@ -723,6 +721,25 @@ export const configureUsersModule = async (moduleInput) => {
             });
             return user;
         },
+        incrementTokenVersion: async (userId) => {
+            const user = await Users.findOneAndUpdate(generateDbFilterById(userId), {
+                $inc: { tokenVersion: 1 },
+                $set: { updated: new Date() },
+            }, { returnDocument: 'after' });
+            if (!user)
+                return null;
+            return { tokenVersion: user.tokenVersion ?? 1 };
+        },
+        updateOidcLogoutAt: async (userId, date) => {
+            const user = await Users.findOneAndUpdate(generateDbFilterById(userId), {
+                $set: {
+                    oidcLogoutAt: date,
+                    updated: new Date(),
+                },
+                $inc: { tokenVersion: 1 },
+            }, { returnDocument: 'after' });
+            return user;
+        },
         updateTags: async (_id, tags) => {
             const user = await Users.findOneAndUpdate(generateDbFilterById(_id), {
                 $set: {

package/lib/module/configureUsersWebAuthnModule.js

@@ -1,7 +1,6 @@
 import { generateDbObjectId } from '@unchainedshop/mongodb';
 import { createLogger } from '@unchainedshop/logger';
-import pMemoize from 'p-memoize';
-import ExpiryMap from 'expiry-map';
+import { memoizeWithTTL } from '@unchainedshop/utils';
 import { server as webauthnServer } from '@passwordless-id/webauthn';
 import { WebAuthnCredentialsCreationRequestsCollection } from "../db/WebAuthnCredentialsCreationRequestsCollection.js";
 const logger = createLogger('unchained:core-users');
@@ -37,8 +36,7 @@ async function fetchMDSEntriesImpl() {
     }
     return cache;
 }
-const mdsCache = new ExpiryMap(ONE_DAY_MS);
-const fetchMDSEntries = pMemoize(fetchMDSEntriesImpl, { cache: mdsCache });
+const fetchMDSEntries = memoizeWithTTL(fetchMDSEntriesImpl, ONE_DAY_MS);
 export function toArrayBuffer(buffer) {
     return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-users",
   "description": "User management module for the Unchained Engine with authentication support",
-  "version": "4.8.4",
+  "version": "5.0.0-alpha.1",
   "main": "lib/users-index.js",
   "types": "lib/users-index.d.ts",
   "type": "module",
@@ -36,15 +36,12 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@passwordless-id/webauthn": "^2.3.1",
-    "@unchainedshop/events": "^4.6.0",
-    "@unchainedshop/file-upload": "^4.6.0",
-    "@unchainedshop/logger": "^4.6.0",
-    "@unchainedshop/mongodb": "^4.6.0",
-    "@unchainedshop/roles": "^4.6.0",
-    "@unchainedshop/utils": "^4.6.0",
-    "bcryptjs": "^3.0.2",
-    "expiry-map": "^2.0.0",
-    "p-memoize": "^8.0.0"
+    "@unchainedshop/events": "^5.0.0-alpha.1",
+    "@unchainedshop/logger": "^5.0.0-alpha.1",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.1",
+    "@unchainedshop/roles": "^5.0.0-alpha.1",
+    "@unchainedshop/utils": "^5.0.0-alpha.1",
+    "bcryptjs": "^3.0.2"
   },
   "peerDependencies": {
     "@noble/curves": "^2.0.0",