Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/authenticator/passport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class PassportAuthenticator implements ServiceAuthenticator {
return this.authenticator;
}

public getRoles(req: express.Request): Array<string> {
public async getRoles(req: express.Request): Promise<Array<string>> {
const roleKey = this.options.rolesKey || 'roles';
return _.castArray(_.get(req.user, roleKey, []));
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/model/server-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export interface ServiceAuthenticator {
/**
* Get the user list of roles.
*/
getRoles: (req: express.Request) => Array<string>;
getRoles: (req: express.Request) => Promise<Array<string>>;
/**
* Initialize the authenticator
*/
Expand Down
23 changes: 13 additions & 10 deletions src/server/server-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,16 +351,19 @@ export class ServerContainer {
}

private buildAuthMiddleware(authenticator: ServiceAuthenticator, roles: Array<string>): express.RequestHandler {
return (req: Request, res: Response, next: NextFunction) => {
const requestRoles = authenticator.getRoles(req);
if (this.debugger.runtime.enabled) {
this.debugger.runtime('Validating authentication roles: <%j>.', requestRoles);
}
if (requestRoles.some((role: string) => roles.indexOf(role) >= 0)) {
next();
}
else {
throw new Errors.ForbiddenError();
return async (req: Request, res: Response, next: NextFunction) => {
try {
const requestRoles = await authenticator.getRoles(req);
if (this.debugger.runtime.enabled) {
this.debugger.runtime('Validating authentication roles: <%j>.', requestRoles);
}
if (requestRoles.some((role: string) => roles.indexOf(role) >= 0)) {
next();
} else {
throw new Errors.ForbiddenError();
}
} catch (err) {
next(err);
}
};
}
Expand Down