Skip to content

Commit de4a81a

Browse files
committed
PR feedback - code readability
1 parent 3d44a63 commit de4a81a

File tree

2 files changed

+18
-18
lines changed
  • components
    • centraldashboard-angular/backend/app
    • centraldashboard/app

2 files changed

+18
-18
lines changed

components/centraldashboard-angular/backend/app/api.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ export class Api {
3131
* - Are a cluster admin
3232
* - Are in basic auth mode (non-identity aware clusters)
3333
*/
34-
private async checkNamespaceAccess(req: Request, res: Response, next: NextFunction) {
35-
const namespace = req.params.namespace;
34+
private async checkNamespaceAccess(request: Request, response: Response, next: NextFunction) {
35+
const namespace = request.params.namespace;
3636
if (!namespace) {
3737
return apiError({
38-
res,
38+
response,
3939
code: 400,
4040
error: 'Namespace parameter is required',
4141
});
@@ -47,22 +47,22 @@ export class Api {
4747
}
4848

4949
// If no user is attached to request, deny access
50-
if (!req.user) {
50+
if (!request.user) {
5151
return apiError({
52-
res,
52+
response,
5353
code: 401,
5454
error: 'Authentication required to access namespace activities',
5555
});
5656
}
5757

5858
try {
5959
// For non-authenticated users in basic auth mode, allow access
60-
if (!req.user.hasAuth) {
60+
if (!request.user.hasAuth) {
6161
return next();
6262
}
6363

6464
// Get user's workgroup information
65-
const workgroupInfo = await this.workgroupApi.getWorkgroupInfo(req.user);
65+
const workgroupInfo = await this.workgroupApi.getWorkgroupInfo(request.user);
6666

6767
// Check if user is cluster admin
6868
if (workgroupInfo.isClusterAdmin) {
@@ -76,7 +76,7 @@ export class Api {
7676

7777
if (!hasAccess) {
7878
return apiError({
79-
res,
79+
response,
8080
code: 403,
8181
error: `Access denied. You do not have permission to view activities for namespace '${namespace}'.`,
8282
});
@@ -86,7 +86,7 @@ export class Api {
8686
} catch (err) {
8787
console.error('Error checking namespace access:', err);
8888
return apiError({
89-
res,
89+
response,
9090
code: 500,
9191
error: 'Unable to verify namespace access permissions',
9292
});

components/centraldashboard/app/api.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ export class Api {
3232
* - Are a cluster admin
3333
* - Are in basic auth mode (non-identity aware clusters)
3434
*/
35-
private async checkNamespaceAccess(req: Request, res: Response, next: NextFunction) {
36-
const namespace = req.params.namespace;
35+
private async checkNamespaceAccess(request: Request, response: Response, next: NextFunction) {
36+
const namespace = request.params.namespace;
3737
if (!namespace) {
3838
return apiError({
39-
res,
39+
response,
4040
code: 400,
4141
error: 'Namespace parameter is required',
4242
});
@@ -48,22 +48,22 @@ export class Api {
4848
}
4949

5050
// If no user is attached to request, deny access
51-
if (!req.user) {
51+
if (!request.user) {
5252
return apiError({
53-
res,
53+
response,
5454
code: 401,
5555
error: 'Authentication required to access namespace activities',
5656
});
5757
}
5858

5959
try {
6060
// For non-authenticated users in basic auth mode, allow access
61-
if (!req.user.hasAuth) {
61+
if (!request.user.hasAuth) {
6262
return next();
6363
}
6464

6565
// Get user's workgroup information
66-
const workgroupInfo = await this.workgroupApi.getWorkgroupInfo(req.user);
66+
const workgroupInfo = await this.workgroupApi.getWorkgroupInfo(request.user);
6767

6868
// Check if user is cluster admin
6969
if (workgroupInfo.isClusterAdmin) {
@@ -77,7 +77,7 @@ export class Api {
7777

7878
if (!hasAccess) {
7979
return apiError({
80-
res,
80+
response,
8181
code: 403,
8282
error: `Access denied. You do not have permission to view activities for namespace '${namespace}'.`,
8383
});
@@ -87,7 +87,7 @@ export class Api {
8787
} catch (err) {
8888
console.error('Error checking namespace access:', err);
8989
return apiError({
90-
res,
90+
response,
9191
code: 500,
9292
error: 'Unable to verify namespace access permissions',
9393
});

0 commit comments

Comments
 (0)