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

Simplify send templates (#237)

Browse Source 
* Simplify Send templates

* Fix internal template reference

* No trailing whitespace
This commit is contained in:
Matt Gibson
2021-02-26 12:47:11 -06:00
committed by GitHub
parent 2c11e5d6a9
commit e77e1c94e8
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,8 @@ import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse'; import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib/cli/models/response/stringResponse';
import { SendType } from 'jslib/enums/sendType';
import { CipherResponse } from '../models/response/cipherResponse'; import { CipherResponse } from '../models/response/cipherResponse';
import { CollectionResponse } from '../models/response/collectionResponse'; import { CollectionResponse } from '../models/response/collectionResponse';
import { FolderResponse } from '../models/response/folderResponse'; import { FolderResponse } from '../models/response/folderResponse';
@@ -430,14 +432,11 @@ export class GetCommand extends DownloadCommand {
case 'org-collection': case 'org-collection':
template = OrganizationCollectionRequest.template(); template = OrganizationCollectionRequest.template();
break; break;
case 'send':
template = SendResponse.template();
break;
case 'send.text': case 'send.text':
template = SendTextResponse.template(); template = SendResponse.template(SendType.Text);
break; break;
case 'send.file': case 'send.file':
template = SendFileResponse.template(); template = SendResponse.template(SendType.File);
break; break;
default: default:
return Response.badRequest('Unknown template object.'); return Response.badRequest('Unknown template object.');

6
src/models/response/sendResponse.ts
View File

@@ -14,13 +14,13 @@ const dateProperties: string[] = [Utils.nameOf<SendResponse>('deletionDate'), Ut
export class SendResponse implements BaseResponse { export class SendResponse implements BaseResponse {
static template(deleteInDays = 7): SendResponse { static template(sendType?: SendType, deleteInDays = 7): SendResponse {
const req = new SendResponse(); const req = new SendResponse();
req.name = 'Send name'; req.name = 'Send name';
req.notes = 'Some notes about this send.'; req.notes = 'Some notes about this send.';
req.type = SendType.Text; req.type = SendType.Text;
req.text = null; req.text = sendType === SendType.Text ? SendTextResponse.template() : null;
req.file = null; req.file = sendType === SendType.File ? SendFileResponse.template() : null;
req.maxAccessCount = null; req.maxAccessCount = null;
req.deletionDate = this.getStandardDeletionDate(deleteInDays); req.deletionDate = this.getStandardDeletionDate(deleteInDays);
req.expirationDate = null; req.expirationDate = null;

2
src/send.program.ts
View File

@@ -251,7 +251,7 @@ export class SendProgram extends Program {
sendText = SendTextResponse.template(data, options.hidden); sendText = SendTextResponse.template(data, options.hidden);
} }
const template = Utils.assign(SendResponse.template(options.deleteInDays), { const template = Utils.assign(SendResponse.template(null, options.deleteInDays), {
name: options.name ?? name, name: options.name ?? name,
notes: options.notes, notes: options.notes,
file: sendFile, file: sendFile,