--- a/client/src/APIClient.js	Mon Jun 19 17:56:43 2017 +0200
+++ b/client/src/APIClient.js	Mon Jun 19 18:23:26 2017 +0200
@@ -1,6 +1,7 @@
 class APIClient {
-  constructor(baseURL) {
+  constructor(baseURL, store) {
     this.baseURL = baseURL;
+    this.store = store;
   }
 
   createRequest = (method, uri, data, headers) => {
@@ -21,8 +22,14 @@
     return new Request(this.baseURL + uri, options);
   }
 
+  getToken = () => {
+    const state = this.store.getState();
+    return state.get('token');
+  }
+
   hasToken = () => {
-    const token = localStorage.getItem('token');
+    //const token = localStorage.getItem('token');
+    const token = this.getToken();
 
     return token !== null;
   }
@@ -30,7 +37,8 @@
   createAuthorizedRequest = (method, uri, data) => {
 
     var headers = new Headers(),
-        token = localStorage.getItem('token') || '';
+        //token = localStorage.getItem('token') || '';
+        token = this.getToken() || '';
     headers.append("Authorization", "JWT " + token);
 
     return this.createRequest(method, uri, data, headers);