updates to status command and add hidePasswords (#146)

* a few updates to the recent status addition

* add hidePasswords functionality

jslib

@@ -1 +1 @@
-Subproject commit 212a2e3745e6e0e2b3057ed308c47daf6aeefbc8
+Subproject commit 28d21ca5dfacd1487cd92345d8be9554079fbd96

src/commands/create.command.ts

@@ -149,7 +149,7 @@ export class CreateCommand {
             }
 
             const groups = req.groups == null ? null :
-                req.groups.map((g) => new SelectionReadOnlyRequest(g.id, g.readOnly));
+                req.groups.map((g) => new SelectionReadOnlyRequest(g.id, g.readOnly, g.hidePasswords));
             const request = new CollectionRequest();
             request.name = (await this.cryptoService.encrypt(req.name, orgKey)).encryptedString;
             request.externalId = req.externalId;

src/commands/edit.command.ts

@@ -147,7 +147,7 @@ export class EditCommand {
             }
 
             const groups = req.groups == null ? null :
-                req.groups.map((g) => new SelectionReadOnlyRequest(g.id, g.readOnly));
+                req.groups.map((g) => new SelectionReadOnlyRequest(g.id, g.readOnly, g.hidePasswords));
             const request = new CollectionRequest();
             request.name = (await this.cryptoService.encrypt(req.name, orgKey)).encryptedString;
             request.externalId = req.externalId;

src/commands/get.command.ts

@@ -367,7 +367,7 @@ export class GetCommand {
             decCollection.name = await this.cryptoService.decryptToUtf8(
                 new CipherString(response.name), orgKey);
             const groups = response.groups == null ? null :
-                response.groups.map((g) => new SelectionReadOnly(g.id, g.readOnly));
+                response.groups.map((g) => new SelectionReadOnly(g.id, g.readOnly, g.hidePasswords));
             const res = new OrganizationCollectionResponse(decCollection, groups);
             return Response.success(res);
         } catch (e) {

src/commands/status.command.ts

@@ -1,15 +1,17 @@
 import * as program from 'commander';
 
-import { EnvironmentService, SyncService, UserService, VaultTimeoutService } from 'jslib/abstractions';
+import { EnvironmentService } from 'jslib/abstractions/environment.service';
+import { SyncService } from 'jslib/abstractions/sync.service';
+import { UserService } from 'jslib/abstractions/user.service';
+import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
+
 import { Response } from 'jslib/cli/models/response';
+
 import { TemplateResponse } from '../models/response/templateResponse';
 
 export class StatusCommand {
-    constructor(
+    constructor(private envService: EnvironmentService, private syncService: SyncService,
-        private envService: EnvironmentService,
+        private userService: UserService, private vaultTimeoutService: VaultTimeoutService) {
-        private syncService: SyncService,
-        private userService: UserService,
-        private vaultTimeoutService: VaultTimeoutService) {
     }
 
     async run(cmd: program.Command): Promise<Response> {
@@ -41,16 +43,12 @@ export class StatusCommand {
     }
 
     private async status(): Promise<string> {
-        const isAuthed = await this.userService.isAuthenticated();
+        const authed = await this.userService.isAuthenticated();
-        if (!isAuthed) {
+        if (!authed) {
             return 'unauthenticated';
         }
 
         const isLocked = await this.vaultTimeoutService.isLocked();
-        if (isLocked) {
+        return isLocked ? 'locked' : 'unlocked';
-            return 'locked';
-        } else {
-            return 'unlocked';
-        }
     }
 }

src/models/selectionReadOnly.ts

@@ -1,13 +1,15 @@
 export class SelectionReadOnly {
     static template(): SelectionReadOnly {
-        return new SelectionReadOnly('00000000-0000-0000-0000-000000000000', false);
+        return new SelectionReadOnly('00000000-0000-0000-0000-000000000000', false, false);
     }
 
     id: string;
     readOnly: boolean;
+    hidePasswords: boolean;
 
-    constructor(id: string, readOnly: boolean) {
+    constructor(id: string, readOnly: boolean, hidePasswords: boolean) {
         this.id = id;
         this.readOnly = readOnly;
+        this.hidePasswords = hidePasswords || false;
     }
 }

src/program.ts

@@ -699,10 +699,12 @@ export class Program extends BaseProgram {
                 writeLn('      "status": "locked"');
                 writeLn('    }');
                 writeLn('');
-                writeLn('  The "status" is one of "unauthenticated", "locked", "unlocked":');
+                writeLn('  Notes:');
-                writeLn('    - "unauthenticated" when you are not logged in');
+                writeLn('');
-                writeLn('    - "locked" when you are logged in and the vault is locked');
+                writeLn('  `status` is one of:');
-                writeLn('    - "unlocked" when you are logged in and the vault is unlocked');
+                writeLn('    - `unauthenticated` when you are not logged in');
+                writeLn('    - `locked` when you are logged in and the vault is locked');
+                writeLn('    - `unlocked` when you are logged in and the vault is unlocked');
                 writeLn('', true);
             })
             .action(async (cmd: program.Command) => {