@@ -1696,9 +1696,6 @@ async fn handle_update_config_inner(
16961696 require_platform_admin ( & state. admin_role , principal) ?;
16971697 String :: new ( )
16981698 } else {
1699- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
1700- . await ?
1701- . name ;
17021699 let min_role = if sandbox_caller {
17031700 MinWorkspaceRole :: User
17041701 } else {
@@ -1708,11 +1705,13 @@ async fn handle_update_config_inner(
17081705 & state. store ,
17091706 & state. admin_role ,
17101707 principal,
1711- & workspace,
1708+ & req . workspace ,
17121709 min_role,
17131710 )
17141711 . await ?;
1715- workspace
1712+ super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
1713+ . await ?
1714+ . name
17161715 } ;
17171716 if sandbox_caller {
17181717 validate_sandbox_caller_update ( & req) ?;
@@ -2320,18 +2319,17 @@ pub(super) async fn handle_get_sandbox_policy_status(
23202319 require_platform_admin ( & state. admin_role , & principal) ?;
23212320 String :: new ( )
23222321 } else {
2323- let ws = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
2324- . await ?
2325- . name ;
2326- authorize_workspace (
2322+ let authz = authorize_workspace (
23272323 & state. store ,
23282324 & state. admin_role ,
23292325 & principal,
2330- & ws ,
2326+ & req . workspace ,
23312327 MinWorkspaceRole :: User ,
23322328 )
23332329 . await ?;
2334- ws
2330+ super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
2331+ . await ?
2332+ . name
23352333 } ;
23362334
23372335 let ( policy_id, active_version) = if req. global {
@@ -2389,18 +2387,17 @@ pub(super) async fn handle_list_sandbox_policies(
23892387 require_platform_admin ( & state. admin_role , & principal) ?;
23902388 String :: new ( )
23912389 } else {
2392- let ws = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
2393- . await ?
2394- . name ;
2395- authorize_workspace (
2390+ let authz = authorize_workspace (
23962391 & state. store ,
23972392 & state. admin_role ,
23982393 & principal,
2399- & ws ,
2394+ & req . workspace ,
24002395 MinWorkspaceRole :: User ,
24012396 )
24022397 . await ?;
2403- ws
2398+ super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
2399+ . await ?
2400+ . name
24042401 } ;
24052402
24062403 let policy_id = if req. global {
@@ -2944,17 +2941,17 @@ pub(super) async fn handle_get_draft_policy(
29442941 . cloned ( )
29452942 . ok_or_else ( || Status :: unauthenticated ( "missing principal" ) ) ?;
29462943 let req = request. into_inner ( ) ;
2947- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
2948- . await ?
2949- . name ;
29502944 authorize_sandbox_workspace (
29512945 & state. store ,
29522946 & state. admin_role ,
29532947 & principal,
2954- & workspace,
2948+ & req . workspace ,
29552949 MinWorkspaceRole :: User ,
29562950 )
29572951 . await ?;
2952+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
2953+ . await ?
2954+ . name ;
29582955 if req. name . is_empty ( ) {
29592956 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
29602957 }
@@ -3025,17 +3022,17 @@ async fn handle_approve_draft_chunk_inner(
30253022) -> Result < Response < ApproveDraftChunkResponse > , Status > {
30263023 let principal = super :: extract_principal ( & request) ?;
30273024 let req = request. into_inner ( ) ;
3028- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3029- . await ?
3030- . name ;
3031- authorize_workspace (
3025+ let authz = authorize_workspace (
30323026 & state. store ,
30333027 & state. admin_role ,
30343028 & principal,
3035- & workspace,
3029+ & req . workspace ,
30363030 MinWorkspaceRole :: Admin ,
30373031 )
30383032 . await ?;
3033+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3034+ . await ?
3035+ . name ;
30393036 if req. name . is_empty ( ) {
30403037 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
30413038 }
@@ -3137,17 +3134,17 @@ async fn handle_reject_draft_chunk_inner(
31373134) -> Result < Response < RejectDraftChunkResponse > , Status > {
31383135 let principal = super :: extract_principal ( & request) ?;
31393136 let req = request. into_inner ( ) ;
3140- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3141- . await ?
3142- . name ;
3143- authorize_workspace (
3137+ let authz = authorize_workspace (
31443138 & state. store ,
31453139 & state. admin_role ,
31463140 & principal,
3147- & workspace,
3141+ & req . workspace ,
31483142 MinWorkspaceRole :: Admin ,
31493143 )
31503144 . await ?;
3145+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3146+ . await ?
3147+ . name ;
31513148 if req. name . is_empty ( ) {
31523149 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
31533150 }
@@ -3247,17 +3244,17 @@ async fn handle_approve_all_draft_chunks_inner(
32473244) -> Result < Response < ApproveAllDraftChunksResponse > , Status > {
32483245 let principal = super :: extract_principal ( & request) ?;
32493246 let req = request. into_inner ( ) ;
3250- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3251- . await ?
3252- . name ;
3253- authorize_workspace (
3247+ let authz = authorize_workspace (
32543248 & state. store ,
32553249 & state. admin_role ,
32563250 & principal,
3257- & workspace,
3251+ & req . workspace ,
32583252 MinWorkspaceRole :: Admin ,
32593253 )
32603254 . await ?;
3255+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3256+ . await ?
3257+ . name ;
32613258 if req. name . is_empty ( ) {
32623259 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
32633260 }
@@ -3381,17 +3378,17 @@ pub(super) async fn handle_edit_draft_chunk(
33813378) -> Result < Response < EditDraftChunkResponse > , Status > {
33823379 let principal = super :: extract_principal ( & request) ?;
33833380 let req = request. into_inner ( ) ;
3384- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3385- . await ?
3386- . name ;
3387- authorize_workspace (
3381+ let authz = authorize_workspace (
33883382 & state. store ,
33893383 & state. admin_role ,
33903384 & principal,
3391- & workspace,
3385+ & req . workspace ,
33923386 MinWorkspaceRole :: Admin ,
33933387 )
33943388 . await ?;
3389+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3390+ . await ?
3391+ . name ;
33953392 if req. name . is_empty ( ) {
33963393 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
33973394 }
@@ -3457,17 +3454,17 @@ async fn handle_undo_draft_chunk_inner(
34573454) -> Result < Response < UndoDraftChunkResponse > , Status > {
34583455 let principal = super :: extract_principal ( & request) ?;
34593456 let req = request. into_inner ( ) ;
3460- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3461- . await ?
3462- . name ;
3463- authorize_workspace (
3457+ let authz = authorize_workspace (
34643458 & state. store ,
34653459 & state. admin_role ,
34663460 & principal,
3467- & workspace,
3461+ & req . workspace ,
34683462 MinWorkspaceRole :: Admin ,
34693463 )
34703464 . await ?;
3465+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3466+ . await ?
3467+ . name ;
34713468 if req. name . is_empty ( ) {
34723469 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
34733470 }
@@ -3554,17 +3551,17 @@ pub(super) async fn handle_clear_draft_chunks(
35543551) -> Result < Response < ClearDraftChunksResponse > , Status > {
35553552 let principal = super :: extract_principal ( & request) ?;
35563553 let req = request. into_inner ( ) ;
3557- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3558- . await ?
3559- . name ;
3560- authorize_workspace (
3554+ let authz = authorize_workspace (
35613555 & state. store ,
35623556 & state. admin_role ,
35633557 & principal,
3564- & workspace,
3558+ & req . workspace ,
35653559 MinWorkspaceRole :: Admin ,
35663560 )
35673561 . await ?;
3562+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3563+ . await ?
3564+ . name ;
35683565 if req. name . is_empty ( ) {
35693566 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
35703567 }
@@ -3602,17 +3599,17 @@ pub(super) async fn handle_get_draft_history(
36023599) -> Result < Response < GetDraftHistoryResponse > , Status > {
36033600 let principal = super :: extract_principal ( & request) ?;
36043601 let req = request. into_inner ( ) ;
3605- let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & req. workspace )
3606- . await ?
3607- . name ;
3608- authorize_workspace (
3602+ let authz = authorize_workspace (
36093603 & state. store ,
36103604 & state. admin_role ,
36113605 & principal,
3612- & workspace,
3606+ & req . workspace ,
36133607 MinWorkspaceRole :: User ,
36143608 )
36153609 . await ?;
3610+ let workspace = super :: workspace:: resolve_workspace ( state. store . as_ref ( ) , & authz. workspace )
3611+ . await ?
3612+ . name ;
36163613 if req. name . is_empty ( ) {
36173614 return Err ( Status :: invalid_argument ( "name is required" ) ) ;
36183615 }
0 commit comments