Merge pull request #17 from AplaProject/hotfix/centrifugo_init

Initialize centrifugo automatically

Author: Saurer

src/app/modules/engine/epics/discoverNetworkEpic.ts

@@ -8,7 +8,6 @@ import { Observable } from 'rxjs';
 import { discoverNetwork } from '../actions';
 import NodeObservable from '../util/NodeObservable';
 import { discover } from 'services/network';
-import { connect } from 'modules/socket/actions';
 import { mergeFullNodes } from 'modules/storage/actions';
 import NetworkError from 'services/network/errors';
 
@@ -38,13 +37,6 @@ const setNetworkEpic: Epic = (action$, store, { api, defaultKey }) => action$.of
                             }
                         }
                     })),
-                    Observable.of(connect.started({
-                        wsHost: network.socketUrl || result.socketUrl,
-                        session: result.loginResult.token,
-                        socketToken: result.loginResult.notify_key,
-                        timestamp: result.loginResult.timestamp,
-                        userID: result.loginResult.key_id
-                    })),
                     Observable.of(mergeFullNodes({
                         uuid: network.uuid,
                         fullNodes: result.fullNodes

src/app/modules/socket/epic.ts

@@ -13,6 +13,7 @@ import subscribeWalletsEpic from './epics/subscribeWalletsEpic';
 import subscribeReconnectEpic from './epics/subscribeReconnectEpic';
 import unsubscribeRemovedWalletEpic from './epics/unsubscribeRemovedWalletEpic';
 import subscribeWalletEpic from './epics/subscribeWalletEpic';
+import initConnectEpic from './epics/initConnectEpic';
 
 export default combineEpics(
     connectEpic,
@@ -23,5 +24,6 @@ export default combineEpics(
     subscribeWalletsEpic,
     subscribeWalletEpic,
     subscribeReconnectEpic,
-    unsubscribeRemovedWalletEpic
+    unsubscribeRemovedWalletEpic,
+    initConnectEpic
 );

src/app/modules/socket/epics/initConnectEpic.ts

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) EGAAS S.A. All rights reserved.
+ *  See LICENSE in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Epic } from 'modules';
+import { Observable } from 'rxjs/Observable';
+import { discoverNetwork, initialize } from 'modules/engine/actions';
+import { connect } from '../actions';
+import keyring from 'lib/keyring';
+
+const initConnectEpic: Epic = (action$, store, { api, defaultKey }) => action$.ofType(discoverNetwork.done.type, initialize.done.type)
+    .filter(() => !!store.getState().engine.guestSession)
+    .flatMap(action => {
+        const state = store.getState();
+        const network = state.storage.networks.find(n => n.uuid === state.engine.guestSession.network.uuid);
+
+        if (!network) {
+            return Observable.empty<never>();
+        }
+
+        const publicKey = keyring.generatePublicKey(defaultKey);
+        const client = api({
+            apiHost: state.engine.guestSession.network.apiHost
+        });
+
+        return Observable.from(client.getUid())
+            .flatMap(uid => client.authorize(uid.token).login({
+                publicKey,
+                signature: keyring.sign(uid.uid, defaultKey)
+            }))
+            .flatMap(loginResult =>
+                Observable.from(client.authorize(loginResult.token).getConfig({
+                    name: 'centrifugo'
+
+                })).map(centrifugo => connect.started({
+                    wsHost: network.socketUrl || centrifugo,
+                    session: loginResult.token,
+                    socketToken: loginResult.notify_key,
+                    timestamp: loginResult.timestamp,
+                    userID: loginResult.key_id
+                }))
+            )
+            .catch((e: any) => Observable.empty<never>());
+    });
+
+export default initConnectEpic;

src/app/modules/socket/reducers/connectDoneHandler.ts

@@ -11,6 +11,7 @@ const connectDoneHandler: Reducer<typeof connect.done, State> = (state, payload)
     ...state,
     session: payload.result.session,
     socket: payload.result.instance,
+    notifications: [],
     connected: true
 });