Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update the authorization technique to check if user role matches ite … #489

Merged
merged 1 commit into from
Feb 16, 2024
Merged

update the authorization technique to check if user role matches ite … #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions backend/src/application/constants/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ export const tokenExpiresIn = 3600000;
export enum Role {
ADMIN = 'ADMIN',
USER = 'USER',
GUEST = 'CLIENT',
CLIENT = 'CLIENT',
SUPERADMIN = 'SUPERADMIN',
}

export const RoleOrder: Record<Role, number> = {
[Role.GUEST]: 1,
[Role.CLIENT]: 1,
[Role.USER]: 2,
[Role.ADMIN]: 3,
[Role.SUPERADMIN]: 4,
};

export const ROLE_KEY = 'role';
4 changes: 2 additions & 2 deletions backend/src/infrastructure/data_access/repositories/schemas/singleclient.schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose';
import { BaseDocument } from '../../../database';
import { ISingleClientData } from '../models/singleclient-model.interface';
import { SingleClientStatus } from '../../../../application/constants/constants';
import { Role, SingleClientStatus } from '../../../../application/constants/constants';

export type SingleClientDocument = SingleClientDataModel & Document;

Expand All @@ -29,7 +29,7 @@ export class SingleClientDataModel extends BaseDocument implements ISingleClient
@Prop({ type: String, required: true })
passwordHash: string;

@Prop({ type: String, default: 'admin' })
@Prop({ type: String, enum: Object.values(Role), default: Role.USER })
role: string;

@Prop({ type: Boolean, default: false })
Expand Down
13 changes: 9 additions & 4 deletions backend/src/shared/services/access_control.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,19 @@ export class AccessControlService implements IAccessControlService {
}

public isAuthorized({ currentRole, requiredRole }: IIsAuthorizedProps): boolean {
let authorized = false;
let isAuthorized = false;
for (const hierarchy of this.hierarchies) {
const priority = hierarchy.get(currentRole);
const requirePriority = hierarchy.get(requiredRole);
if (priority && requirePriority && priority >= requirePriority) {
authorized = true;
if (priority && requirePriority) {
if (priority >= requirePriority) {
isAuthorized = true;
}
if (priority === requirePriority) {
isAuthorized = true;
}
}
}
return authorized;
return isAuthorized;
}
}
Loading