bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 00:03:56 +00:00
Code Issues Releases Wiki Activity

restructure attachment commands

Browse Source
This commit is contained in:
Kyle Spearrin
2018-05-17 15:55:44 -04:00
parent 0a518a96b1
commit c0422ec77f
9 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands/create.command.ts
View File

@@ -8,7 +8,6 @@ import { FolderService } from 'jslib/services/folder.service';
import { Response } from '../models/response';
import { StringResponse } from '../models/response/stringResponse';
import { Attachment } from '../models/attachment';
import { Cipher } from '../models/cipher';
import { Folder } from '../models/folder';
@@ -72,7 +71,8 @@ export class CreateCommand {
// TODO: premium and key check
const cipher = await this.cipherService.get(cmd.itemid);
const itemId = cmd.itemid.toLowerCase();
const cipher = await this.cipherService.get(itemId);
if (cipher == null) {
return Response.notFound();
}

30
src/commands/delete.command.ts
View File

@@ -15,11 +15,9 @@ export class DeleteCommand {
switch (object.toLowerCase()) {
case 'item':
if (cmd.attachmentid == null || cmd.attachmentid === '') {
return await this.deleteCipher(id);
} else {
return await this.deleteAttachment(id, cmd.attachmentid);
}
return await this.deleteCipher(id);
case 'attachment':
return await this.deleteAttachment(id, cmd);
case 'folder':
return await this.deleteFolder(id);
default:
@@ -41,30 +39,28 @@ export class DeleteCommand {
}
}
private async deleteAttachment(id: string, attachmentId: string) {
attachmentId = attachmentId.toLowerCase();
private async deleteAttachment(id: string, cmd: program.Command) {
if (cmd.itemid == null || cmd.itemid === '') {
return Response.badRequest('--itemid <itemid> required.');
}
const encCipher = await this.cipherService.get(id);
if (encCipher == null) {
const itemId = cmd.itemid.toLowerCase();
const cipher = await this.cipherService.get(itemId);
if (cipher == null) {
return Response.notFound();
}
const cipher = await encCipher.decrypt();
if (cipher.attachments == null || cipher.attachments.length === 0) {
return Response.error('No attachments available for this item.');
}
const attachments = cipher.attachments.filter((a) =>
a.id.toLowerCase() === attachmentId || a.fileName.toLowerCase() === attachmentId);
const attachments = cipher.attachments.filter((a) => a.id.toLowerCase() === id);
if (attachments.length === 0) {
return Response.error('Attachment `' + attachmentId + '` was not found.');
}
if (attachments.length > 1) {
return Response.multipleResults(attachments.map((a) => a.id));
return Response.error('Attachment `' + id + '` was not found.');
}
try {
await this.cipherService.deleteAttachmentWithServer(id, attachments[0].id);
await this.cipherService.deleteAttachmentWithServer(cipher.id, attachments[0].id);
return Response.success();
} catch (e) {
return Response.error(e);

27
src/commands/get.command.ts
View File

@@ -22,7 +22,6 @@ import { MessageResponse } from '../models/response/messageResponse';
import { StringResponse } from '../models/response/stringResponse';
import { TemplateResponse } from '../models/response/templateResponse';
import { Attachment } from '../models/attachment';
import { Card } from '../models/card';
import { Cipher } from '../models/cipher';
import { Collection } from '../models/collection';
@@ -47,11 +46,7 @@ export class GetCommand {
switch (object.toLowerCase()) {
case 'item':
if (cmd.attachmentid == null || cmd.attachmentid === '') {
return await this.getCipher(id);
} else {
return await this.getAttachment(id, cmd.attachmentid, cmd);
}
return await this.getCipher(id);
case 'username':
return await this.getUsername(id);
case 'password':
@@ -62,6 +57,8 @@ export class GetCommand {
return await this.getTotp(id);
case 'exposed':
return await this.getExposed(id);
case 'attachment':
return await this.getAttachment(id, cmd);
case 'folder':
return await this.getFolder(id);
case 'collection':
@@ -192,12 +189,15 @@ export class GetCommand {
return Response.success(res);
}
private async getAttachment(id: string, attachmentId: string, cmd: program.Command) {
attachmentId = attachmentId.toLowerCase();
private async getAttachment(id: string, cmd: program.Command) {
if (cmd.itemid == null || cmd.itemid === '') {
return Response.badRequest('--itemid <itemid> required.');
}
// TODO: Premium check
const cipherResponse = await this.getCipher(id);
const itemId = cmd.itemid.toLowerCase();
const cipherResponse = await this.getCipher(itemId);
if (!cipherResponse.success) {
return cipherResponse;
}
@@ -207,10 +207,10 @@ export class GetCommand {
return Response.error('No attachments available for this item.');
}
const attachments = cipher.attachments.filter((a) =>
a.id.toLowerCase() === attachmentId || a.fileName.toLowerCase() === attachmentId);
const attachments = cipher.attachments.filter((a) => a.id.toLowerCase() === id ||
(a.fileName != null && a.fileName.toLowerCase().indexOf(id) > -1));
if (attachments.length === 0) {
return Response.error('Attachment `' + attachmentId + '` was not found.');
return Response.error('Attachment `' + id + '` was not found.');
}
if (attachments.length > 1) {
return Response.multipleResults(attachments.map((a) => a.id));
@@ -316,9 +316,6 @@ export class GetCommand {
case 'securenote':
template = SecureNote.template();
break;
case 'attachment':
template = Attachment.template();
break;
case 'folder':
template = Folder.template();
break;

21
src/models/attachment.ts
View File

@@ -1,21 +0,0 @@
import { AttachmentView } from 'jslib/models/view/attachmentView';
export class Attachment {
static template(): Attachment {
const req = new Attachment();
req.fileName = 'photo.jpg';
return req;
}
static toView(req: Attachment, view = new AttachmentView()) {
view.fileName = req.fileName;
return view;
}
fileName: string;
// Use build method instead of ctor so that we can control order of JSON stringify for pretty print
build(o: AttachmentView) {
this.fileName = o.fileName;
}
}

8
src/models/response/attachmentResponse.ts
View File

@@ -1,17 +1,15 @@
import { AttachmentView } from 'jslib/models/view/attachmentView';
import { Attachment } from '../attachment';
export class AttachmentResponse extends Attachment {
export class AttachmentResponse {
id: string;
fileName: string;
size: number;
sizeName: string;
url: string;
constructor(o: AttachmentView) {
super();
this.id = o.id;
this.build(o);
this.fileName = o.fileName;
this.size = o.size;
this.sizeName = o.sizeName;
this.url = o.url;

20
src/program.ts
View File

@@ -225,7 +225,7 @@ export class Program {
program
.command('get <object> <id>')
.description('Get an object.')
.option('--attachmentid <attachmentid>', 'Get an item\'s attachment.')
.option('--itemid <itemid>', 'Attachment\'s item id.')
.option('--output <output>', 'Output directory or filename for attachment.')
.on('--help', () => {
writeLn('\n Objects:');
@@ -236,13 +236,14 @@ export class Program {
writeLn(' uri');
writeLn(' totp');
writeLn(' exposed');
writeLn(' attachment');
writeLn(' folder');
writeLn(' collection');
writeLn(' template');
writeLn('');
writeLn(' Id:');
writeLn('');
writeLn(' Search term or GUID.');
writeLn(' Search term or object\'s globally unique `id`.');
writeLn('');
writeLn(' Examples:');
writeLn('');
@@ -250,8 +251,9 @@ export class Program {
writeLn(' bw get password https://google.com');
writeLn(' bw get totp google.com');
writeLn(' bw get exposed yahoo.com');
writeLn(' bw get item google --attachmentid b857igwl1dzrs2 --output ./photo.jpg');
writeLn(' bw get item google --attachmentid photo.jpg --raw');
writeLn(' bw get attachment b857igwl1dzrs2 --itemid 99ee88d2-6046-4ea7-92c2-acac464b1412 ' +
'--output ./photo.jpg');
writeLn(' bw get attachment photo.jpg --itemid 99ee88d2-6046-4ea7-92c2-acac464b1412 --raw');
writeLn(' bw get folder email');
writeLn(' bw get template folder');
writeLn('');
@@ -306,7 +308,7 @@ export class Program {
writeLn('');
writeLn(' Id:');
writeLn('');
writeLn(' Must be a GUID.');
writeLn(' Must be object\'s globally unique `id`.');
writeLn('');
writeLn(' Notes:');
writeLn('');
@@ -328,24 +330,24 @@ export class Program {
program
.command('delete <object> <id>')
.option('--attachmentid <attachmentid>', 'Delete an item\'s attachment.')
.option('--itemid <itemid>', 'Attachment\'s item id.')
.description('Delete an object.')
.on('--help', () => {
writeLn('\n Objects:');
writeLn('');
writeLn(' item');
writeLn(' attachment');
writeLn(' folder');
writeLn('');
writeLn(' Id:');
writeLn('');
writeLn(' Must be a GUID.');
writeLn(' Must be object\'s globally unique `id`.');
writeLn('');
writeLn(' Examples:');
writeLn('');
writeLn(' bw delete item 7063feab-4b10-472e-b64c-785e2b870b92');
writeLn(' bw delete folder 5cdfbd80-d99f-409b-915b-f4c5d0241b02');
writeLn(' bw delete item 310d5ffd-e9a2-4451-af87-ea054dce0f78 --attachmentid b857igwl1dzrs2');
writeLn(' bw delete item 310d5ffd-e9a2-4451-af87-ea054dce0f78 --attachmentid photo.jpg');
writeLn(' bw delete attachment b857igwl1dzrs2 --itemid 310d5ffd-e9a2-4451-af87-ea054dce0f78');
writeLn('');
})
.action(async (object, id, cmd) => {