workflow router authorizer

Tauffer-Consulting · Mar 22, 2024 · aeb2b8d · aeb2b8d
1 parent 819a6f0
commit aeb2b8d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/frontend/src/features/workspaces/components/workspaceSettings/UsersCard.tsx b/frontend/src/features/workspaces/components/workspaceSettings/UsersCard.tsx
@@ -89,8 +89,8 @@ export const UsersCard: FC = () => {
               }}
             >
               <MenuItem value={"admin"}>Admin</MenuItem>
-              <MenuItem value={"read"}>Read</MenuItem>
               <MenuItem value={"write"}>Write</MenuItem>
+              <MenuItem value={"read"}>Read</MenuItem>
             </Select>
           </FormControl>
         </Grid>

diff --git a/rest/routers/workflow_router.py b/rest/routers/workflow_router.py
@@ -2,7 +2,6 @@
 from schemas.context.auth_context import AuthorizationContextData
 from typing import List
 from services.workflow_service import WorkflowService
-from services.auth_service import AuthService
 from schemas.requests.workflow import CreateWorkflowRequest, ListWorkflowsFilters
 from schemas.responses.workflow import (
     GetWorkflowsResponse,
@@ -28,11 +27,16 @@
     ResourceNotFoundError,
     SomethingWrongError,
 )
+from auth.permission_authorizer import Authorizer
+from database.models.enums import Permission
 
 
 router = APIRouter(prefix="/workspaces/{workspace_id}/workflows")
-auth_service = AuthService()
+
 workflow_service = WorkflowService()
+read_authorizer = Authorizer(permission_level=Permission.read.value)
+write_authorizer = Authorizer(permission_level=Permission.write.value)
+
 
 
 @router.post(
@@ -48,7 +52,7 @@
 def create_workflow(
     workspace_id: int,
     body: CreateWorkflowRequest,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(write_authorizer.authorize)
 ) -> CreateWorkflowResponse:
     """Create a new workflow"""
     try:
@@ -69,7 +73,7 @@ def create_workflow(
         status.HTTP_500_INTERNAL_SERVER_ERROR: {"model": SomethingWrongError},
         status.HTTP_403_FORBIDDEN: {"model": ForbiddenError},
     },
-    dependencies=[Depends(auth_service.workspace_access_authorizer)]
+    dependencies=[Depends(read_authorizer.authorize)]
 )
 async def list_workflows(
     workspace_id: int,
@@ -99,11 +103,10 @@ async def list_workflows(
     },
     status_code=200,
 )
-@auth_service.authorize_workspace_access
 def get_workflow(
     workspace_id: int,
     workflow_id: int,
-    auth_context: AuthorizationContextData = Depends(auth_service.auth_wrapper)
+    auth_context: AuthorizationContextData = Depends(read_authorizer.authorize)
 ) -> GetWorkflowResponse:
     """Get a workflow information"""
     try:
@@ -125,7 +128,7 @@ def get_workflow(
         status.HTTP_403_FORBIDDEN: {"model": ForbiddenError},
         status.HTTP_404_NOT_FOUND: {"model": ResourceNotFoundError}
     },
-    dependencies=[Depends(auth_service.workspace_owner_access_authorizer)]
+    dependencies=[Depends(write_authorizer.authorize)]
 )
 async def delete_workflow(
     workspace_id: int,
@@ -154,7 +157,7 @@ async def delete_workflow(
 def run_workflow(
     workspace_id: int,
     workflow_id: int,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(write_authorizer.authorize)
 ):
     try:
         return workflow_service.run_workflow(
@@ -178,7 +181,7 @@ def list_workflow_runs(
     workflow_id: int,
     page: int = 0,
     page_size: int = 5,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(read_authorizer.authorize)
 ) -> GetWorkflowRunsResponse:
     try:
         return workflow_service.list_workflow_runs(
@@ -205,7 +208,7 @@ def list_run_tasks(
     workflow_run_id: str,
     page: int = 0,
     page_size: int = 5,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(read_authorizer.authorize)
 ) -> GetWorkflowRunTasksResponse:
     try:
         return workflow_service.list_run_tasks(
@@ -231,7 +234,7 @@ def generate_report(
     workspace_id: int,
     workflow_id: int,
     workflow_run_id: str,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(read_authorizer.authorize)
 ) -> GetWorkflowResultReportResponse:
     try:
         return workflow_service.generate_report(
@@ -257,7 +260,7 @@ def get_task_logs(
     workflow_run_id: str,
     task_id: str,
     task_try_number: int,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(read_authorizer.authorize)
 ) -> GetWorkflowRunTaskLogsResponse:
 
     """
@@ -290,7 +293,7 @@ def get_task_result(
     workflow_run_id: str,
     task_id: str,
     task_try_number: int,
-    auth_context: AuthorizationContextData = Depends(auth_service.workspace_access_authorizer)
+    auth_context: AuthorizationContextData = Depends(read_authorizer.authorize)
 ) -> GetWorkflowRunTaskResultResponse:
 
     """

diff --git a/rest/services/workflow_service.py b/rest/services/workflow_service.py
@@ -647,7 +647,12 @@ def list_workflow_runs(self, workflow_id: int, page: int, page_size: int):
 
         data = []
         for run in dag_runs:
-            #duration = run.get('end_date') - run.get('start_date')
+            if run.get('end_date') is None or run.get('start_date') is None:
+                run['duration_in_seconds'] = None
+                data.append(
+                    GetWorkflowRunsResponseData(**run)
+                )
+                continue
             end_date_dt = datetime.fromisoformat(run.get('end_date'))
             start_date_dt = datetime.fromisoformat(run.get('start_date'))
             duration = end_date_dt - start_date_dt