3 files changed, 9 insertions, 9 deletions
diff --git a/src/api/sagas/objects.js b/src/api/sagas/objects.js
index fd7830b3..98c766ec 100644
--- a/src/api/sagas/objects.js
+++ b/src/api/sagas/objects.js
@@ -1,5 +1,5 @@
 import {call, put, select} from "redux-saga/effects";
-import {addToSimulationStore, addToUserStore} from "../../actions/objects";
+import {addToStore} from "../../actions/objects";
 import {getSimulation} from "../routes/simulations";
 import {getUser} from "../routes/users";
 
@@ -9,16 +9,16 @@ const selectors = {
     authorization: state => state.objects.authorization,
 };
 
-function* fetchAndStoreObject(objectType, id, apiCall, addToStore) {
+function* fetchAndStoreObject(objectType, id, apiCall) {
     const objectStore = yield select(selectors[objectType]);
     if (!objectStore[id]) {
         const object = yield apiCall;
-        yield put(addToStore(object));
+        yield put(addToStore(objectType, object));
     }
 }
 
 export const fetchAndStoreSimulation = (id) =>
-    fetchAndStoreObject("simulation", id, call(getSimulation, id), addToSimulationStore);
+    fetchAndStoreObject("simulation", id, call(getSimulation, id));
 
 export const fetchAndStoreUser = (id) =>
-    fetchAndStoreObject("user", id, call(getUser, id), addToUserStore);
+    fetchAndStoreObject("user", id, call(getUser, id),);
diff --git a/src/api/sagas/simulations.js b/src/api/sagas/simulations.js
index 9c3bd24c..6b7471c0 100644
--- a/src/api/sagas/simulations.js
+++ b/src/api/sagas/simulations.js
@@ -1,19 +1,19 @@
 import {call, put} from "redux-saga/effects";
-import {addToAuthorizationStore, addToSimulationStore} from "../../actions/objects";
+import {addToStore} from "../../actions/objects";
 import {addSimulationSucceeded, deleteSimulationSucceeded} from "../../actions/simulations";
 import {addSimulation, deleteSimulation} from "../routes/simulations";
 
 export function* onSimulationAdd(action) {
     try {
         const simulation = yield call(addSimulation, {name: action.name});
-        yield put(addToSimulationStore(simulation));
+        yield put(addToStore("simulation", simulation));
 
         const authorization = {
             simulationId: simulation.id,
             userId: action.userId,
             authorizationLevel: "OWN"
         };
-        yield put(addToAuthorizationStore(authorization));
+        yield put(addToStore("authorization", authorization));
         yield put(addSimulationSucceeded([authorization.userId, authorization.simulationId]));
     } catch (error) {
         console.log(error);
diff --git a/src/api/sagas/users.js b/src/api/sagas/users.js
index c1daab30..d3bc3f5f 100644
--- a/src/api/sagas/users.js
+++ b/src/api/sagas/users.js
@@ -3,7 +3,7 @@ import {logInSucceeded} from "../../actions/auth";
 import {addToAuthorizationStore} from "../../actions/objects";
 import {fetchAuthorizationsOfCurrentUserSucceeded} from "../../actions/users";
 import {saveAuthLocalStorage} from "../../auth/index";
-import {performTokenSignIn} from "../routes/auth";
+import {performTokenSignIn} from "../routes/token-signin";
 import {addUser, getAuthorizationsByUser} from "../routes/users";
 import {fetchAndStoreSimulation, fetchAndStoreUser} from "./objects";