Ajust the re-auth flow and support FakeTime in tk

Author: bigmontz

packages/bolt-connection/src/connection-provider/authentication-provider.js

@@ -29,11 +29,11 @@ export default class AuthenticationProvider {
   }
 
   async authenticate ({ connection }) {
-    if (!this._authToken) {
+    if (!this._authToken || this._isTokenExpired) {
       await this._getFreshAuthToken()
     }
 
-    if (this._renewableAuthToken.authToken !== connection.authToken || this._isTokenExpired) {
+    if (this._renewableAuthToken.authToken !== connection.authToken) {
       return await connection.connect(this._userAgent, this._authToken)
     }
 

packages/bolt-connection/src/connection/connection-channel.js

@@ -198,10 +198,10 @@ export default class ChannelConnection extends Connection {
     })
 
     const loginPromise = new Promise((resolve, reject) => {
-      this._protocol.login({ onComplete: resolve, onError: reject, flush: true })
+      this._protocol.login({ onComplete: resolve, onError: reject, authToken, flush: true })
     })
 
-    return await Promise.all(logoffPromise, loginPromise)
+    return await Promise.all([logoffPromise, loginPromise])
       .then(() => this)
   }
 

packages/bolt-connection/src/pool/pool.js

@@ -203,11 +203,11 @@ class Pool {
     while (pool.length) {
       const resource = pool.pop()
 
-      if (await this._validate(resource)) {
-        if (this._removeIdleObserver) {
-          this._removeIdleObserver(resource)
-        }
+      if (this._removeIdleObserver) {
+        this._removeIdleObserver(resource)
+      }
 
+      if (await this._validate(resource)) {
         // idle resource is valid and can be acquired
         resourceAcquired(key, this._activeResourceCounts)
         if (this._log.isDebugEnabled()) {

packages/neo4j-driver-deno/lib/bolt-connection/connection-provider/authentication-provider.js

@@ -29,11 +29,11 @@ export default class AuthenticationProvider {
   }
 
   async authenticate ({ connection }) {
-    if (!this._authToken) {
+    if (!this._authToken || this._isTokenExpired) {
       await this._getFreshAuthToken()
     }
 
-    if (this._renewableAuthToken.authToken !== connection.authToken || this._isTokenExpired) {
+    if (this._renewableAuthToken.authToken !== connection.authToken) {
       return await connection.connect(this._userAgent, this._authToken)
     }
 

packages/neo4j-driver-deno/lib/bolt-connection/connection/connection-channel.js

@@ -198,10 +198,10 @@ export default class ChannelConnection extends Connection {
     })
 
     const loginPromise = new Promise((resolve, reject) => {
-      this._protocol.login({ onComplete: resolve, onError: reject, flush: true })
+      this._protocol.login({ onComplete: resolve, onError: reject, authToken, flush: true })
     })
 
-    return await Promise.all(logoffPromise, loginPromise)
+    return await Promise.all([logoffPromise, loginPromise])
       .then(() => this)
   }
 

packages/neo4j-driver-deno/lib/bolt-connection/pool/pool.js

@@ -203,11 +203,11 @@ class Pool {
     while (pool.length) {
       const resource = pool.pop()
 
-      if (await this._validate(resource)) {
-        if (this._removeIdleObserver) {
-          this._removeIdleObserver(resource)
-        }
+      if (this._removeIdleObserver) {
+        this._removeIdleObserver(resource)
+      }
 
+      if (await this._validate(resource)) {
         // idle resource is valid and can be acquired
         resourceAcquired(key, this._activeResourceCounts)
         if (this._log.isDebugEnabled()) {