bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

user canAccessPremium checks

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-28 23:17:58 -04:00
parent 1873ce41b6
commit 41ff511165
9 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/vault/vault.component.ts
View File

@@ -90,7 +90,7 @@ export class VaultComponent implements OnInit, OnDestroy {
this.showBrowserOutdated = window.navigator.userAgent.indexOf('MSIE') !== -1;
const hasEncKey = await this.cryptoService.hasEncKey();
this.showUpdateKey = !hasEncKey;
const isPremium = await this.tokenService.getPremium();
const canAccessPremium = await this.userService.canAccessPremium();
this.route.queryParams.subscribe(async (params) => {
await this.syncService.fullSync(false);
@@ -116,8 +116,8 @@ export class VaultComponent implements OnInit, OnDestroy {
this.organizationsComponent.load(),
]);
this.showPremiumCallout = !this.showVerifyEmail && !isPremium &&
!this.platformUtilsService.isSelfHost() && !(await this.inOrgWithPremium());
this.showPremiumCallout = !this.showVerifyEmail && !canAccessPremium &&
!this.platformUtilsService.isSelfHost();
if (params == null) {
this.groupingsComponent.selectedAll = true;
@@ -475,14 +475,4 @@ export class VaultComponent implements OnInit, OnDestroy {
const url = this.router.createUrlTree(['vault'], { queryParams: queryParams }).toString();
this.location.go(url);
}
private async inOrgWithPremium() {
const orgs = await this.userService.getAllOrganizations();
for (let i = 0; i < orgs.length; i++) {
if (orgs[i].usersGetPremium) {
return true;
}
}
return false;
}
}