From dc3609084cd6a8294e201ffd4dfaaa3ac57ddf62 Mon Sep 17 00:00:00 2001
From: Otsuki Hitoshi <hitochan777@gmail.com>
Date: Fri, 3 Nov 2017 16:51:10 +0900
Subject: [PATCH] Return promise in initSessionService

---
 src/__tests__/index.spec.js | 8 ++------
 src/index.js                | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/__tests__/index.spec.js b/src/__tests__/index.spec.js
index 1097ae8..837eec4 100644
--- a/src/__tests__/index.spec.js
+++ b/src/__tests__/index.spec.js
@@ -14,13 +14,9 @@ describe('API functions', () => {
   const session = { token: '12341234' };
   beforeAll((done) => {
     store = createStore(sessionReducer, initialState);
-
-    // wait for refresh redux store from localStorage
-    const unsubscribe = store.subscribe(() => {
-      unsubscribe();
+    sessionService.initSessionService(store).then( () => {
       done();
-    });
-    sessionService.initSessionService(store);
+    })
   });
 
   describe('refreshFromLocalStorage', () => {
diff --git a/src/index.js b/src/index.js
index 4c5ad62..13081f3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -37,7 +37,7 @@ export class sessionService {
 
   static initSessionService(store, options) {
     instance = new sessionService(store, options);
-    sessionService.refreshFromLocalStorage();
+    return sessionService.refreshFromLocalStorage();
   }
 
   static initServerSession(store, req, options) {
@@ -72,7 +72,7 @@ export class sessionService {
     return sessionService.loadSession()
     .then(() => {
       instance.store.dispatch(getSessionSuccess());
-      sessionService.loadUser().then((user) => {
+      return sessionService.loadUser().then((user) => {
         instance.store.dispatch(getUserSessionSuccess(user));
       })
       .catch(() => {