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.

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

User permissions #2147

Merged
merged 33 commits into from
May 18, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
cd06fc5
WIP Permissions
KlapTrap May 3, 2018
972e0bf
Added base role and permission effects and reducers
KlapTrap May 4, 2018
222a9bb
Ensure roles are tidied up when we know the current user doesn't have…
KlapTrap May 4, 2018
b1a1fd5
Fix role generation
KlapTrap May 4, 2018
b07bf32
Created role selectors
KlapTrap May 4, 2018
0c4ef72
Merge branch 'v2-master' into user-permissions
KlapTrap May 4, 2018
c13bb97
Tidy up and get endpoint and internal app admin roles from verify call
KlapTrap May 4, 2018
4acdbdc
Tests
KlapTrap May 8, 2018
6a2d9ca
More tests
KlapTrap May 8, 2018
28202a1
Add add application permission check
KlapTrap May 8, 2018
204e216
Added space edit delete permission checks
KlapTrap May 9, 2018
7fbe490
Added feature flag permissions
KlapTrap May 9, 2018
ce59ca0
Ensure isAdmin check happens first
KlapTrap May 9, 2018
6b5cf57
Return user scopes in info call
nwmac May 10, 2018
e1f9cc1
Added permissions directive and some tidy up
KlapTrap May 10, 2018
9777f54
Hide meta card menu if none are shown and added global checks to the …
KlapTrap May 10, 2018
c791c66
Split the permission check code into it's own class and added a few c…
KlapTrap May 10, 2018
d32fa4a
Added user scopes into the user roles state
KlapTrap May 14, 2018
525de1d
WIP read-only user checks and scope checks
KlapTrap May 14, 2018
86145f5
Simplify logic
KlapTrap May 14, 2018
ec427f3
Added unit tests
KlapTrap May 15, 2018
f522a02
Fixed linting
KlapTrap May 15, 2018
80c0ea9
Removed test code
KlapTrap May 16, 2018
896ea90
Merge branch 'v2-master' into user-permissions
KlapTrap May 16, 2018
cb12adc
Fixing tests
KlapTrap May 16, 2018
4214d71
Removing fdescribe
KlapTrap May 16, 2018
36c60b2
Fixed issues found on initial review
KlapTrap May 16, 2018
f09f8a9
Use correct stratos admin scope when finding if current user is a admin
KlapTrap May 16, 2018
ccb9d40
Removed more unused code
KlapTrap May 17, 2018
302ba21
Fix backend unit test
nwmac May 17, 2018
eec2e09
Backend unit test fix
nwmac May 17, 2018
f292540
Merge branch 'v2-master' into user-permissions
KlapTrap May 17, 2018
c20663e
Fixed tests
KlapTrap May 18, 2018
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
Prev Previous commit
Fixed tests
  • Loading branch information
KlapTrap committed May 18, 2018
commit c20663e058446e445924c894747f8d17dc08b96e
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
</button>
<mat-menu class="meta-card__header__popup" #menu="matMenu">
<ng-container *ngFor="let menuItem of _actionMenu">
<button class="meta-card__header__popup__btn" [disabled]="_menuItem.disabled | async" mat-menu-item *ngIf="menuItem.can | async"
(click)="menuItem.action()">
<button class="meta-card__header__popup__btn" [disabled]="menuItem.disabled | async" mat-menu-item *ngIf="menuItem.can | async" (click)="menuItem.action()">
<mat-icon *ngIf="menuItem.icon">{{menuItem.icon}}</mat-icon>
<span>{{menuItem.label}}</span>
</button>
Expand All @@ -26,4 +25,4 @@
</span>
</div>
</mat-card-content>
</mat-card>
</mat-card>
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ describe('CfOrgCardComponent', () => {
});

it('should create', () => {

expect(component).toBeTruthy();
});
});