1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +01:00

org collection create and get template

This commit is contained in:
Kyle Spearrin 2019-09-25 16:08:56 -04:00
parent 3915e43435
commit d2ef504b40
7 changed files with 83 additions and 3 deletions

2
jslib

@ -1 +1 @@
Subproject commit b74ee7b3ee823a820854623cc32c8522a09e9f4d
Subproject commit 971e19335f66ac64845b65a7bcf688811f60eaff

View File

@ -2,24 +2,33 @@ import * as program from 'commander';
import * as fs from 'fs';
import * as path from 'path';
import { ApiService } from 'jslib/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service';
import { FolderService } from 'jslib/abstractions/folder.service';
import { UserService } from 'jslib/abstractions/user.service';
import { Cipher } from 'jslib/models/export/cipher';
import { Collection } from 'jslib/models/export/collection';
import { Folder } from 'jslib/models/export/folder';
import { CollectionRequest } from 'jslib/models/request/collectionRequest';
import { SelectionReadOnlyRequest } from 'jslib/models/request/selectionReadOnlyRequest';
import { Response } from 'jslib/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse';
import { FolderResponse } from '../models/response/folderResponse';
import { OrganizationCollectionResponse } from '../models/response/organizationCollectionResponse';
import { OrganizationCollectionRequest } from '../models/request/organizationCollectionRequest';
import { CliUtils } from '../utils';
export class CreateCommand {
constructor(private cipherService: CipherService, private folderService: FolderService,
private userService: UserService, private cryptoService: CryptoService) { }
private userService: UserService, private cryptoService: CryptoService,
private apiService: ApiService) { }
async run(object: string, requestJson: string, cmd: program.Command): Promise<Response> {
let req: any = null;
@ -47,6 +56,8 @@ export class CreateCommand {
return await this.createAttachment(cmd);
case 'folder':
return await this.createFolder(req);
case 'org-collection':
return await this.createOrganizationCollection(req);
default:
return Response.badRequest('Unknown object.');
}
@ -118,4 +129,25 @@ export class CreateCommand {
return Response.error(e);
}
}
private async createOrganizationCollection(req: OrganizationCollectionRequest) {
try {
const orgKey = await this.cryptoService.getOrgKey(req.organizationId);
if (orgKey == null) {
throw new Error('No encryption key for this organization.');
}
const groups = req.groups == null ? null :
req.groups.map((g) => new SelectionReadOnlyRequest(g.id, g.readOnly));
const request = new CollectionRequest();
request.name = (await this.cryptoService.encrypt(req.name, orgKey)).encryptedString;
request.externalId = req.externalId;
request.groups = groups;
await this.apiService.postCollection(req.organizationId, request);
const res = new OrganizationCollectionResponse(Collection.toView(req), groups);
return Response.success(res);
} catch (e) {
return Response.error(e);
}
}
}

View File

@ -39,6 +39,8 @@ import { FolderResponse } from '../models/response/folderResponse';
import { OrganizationResponse } from '../models/response/organizationResponse';
import { TemplateResponse } from '../models/response/templateResponse';
import { OrganizationCollectionRequest } from '../models/request/organizationCollectionRequest';
import { CliUtils } from '../utils';
import { Utils } from 'jslib/misc/utils';
@ -383,6 +385,9 @@ export class GetCommand {
case 'item-collections':
template = ['collection-id1', 'collection-id2'];
break;
case 'org-collection':
template = OrganizationCollectionRequest.template();
break;
default:
return Response.badRequest('Unknown template object.');
}

View File

@ -0,0 +1,16 @@
import { Collection } from 'jslib/models/export/collection';
import { SelectionReadOnly } from '../selectionReadOnly';
export class OrganizationCollectionRequest extends Collection {
static template(): OrganizationCollectionRequest {
const req = new OrganizationCollectionRequest();
req.organizationId = '00000000-0000-0000-0000-000000000000';
req.name = 'Collection name';
req.externalId = null;
req.groups = [SelectionReadOnly.template(), SelectionReadOnly.template()];
return req;
}
groups: SelectionReadOnly[];
}

View File

@ -0,0 +1,14 @@
import { CollectionView } from 'jslib/models/view/collectionView';
import { SelectionReadOnly } from '../selectionReadOnly';
import { CollectionResponse } from './collectionResponse';
export class OrganizationCollectionResponse extends CollectionResponse {
groups: SelectionReadOnly[];
constructor(o: CollectionView, groups: SelectionReadOnly[]) {
super(o);
this.groups = groups;
}
}

View File

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

View File

@ -334,7 +334,7 @@ export class Program extends BaseProgram {
.action(async (object, encodedJson, cmd) => {
await this.exitIfLocked();
const command = new CreateCommand(this.main.cipherService, this.main.folderService,
this.main.userService, this.main.cryptoService);
this.main.userService, this.main.cryptoService, this.main.apiService);
const response = await command.run(object, encodedJson, cmd);
this.processResponse(response);
});