Merge pull request #10543 from brucejo75/accounts_call_onLogin_callba…

…cks_startup [fix #10157] Make sure onLogin callbacks are called during startup.
meteor · Nov 6, 2019 · 8da7f3b · 8da7f3b
2 parents 00564ac + ec0ed4d
commit 8da7f3b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js
@@ -435,7 +435,22 @@ export class AccountsClient extends AccountsCommon {
     this._pageLoadLoginCallbacks.forEach(callback => callback(attemptInfo));
     this._pageLoadLoginCallbacks = [];
     this._pageLoadLoginAttemptInfo = attemptInfo;
-  };
+  }
+
+  // _startupCallback executes on onLogin callbacks
+  // at registration time if already logged in
+  // this can happen when new AccountsClient is created
+  // before callbacks are registered see #10157
+  _startupCallback(callback) {
+    // Are we already logged in?
+    if (this.connection._userId) {
+      // If already logged in before handler is registered, it's safe to
+      // assume type is a 'resume', so we execute the callback at the end
+      // of the queue so that Meteor.startup can complete before any
+      // embedded onLogin callbacks would execute.
+      Meteor.setTimeout(() => callback({ type: 'resume' }), 0);
+    }
+  }
 
   ///
   /// LOGIN TOKENS

diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
@@ -196,7 +196,10 @@ export class AccountsCommon {
    *                        as user details, connection information, etc.
    */
   onLogin(func) {
-    return this._onLoginHook.register(func);
+    let ret = this._onLoginHook.register(func);
+    // call the just registered callback if already logged in
+    this._startupCallback(ret.callback);
+    return ret;
   }
 
   /**
@@ -285,6 +288,9 @@ export class AccountsCommon {
     }
     return new Date() > (new Date(when) - minLifetimeMs);
   }
+
+  // No-op on the server, overridden on the client.
+  _startupCallback(callback) {}
 }
 
 // Note that Accounts is defined separately in accounts_client.js and

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "1.4.4",
+  version: "1.4.5",
 });
 
 Package.onUse(api => {

diff --git a/packages/callback-hook/hook.js b/packages/callback-hook/hook.js
@@ -77,6 +77,7 @@ export class Hook {
     this.callbacks[id] = callback;
 
     return {
+      callback,
       stop: () => {
         delete this.callbacks[id];
       }

diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Register callbacks on a hook",
-  version: '1.1.0'
+  version: '1.2.0'
 });
 
 Package.onUse(function (api) {