1 files changed, 20 insertions, 15 deletions

diff --git a/opendc-web/opendc-web-ui/src/redux/sagas/projects.js b/opendc-web/opendc-web-ui/src/redux/sagas/projects.js
index ecd9a7c9..506df6ed 100644
--- a/opendc-web/opendc-web-ui/src/redux/sagas/projects.js
+++ b/opendc-web/opendc-web-ui/src/redux/sagas/projects.js
@@ -1,14 +1,15 @@
-import { call, put } from 'redux-saga/effects'
+import { call, put, getContext } from 'redux-saga/effects'
 import { addToStore } from '../actions/objects'
-import { addProjectSucceeded, deleteProjectSucceeded } from '../actions/projects'
-import { addProject, deleteProject, getProject } from '../../api/projects'
+import { addProjectSucceeded, deleteProjectSucceeded, fetchProjectsSucceeded } from '../actions/projects'
+import { addProject, deleteProject, getProject, getProjects } from '../../api/projects'
 import { fetchAndStoreAllTopologiesOfProject } from './topology'
 import { fetchAndStoreAllSchedulers, fetchAndStoreAllTraces } from './objects'
 import { fetchPortfoliosOfProject } from './portfolios'
 
 export function* onOpenProjectSucceeded(action) {
     try {
-        const project = yield call(getProject, action.id)
+        const auth = yield getContext('auth')
+        const project = yield call(getProject, auth, action.id)
         yield put(addToStore('project', project))
 
         yield fetchAndStoreAllTopologiesOfProject(action.id, true)
@@ -22,17 +23,10 @@ export function* onOpenProjectSucceeded(action) {
 
 export function* onProjectAdd(action) {
     try {
-        const project = yield call(addProject, { name: action.name })
+        const auth = yield getContext('auth')
+        const project = yield call(addProject, auth, { name: action.name })
         yield put(addToStore('project', project))
-
-        const authorization = {
-            projectId: project._id,
-            userId: action.userId,
-            authorizationLevel: 'OWN',
-            project,
-        }
-        yield put(addToStore('authorization', authorization))
-        yield put(addProjectSucceeded([authorization.userId, authorization.projectId]))
+        yield put(addProjectSucceeded(project))
     } catch (error) {
         console.error(error)
     }
@@ -40,9 +34,20 @@ export function* onProjectAdd(action) {
 
 export function* onProjectDelete(action) {
     try {
-        yield call(deleteProject, action.id)
+        const auth = yield getContext('auth')
+        yield call(deleteProject, auth, action.id)
         yield put(deleteProjectSucceeded(action.id))
     } catch (error) {
         console.error(error)
     }
 }
+
+export function* onFetchProjects(action) {
+    try {
+        const auth = yield getContext('auth')
+        const projects = yield call(getProjects, auth)
+        yield put(fetchProjectsSucceeded(projects))
+    } catch (error) {
+        console.error(error)
+    }
+}