Skip to content

Correct PrinciplaType for multiple extension of User models #3679

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

Closed
akki-ng wants to merge 1 commit into from
Closed

Correct PrinciplaType for multiple extension of User models #3679

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
4 changes: 3 additions & 1 deletion lib/access-context.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ function AccessContext(context) {
var token = this.accessToken || {};

if (token.userId) {
this.addPrincipal(Principal.USER, token.userId);
var userPrincipalType =
(this.accessToken && this.accessToken.principalType) || Principal.USER;
Copy link
Member

@bajtos bajtos Feb 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can be shortened by using token instead of accessToken?

Also please use const instead of var in new code - see http://loopback.io/doc/en/contrib/style-guide.html#variable-declarations

const userPrincipalType = token.principalType || Principal.USER;

Copy link
Author

@akki-ng akki-ng Feb 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll complete the patch soon.

this.addPrincipal(userPrincipalType, token.userId);
Copy link
Member

@bajtos bajtos Feb 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akki-ng

This change looks very reasonable to me 👍 and I am ok with landing it as an incremental improvement.

However, I need you to add a test that fails on the current master, passes with your fix in place - this will verify your fix and prevent regressions in the future.

Copy link
Author

@akki-ng akki-ng Mar 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bajtos Please follow on #3823

}
if (token.appId) {
this.addPrincipal(Principal.APPLICATION, token.appId);
Expand Down