@@ -70,10 +70,10 @@ export const createUserAccessRequestController = async (
7070 const { accessRequest, user } = req . body ;
7171
7272 // Check if the requestee is an admin
73- const isAdmin = await isUserAdmin ( tx , req . currentContext . initiative , req . currentAuthorization . groups ) ;
73+ const isAdmin = await isUserAdmin ( tx , res . locals . currentContext . initiative , res . locals . currentAuthorization . groups ) ;
7474
7575 // Get all the groups for the current initiative
76- const groups = await getGroups ( tx , req . currentContext . initiative ) ;
76+ const groups = await getGroups ( tx , res . locals . currentContext . initiative ) ;
7777
7878 // Groups the current user can modify
7979 const userAllowedGroups = [ GroupName . NAVIGATOR , GroupName . NAVIGATOR_READ_ONLY ] ;
@@ -123,7 +123,7 @@ export const createUserAccessRequestController = async (
123123
124124 if ( isGroupUpdate ) {
125125 // Remove current initiative groups
126- await removeUserGroups ( tx , userResponse . sub , req . currentContext . initiative , accessUserGroups ) ;
126+ await removeUserGroups ( tx , userResponse . sub , res . locals . currentContext . initiative , accessUserGroups ) ;
127127
128128 // Assign new groups
129129 await assignGroup ( tx , userResponse . sub , accessRequest . groupId ) ;
@@ -155,7 +155,7 @@ export const createUserAccessRequestController = async (
155155 } ;
156156 } else {
157157 // Remove current initiative groups
158- await removeUserGroups ( tx , userResponse . sub , req . currentContext . initiative , accessUserGroups ) ;
158+ await removeUserGroups ( tx , userResponse . sub , res . locals . currentContext . initiative , accessUserGroups ) ;
159159 }
160160
161161 updateComsPerms = true ;
@@ -169,7 +169,7 @@ export const createUserAccessRequestController = async (
169169 // Assign new COMS permissions
170170 if ( updateComsPerms ) {
171171 try {
172- await assignPermissions ( tx , req . currentContext , userResponse . sub ) ;
172+ await assignPermissions ( tx , res . locals . currentContext , userResponse . sub ) ;
173173 } catch ( e ) {
174174 if ( e instanceof Error ) log . warn ( e . message ) ;
175175 if ( e instanceof Problem ) log . warn ( e . detail ) ;
@@ -187,7 +187,7 @@ export const processUserAccessRequestController = async (
187187 res : Response
188188) => {
189189 await transactionWrapper < void > ( async ( tx : PrismaTransactionClient ) => {
190- const accessRequest = await getAccessRequest ( tx , req . currentContext . initiative , req . params . accessRequestId ) ;
190+ const accessRequest = await getAccessRequest ( tx , res . locals . currentContext . initiative , req . params . accessRequestId ) ;
191191
192192 if ( accessRequest ) {
193193 const userResponse = await readUser ( tx , accessRequest . userId ) ;
@@ -214,14 +214,14 @@ export const processUserAccessRequestController = async (
214214 await assignGroup ( tx , userResponse . sub , correspondingGlobalGroup . groupId ) ;
215215 } else {
216216 // Remove all user groups for the initiative
217- await removeUserGroups ( tx , userResponse . sub , req . currentContext . initiative , userGroups ) ;
217+ await removeUserGroups ( tx , userResponse . sub , res . locals . currentContext . initiative , userGroups ) ;
218218 }
219219
220220 // Update access request status
221221 await updateAccessRequest ( tx , { status : AccessRequestStatus . APPROVED } , accessRequest . accessRequestId ) ;
222222
223223 // Assign new COMS permissions
224- await assignPermissions ( tx , req . currentContext , userResponse . sub ) ;
224+ await assignPermissions ( tx , res . locals . currentContext , userResponse . sub ) ;
225225 } else {
226226 await updateAccessRequest ( tx , { status : AccessRequestStatus . REJECTED } , accessRequest . accessRequestId ) ;
227227 }
@@ -236,7 +236,7 @@ export const processUserAccessRequestController = async (
236236
237237export const getAccessRequestsController = async ( req : Request , res : Response ) => {
238238 const response = await transactionWrapper < AccessRequest [ ] > ( async ( tx : PrismaTransactionClient ) => {
239- return await getAccessRequests ( tx , req . currentContext . initiative ) ;
239+ return await getAccessRequests ( tx , res . locals . currentContext . initiative ) ;
240240 } ) ;
241241 res . status ( 200 ) . json ( response ) ;
242242} ;
0 commit comments