bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 00:33:44 +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;