From ee70ec4c7efb49c08f0a76b6b2694c0e9910978c Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 10 Dec 2018 22:36:25 +0700
Subject: fix race condition

---
 src/main.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index 91592191..e4621482 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,7 +10,6 @@ import apiModule from './modules/api.js'
 import configModule from './modules/config.js'
 import chatModule from './modules/chat.js'
 import oauthModule from './modules/oauth.js'
-import pushNotificationsModule from './modules/pushNotifications.js'
 
 import VueTimeago from 'vue-timeago'
 import VueI18n from 'vue-i18n'
@@ -61,13 +60,19 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
       api: apiModule,
       config: configModule,
       chat: chatModule,
-      oauth: oauthModule,
-      pushNotifications: pushNotificationsModule
+      oauth: oauthModule
     },
     plugins: [persistedState],
     strict: false // Socket modifies itself, let's ignore this for now.
     // strict: process.env.NODE_ENV !== 'production'
   })
 
+  store.subscribe((mutation, state) => {
+    if ((mutation.type === 'setCurrentUser' && state.instance.vapidPublicKey) || // Login + existing key
+      (mutation.type === 'setInstanceOption' && mutation.payload.name === 'vapidPublicKey' && state.users.currentUser)) { // Logged in, key arrives late
+      store.dispatch('registerPushNotifications')
+    }
+  })
+
   afterStoreSetup({ store, i18n })
 })
-- 
cgit v1.2.3-70-g09d2