diff --git a/src/common/middleware/apiConfig.ts b/src/common/middleware/apiConfig.ts index d396f0c..9216447 100644 --- a/src/common/middleware/apiConfig.ts +++ b/src/common/middleware/apiConfig.ts @@ -1229,22 +1229,23 @@ export const apiList = { }, '/object/category/definition/v4/create', ), - '/api/object/category/definition/v1/update': createRouteObject( + '/api/object/category/definition/v1/update/:identifier': createRouteObject( { patch: { ...common_role_check, }, }, - '/object/category/definition/v4/update', + '/object/category/definition/v4/update/:identifier', ), - '/api/object/category/definition/v1/update/:identifier': createRouteObject( + '/api/object/category/definition/v1/update': createRouteObject( { patch: { ...common_role_check, }, }, - '/object/category/definition/v4/update/:identifier', + '/object/category/definition/v4/update', ), + '/api/object/category/definition/v1/read/:identifier': createRouteObject( { get: { @@ -1645,7 +1646,7 @@ export const apiListForAcademicYear = [ ]; function convertToRegex(pattern) { - const regexString = pattern.replace(/:[^\s/]+/g, '([\\w-]+)'); + const regexString = pattern.replace(/:[^\s/]+/g, '([\\w:-]+)'); return new RegExp(`^${regexString}$`); } diff --git a/src/middleware/gateway.service.ts b/src/middleware/gateway.service.ts index f363203..78b6c98 100644 --- a/src/middleware/gateway.service.ts +++ b/src/middleware/gateway.service.ts @@ -78,21 +78,20 @@ export class GatewayService { method, formData: any, token?: string, - ) { - try { + ) { + try { let response; - const headers = { + const headers = { ...formData.getHeaders(), - ...(token ? { Authorization: `Bearer ${token}` } : {}), + ...(token ? { Authorization: `Bearer ${token}` } : {}), }; response = await axios({ - method: method.toLowerCase(), - url, - data: formData, - headers, + method: method.toLowerCase(), + url, + data: formData, + headers, }); - res.locals.responseBody = response.data; res.status(response.status); return response.data;