chore: Release v1.3.9 - See CHANGELOG

restorecommerce · Oct 22, 2023 · c3d4a5f · c3d4a5f
1 parent fc6c7da
commit c3d4a5f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.9 (October 22nd, 2023)
+
+- fix delete tokens from redis on user deletion
+
 ## 1.3.8 (October 21st, 2023)
 
 - delete tokens from redis on user deletion

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/identity-srv",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "Restorecommerce identity service",
   "main": "lib/start.js",
   "author": "n-fuse GmbH",

diff --git a/src/service.ts b/src/service.ts
@@ -2238,13 +2238,6 @@ export class UserService extends ServiceBase<UserListResponse, UserList> impleme
         logger.info('Users collection deleted');
         return deleteResponse;
       }
-      logger.silly('Deleting User IDs', { userIDs });
-
-      // delete users
-      const deleteStatusArr = await super.delete(DeleteRequest.fromPartial({
-        ids: userIDs
-      }), context);
-      logger.info('Users deleted:', userIDs);
       if (userIDs.length > 0) {
         const filters = [{
           filters: [{
@@ -2260,13 +2253,19 @@ export class UserService extends ServiceBase<UserListResponse, UserList> impleme
         if (userData?.items?.length > 0) {
           userData?.items?.forEach((user) => {
             user?.payload?.tokens?.forEach(async (tokenObj) => {
-              if(tokenObj?.token) {
+              if (tokenObj?.token) {
                 await this.tokenRedisClient.del(tokenObj.token);
               }
             });
           });
         }
       }
+      logger.silly('Deleting User IDs', { userIDs });
+      // delete users
+      const deleteStatusArr = await super.delete(DeleteRequest.fromPartial({
+        ids: userIDs
+      }), context);
+      logger.info('Users deleted:', userIDs);
       return deleteStatusArr;
     }
   }