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

Rework/33 #20

Merged
merged 11 commits into from
Mar 4, 2022
Merged

Rework/33 #20

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
25e8ab9
remove unnecessary display:block
andyeschultheiss86 Mar 3, 2022
7064f5e
showing header while editing now
andyeschultheiss86 Mar 3, 2022
4fb97e4
add appropriate guard for disclaimer
andyeschultheiss86 Mar 3, 2022
d66b41e
remove unused getUserCallback function
andyeschultheiss86 Mar 3, 2022
e44438f
custom-page-access-guard WIP
andyeschultheiss86 Mar 3, 2022
931c56d
Merge branch 'develop' into rework/33
andyeschultheiss86 Mar 3, 2022
6cb57da
custom-page-access-guard working!
andyeschultheiss86 Mar 3, 2022
99ec1e4
minor rename
andyeschultheiss86 Mar 3, 2022
d9a506e
Because we need to await promise results for our roles, we need an as…
Mackulus Mar 3, 2022
6a9c76a
Merge branch 'rework/33' of https://github.com/sitkatech/nebula into …
Mackulus Mar 3, 2022
37455e7
remove unused imports and send it home
andyeschultheiss86 Mar 4, 2022
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: 2 additions & 2 deletions Source/Nebula.Web/src/app/shared/guards/custom-page-access-guard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class CustomPageAccessGuard implements CanActivate {
let vanityUrl = next.paramMap.get("vanity-url");
let viewableRoleIDs = Array<number>();
if (vanityUrl) {
viewableRoleIDs = await this.getCustomPageRolesByVanityUrl(vanityUrl);
viewableRoleIDs = await this.getCustomPageRoleIDsByVanityUrl(vanityUrl);
if (!this.authenticationService.isCurrentUserNullOrUndefined()) {
if (this.authenticationService.doesCurrentUserHaveOneOfTheseRoles(viewableRoleIDs)) {
return true;
Expand All @@ -46,7 +46,7 @@ export class CustomPageAccessGuard implements CanActivate {
return false;
}

async getCustomPageRolesByVanityUrl(vanityUrl: string): Promise<Array<number>> {
async getCustomPageRoleIDsByVanityUrl(vanityUrl: string): Promise<Array<number>> {

return new Promise((resolve, reject) => {

Expand Down