clean up & corrections

hmcts · Aug 18, 2023 · 67faa99 · 67faa99
1 parent 7e057c2
commit 67faa99
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1,786 deletions.
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.5.0.cjs b/.yarn/releases/yarn-3.5.0.cjs
diff --git a/.yarn/releases/yarn-3.6.1.cjs b/.yarn/releases/yarn-3.6.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-node-lib",
-  "version": "3.0.0-Node18Upgrade-1",
+  "version": "3.0.0-Node18Upgrade-2",
   "description": "Common Nodejs library components for XUI",
   "main": "dist/index",
   "types": "dist/index.d.ts",

diff --git a/src/auth/models/strategy.class.ts b/src/auth/models/strategy.class.ts
@@ -179,6 +179,7 @@ export abstract class Strategy extends events.EventEmitter {
             req.logout((err: any) => {
                 this.logger.log('Logout')
             })
+
             await this.destroySession(req)
             /* istanbul ignore next */
             if (req.query.noredirect) {
@@ -226,7 +227,7 @@ export abstract class Strategy extends events.EventEmitter {
 
         this.serializeUser()
         this.deserializeUser()
-        ;(async () => {
+        ; (async () => {
             await this.initialiseStrategy(this.options)
         })()
 
@@ -452,9 +453,14 @@ export abstract class Strategy extends events.EventEmitter {
     }
     /* istanbul ignore next */
     public deserializeUser = (): void => {
-        passport.deserializeUser((id, done) => {
+        passport.deserializeUser((id, done: (err: any, user?: Express.User | false | null) => void) => {
             this.logger.log(`${this.strategyName} deserializeUser`)
-            // this.emitIfListenersExist(AUTH.EVENT.DESERIALIZE_USER, id, done)
+            this.emitIfListenersExist(AUTH.EVENT.DESERIALIZE_USER, id, (err, id) => {
+                console.debug(`Done deserializeUser |${id}|`)
+                if (err) {
+                    console.error(err)
+                }
+            })
         })
     }