1
0
mirror of https://github.com/bitwarden/web synced 2025-12-21 18:53:38 +00:00

user canAccessPremium checks

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

View File

@@ -9,7 +9,7 @@ import {
import { ApiService } from 'jslib/abstractions/api.service';
import { MessagingService } from 'jslib/abstractions/messaging.service';
import { TokenService } from 'jslib/abstractions/token.service';
import { UserService } from 'jslib/abstractions/user.service';
import { TwoFactorProviders } from 'jslib/services/auth.service';
@@ -38,16 +38,16 @@ export class TwoFactorSetupComponent implements OnInit {
organizationId: string;
providers: any[] = [];
premium: boolean;
canAccessPremium: boolean;
loading = true;
private modal: ModalComponent = null;
constructor(protected apiService: ApiService, protected tokenService: TokenService,
constructor(protected apiService: ApiService, protected userService: UserService,
protected componentFactoryResolver: ComponentFactoryResolver, protected messagingService: MessagingService) { }
async ngOnInit() {
this.premium = this.tokenService.getPremium();
this.canAccessPremium = await this.userService.canAccessPremium();
for (const key in TwoFactorProviders) {
if (!TwoFactorProviders.hasOwnProperty(key)) {
@@ -128,8 +128,7 @@ export class TwoFactorSetupComponent implements OnInit {
}
async premiumRequired() {
const premium = await this.tokenService.getPremium();
if (!premium) {
if (!this.canAccessPremium) {
this.messagingService.send('premiumRequired');
return;
}