From 42dbdb0043842810fb084370f886bd2ea9406b9f Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 29 Aug 2018 09:21:27 -0400
Subject: [PATCH] allow attachments if can access premium

---
 src/angular/components/attachments.component.ts | 8 ++++----
 src/angular/components/view.component.ts        | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/angular/components/attachments.component.ts b/src/angular/components/attachments.component.ts
index c4b287c94c..b24c7fd11e 100644
--- a/src/angular/components/attachments.component.ts
+++ b/src/angular/components/attachments.component.ts
@@ -12,7 +12,7 @@ import { CipherService } from '../../abstractions/cipher.service';
 import { CryptoService } from '../../abstractions/crypto.service';
 import { I18nService } from '../../abstractions/i18n.service';
 import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
-import { TokenService } from '../../abstractions/token.service';
+import { UserService } from '../../abstractions/user.service';
 
 import { Cipher } from '../../models/domain/cipher';
 
@@ -33,7 +33,7 @@ export class AttachmentsComponent implements OnInit {
 
     constructor(protected cipherService: CipherService, protected analytics: Angulartics2,
         protected toasterService: ToasterService, protected i18nService: I18nService,
-        protected cryptoService: CryptoService, protected tokenService: TokenService,
+        protected cryptoService: CryptoService, protected userService: UserService,
         protected platformUtilsService: PlatformUtilsService, protected win: Window) { }
 
     async ngOnInit() {
@@ -41,8 +41,8 @@ export class AttachmentsComponent implements OnInit {
         this.cipher = await this.cipherDomain.decrypt();
 
         this.hasUpdatedKey = await this.cryptoService.hasEncKey();
-        const isPremium = this.tokenService.getPremium();
-        this.canAccessAttachments = isPremium || this.cipher.organizationId != null;
+        const canAccessPremium = await this.userService.canAccessPremium();
+        this.canAccessAttachments = canAccessPremium || this.cipher.organizationId != null;
 
         if (!this.canAccessAttachments) {
             const confirmed = await this.platformUtilsService.showDialog(
diff --git a/src/angular/components/view.component.ts b/src/angular/components/view.component.ts
index fbb1b16053..240384d8f5 100644
--- a/src/angular/components/view.component.ts
+++ b/src/angular/components/view.component.ts
@@ -38,7 +38,6 @@ export class ViewComponent implements OnDestroy, OnInit {
     cipher: CipherView;
     showPassword: boolean;
     showCardCode: boolean;
-    isPremium: boolean;
     canAccessPremium: boolean;
     totpCode: string;
     totpCodeFormatted: string;
@@ -83,8 +82,6 @@ export class ViewComponent implements OnDestroy, OnInit {
 
         const cipher = await this.cipherService.get(this.cipherId);
         this.cipher = await cipher.decrypt();
-
-        this.isPremium = this.tokenService.getPremium();
         this.canAccessPremium = await this.userService.canAccessPremium();
 
         if (this.cipher.type === CipherType.Login && this.cipher.login.totp &&
@@ -161,7 +158,7 @@ export class ViewComponent implements OnDestroy, OnInit {
             return;
         }
 
-        if (this.cipher.organizationId == null && !this.isPremium) {
+        if (this.cipher.organizationId == null && !this.canAccessPremium) {
             this.toasterService.popAsync('error', this.i18nService.t('premiumRequired'),
                 this.i18nService.t('premiumRequiredDesc'));
             return;