bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 09:43:23 +00:00
Code Issues Releases Wiki Activity

refactor req/res models

Browse Source
This commit is contained in:
Kyle Spearrin
2018-05-15 12:18:47 -04:00
parent 1d3ed93bff
commit 07cc64c0b8
25 changed files with 363 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,8 @@ import { FolderService } from 'jslib/services/folder.service';
import { Response } from '../models/response';
import { CipherRequest } from '../models/request/cipherRequest';
import { FolderRequest } from '../models/request/folderRequest';
import { Cipher } from '../models/cipher';
import { Folder } from '../models/folder';
export class CreateCommand {
constructor(private cipherService: CipherService, private folderService: FolderService) { }
@@ -30,8 +30,8 @@ export class CreateCommand {
}
}
private async createCipher(req: CipherRequest) {
const cipher = await this.cipherService.encrypt(CipherRequest.toView(req));
private async createCipher(req: Cipher) {
const cipher = await this.cipherService.encrypt(Cipher.toView(req));
try {
await this.cipherService.saveWithServer(cipher);
return Response.success();
@@ -40,8 +40,8 @@ export class CreateCommand {
}
}
private async createFolder(req: FolderRequest) {
const folder = await this.folderService.encrypt(FolderRequest.toView(req));
private async createFolder(req: Folder) {
const folder = await this.folderService.encrypt(Folder.toView(req));
try {
await this.folderService.saveWithServer(folder);
return Response.success();

12
src/commands/edit.command.ts
View File

@@ -5,8 +5,8 @@ import { FolderService } from 'jslib/services/folder.service';
import { Response } from '../models/response';
import { CipherRequest } from '../models/request/cipherRequest';
import { FolderRequest } from '../models/request/folderRequest';
import { Cipher } from '../models/cipher';
import { Folder } from '../models/folder';
export class EditCommand {
constructor(private cipherService: CipherService, private folderService: FolderService) { }
@@ -30,14 +30,14 @@ export class EditCommand {
}
}
private async editCipher(id: string, req: CipherRequest) {
private async editCipher(id: string, req: Cipher) {
const cipher = await this.cipherService.get(id);
if (cipher == null) {
return Response.notFound();
}
let cipherView = await cipher.decrypt();
cipherView = CipherRequest.toView(req, cipherView);
cipherView = Cipher.toView(req, cipherView);
const encCipher = await this.cipherService.encrypt(cipherView);
try {
await this.cipherService.saveWithServer(encCipher);
@@ -47,14 +47,14 @@ export class EditCommand {
}
}
private async editFolder(id: string, req: FolderRequest) {
private async editFolder(id: string, req: Folder) {
const folder = await this.folderService.get(id);
if (folder == null) {
return Response.notFound();
}
let folderView = await folder.decrypt();
folderView = FolderRequest.toView(req, folderView);
folderView = Folder.toView(req, folderView);
const encFolder = await this.folderService.encrypt(folderView);
try {
await this.folderService.saveWithServer(encFolder);

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

@@ -14,13 +14,13 @@ import { FolderResponse } from '../models/response/folderResponse';
import { StringResponse } from '../models/response/stringResponse';
import { TemplateResponse } from '../models/response/templateResponse';
import { CardRequest } from '../models/request/cardRequest';
import { CipherRequest } from '../models/request/cipherRequest';
import { FieldRequest } from '../models/request/fieldRequest';
import { IdentityRequest } from '../models/request/identityRequest';
import { LoginRequest } from '../models/request/loginRequest';
import { LoginUriRequest } from '../models/request/loginUriRequest';
import { SecureNoteRequest } from '../models/request/secureNoteRequest';
import { Card } from '../models/card';
import { Cipher } from '../models/cipher';
import { Field } from '../models/field';
import { Identity } from '../models/identity';
import { Login } from '../models/login';
import { LoginUri } from '../models/loginUri';
import { SecureNote } from '../models/secureNote';
export class GetCommand {
constructor(private cipherService: CipherService, private folderService: FolderService,
@@ -104,25 +104,25 @@ export class GetCommand {
let template: any = null;
switch (id.toLowerCase()) {
case 'item':
template = CipherRequest.template();
template = Cipher.template();
break;
case 'field':
template = FieldRequest.template();
template = Field.template();
break;
case 'login':
template = LoginRequest.template();
template = Login.template();
break;
case 'loginuri':
template = LoginUriRequest.template();
template = LoginUri.template();
break;
case 'card':
template = CardRequest.template();
template = Card.template();
break;
case 'identity':
template = IdentityRequest.template();
template = Identity.template();
break;
case 'securenote':
template = SecureNoteRequest.template();
template = SecureNote.template();
break;
default:
return Response.badRequest('Unknown template object.');