fix conflicts

pladaria · Aug 11, 2017 · 3c39333 · 3c39333
2 parents 421e557 + 3ff89d6
commit 3c39333
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -212,7 +212,8 @@ See [examples](./examples)
 
 ## Contributors
 
-[martijndierckx](https://github.com/martijndierckx)
+- [martijndierckx](https://github.com/martijndierckx)
+- [Drag0s](https://github.com/Drag0s)
 
 ## License
 

diff --git a/examples/get-client-info.js b/examples/get-client-info.js
diff --git a/src/index.js b/src/index.js
@@ -25,6 +25,7 @@ const create = (
         id: sessionId,
         account,
         userToken: null,
+        clientInfo: null,
     };
 
     const checkSuccess = res => {
@@ -169,12 +170,20 @@ const create = (
         log('updateClientInfo');
         return fetch(`${BASE_TRADER_URL}/pa/secure/client?sessionId=${session.id}`)
             .then(res => res.json())
-            .then(({intAccount, id}) => {
-                session.account = intAccount;
-                session.userToken = id;
+            .then(clientInfo => {
+                session.account = clientInfo.intAccount;
+                session.userToken = clientInfo.id;
+                this.clientInfo = clientInfo;
             });
     };
 
+    /**
+     * Get client info
+     *
+     * @return Client info
+     */
+    const getClientInfo = () => this.clientInfo;
+
     /**
      * Login
      *
@@ -201,8 +210,7 @@ const create = (
                 }
             })
             .then(updateClientInfo)
-            .then(() => session)
-            .catch(console.log);
+            .then(() => session);
     };
 
     /**
@@ -408,9 +416,10 @@ const create = (
         getCashFunds,
         getPortfolio,
         getAskBidPrice,
+        getProductsByIds,
+        getClientInfo,
         // properties
         session,
-        getProductsByIds,
     };
 };