From cfe3d9ae5f1529139ca336335202420d2f415b4d Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 29 Aug 2018 09:22:24 -0400
Subject: [PATCH] attachments accessible if can access premium

---
 jslib                          | 2 +-
 src/commands/create.command.ts | 8 ++++----
 src/commands/delete.command.ts | 8 ++++----
 src/commands/get.command.ts    | 8 +++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/jslib b/jslib
index 81c21418ec9..42dbdb00438 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 81c21418ec965221b4d322008f9da0ab7b9037d0
+Subproject commit 42dbdb0043842810fb084370f886bd2ea9406b9f
diff --git a/src/commands/create.command.ts b/src/commands/create.command.ts
index 69fd8e54116..086370c7115 100644
--- a/src/commands/create.command.ts
+++ b/src/commands/create.command.ts
@@ -5,7 +5,7 @@ import * as path from 'path';
 import { CipherService } from 'jslib/abstractions/cipher.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { FolderService } from 'jslib/abstractions/folder.service';
-import { TokenService } from 'jslib/abstractions/token.service';
+import { UserService } from 'jslib/abstractions/user.service';
 
 import { Response } from '../models/response';
 import { CipherResponse } from '../models/response/cipherResponse';
@@ -18,7 +18,7 @@ import { CliUtils } from '../utils';
 
 export class CreateCommand {
     constructor(private cipherService: CipherService, private folderService: FolderService,
-        private tokenService: TokenService, private cryptoService: CryptoService) { }
+        private userService: UserService, private cryptoService: CryptoService) { }
 
     async run(object: string, requestJson: string, cmd: program.Command): Promise<Response> {
         let req: any = null;
@@ -82,8 +82,8 @@ export class CreateCommand {
             return Response.notFound();
         }
 
-        if (cipher.organizationId == null && !this.tokenService.getPremium()) {
-            return Response.error('A premium membership is required to use this feature.');
+        if (cipher.organizationId == null && !(await this.userService.canAccessPremium())) {
+            return Response.error('Premium status is required to use this feature.');
         }
 
         const encKey = await this.cryptoService.getEncKey();
diff --git a/src/commands/delete.command.ts b/src/commands/delete.command.ts
index abfecdc008c..73f2e31868e 100644
--- a/src/commands/delete.command.ts
+++ b/src/commands/delete.command.ts
@@ -2,13 +2,13 @@ import * as program from 'commander';
 
 import { CipherService } from 'jslib/abstractions/cipher.service';
 import { FolderService } from 'jslib/abstractions/folder.service';
-import { TokenService } from 'jslib/abstractions/token.service';
+import { UserService } from 'jslib/abstractions/user.service';
 
 import { Response } from '../models/response';
 
 export class DeleteCommand {
     constructor(private cipherService: CipherService, private folderService: FolderService,
-        private tokenService: TokenService) { }
+        private userService: UserService) { }
 
     async run(object: string, id: string, cmd: program.Command): Promise<Response> {
         if (id != null) {
@@ -61,8 +61,8 @@ export class DeleteCommand {
             return Response.error('Attachment `' + id + '` was not found.');
         }
 
-        if (cipher.organizationId == null && !this.tokenService.getPremium()) {
-            return Response.error('A premium membership is required to use this feature.');
+        if (cipher.organizationId == null && !(await this.userService.canAccessPremium())) {
+            return Response.error('Premium status is required to use this feature.');
         }
 
         try {
diff --git a/src/commands/get.command.ts b/src/commands/get.command.ts
index 910c12bbbd8..f850903f50a 100644
--- a/src/commands/get.command.ts
+++ b/src/commands/get.command.ts
@@ -9,7 +9,6 @@ import { CollectionService } from 'jslib/abstractions/collection.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { FolderService } from 'jslib/abstractions/folder.service';
 import { SearchService } from 'jslib/abstractions/search.service';
-import { TokenService } from 'jslib/abstractions/token.service';
 import { TotpService } from 'jslib/abstractions/totp.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
@@ -44,8 +43,7 @@ export class GetCommand {
     constructor(private cipherService: CipherService, private folderService: FolderService,
         private collectionService: CollectionService, private totpService: TotpService,
         private auditService: AuditService, private cryptoService: CryptoService,
-        private tokenService: TokenService, private userService: UserService,
-        private searchService: SearchService) { }
+        private userService: UserService, private searchService: SearchService) { }
 
     async run(object: string, id: string, cmd: program.Command): Promise<Response> {
         if (id != null) {
@@ -231,10 +229,10 @@ export class GetCommand {
             return Response.multipleResults(attachments.map((a) => a.id));
         }
 
-        if (!this.tokenService.getPremium()) {
+        if (!(await this.userService.canAccessPremium())) {
             const originalCipher = await this.cipherService.get(cipher.id);
             if (originalCipher == null || originalCipher.organizationId == null) {
-                return Response.error('A premium membership is required to use this feature.');
+                return Response.error('Premium status is required to use this feature.');
             }
         }