fix(authentication-client): Reset authentication promise on socket di…

…sconnect (#1696)
feathersjs · Nov 21, 2019 · 3951626 · 3951626
1 parent f5d0ddd
commit 3951626
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/packages/authentication-client/src/core.ts b/packages/authentication-client/src/core.ts
@@ -61,14 +61,18 @@ export class AuthenticationClient {
   handleSocket (socket: any) {
     // Connection events happen on every reconnect
     const connected = this.app.io ? 'connect' : 'open';
+    const disconnected = this.app.io ? 'disconnect' : 'disconnection';
 
-    socket.on(connected, () => {
+    socket.on(disconnected, () => {
+      const authPromise = new Promise(resolve =>
+        socket.once(connected, () => resolve())
+      )
       // Only reconnect when `reAuthenticate()` or `authenticate()`
       // has been called explicitly first
-      if (this.authenticated) {
-        // Force reauthentication with the server
-        this.reAuthenticate(true);
-      }
+      // Force reauthentication with the server
+      .then(() => this.authenticated ? this.reAuthenticate(true) : null);
+
+      this.app.set('authentication', authPromise);
     });
   }