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

Extract API logic from FolderService to FolderApiService (#3011)

Browse Source
This commit is contained in:
Oscar Hinton
2022-07-08 15:40:31 +02:00
committed by GitHub
parent 41275d4776
commit f79c4f0c65
46 changed files with 212 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/cli/src/bw.ts
View File

@@ -4,6 +4,7 @@ import * as path from "path";
import * as program from "commander";
import * as jsdom from "jsdom";
import { InternalFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { ClientType } from "@bitwarden/common/enums/clientType";
import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions";
import { LogLevelType } from "@bitwarden/common/enums/logLevelType";
@@ -21,7 +22,8 @@ import { EncryptService } from "@bitwarden/common/services/encrypt.service";
import { EnvironmentService } from "@bitwarden/common/services/environment.service";
import { ExportService } from "@bitwarden/common/services/export.service";
import { FileUploadService } from "@bitwarden/common/services/fileUpload.service";
import { FolderService } from "@bitwarden/common/services/folder.service";
import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.service";
import { FolderService } from "@bitwarden/common/services/folder/folder.service";
import { ImportService } from "@bitwarden/common/services/import.service";
import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
@@ -73,7 +75,7 @@ export class Main {
environmentService: EnvironmentService;
settingsService: SettingsService;
cipherService: CipherService;
folderService: FolderService;
folderService: InternalFolderService;
collectionService: CollectionService;
vaultTimeoutService: VaultTimeoutService;
syncService: SyncService;
@@ -101,6 +103,7 @@ export class Main {
organizationService: OrganizationService;
providerService: ProviderService;
twoFactorService: TwoFactorService;
folderApiService: FolderApiService;
constructor() {
let p = null;
@@ -197,12 +200,13 @@ export class Main {
this.folderService = new FolderService(
this.cryptoService,
this.apiService,
this.i18nService,
this.cipherService,
this.stateService
);
this.folderApiService = new FolderApiService(this.folderService, this.apiService);
this.collectionService = new CollectionService(
this.cryptoService,
this.i18nService,
@@ -293,6 +297,7 @@ export class Main {
this.stateService,
this.organizationService,
this.providerService,
this.folderApiService,
async (expired: boolean) => await this.logout()
);

8
apps/cli/src/commands/create.command.ts
View File

@@ -4,7 +4,8 @@ import * as path from "path";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { Utils } from "@bitwarden/common/misc/utils";
import { CipherExport } from "@bitwarden/common/models/export/cipherExport";
@@ -26,7 +27,8 @@ export class CreateCommand {
private folderService: FolderService,
private stateService: StateService,
private cryptoService: CryptoService,
private apiService: ApiService
private apiService: ApiService,
private folderApiService: FolderApiServiceAbstraction
) {}
async run(
@@ -148,7 +150,7 @@ export class CreateCommand {
private async createFolder(req: FolderExport) {
const folder = await this.folderService.encrypt(FolderExport.toView(req));
try {
await this.folderService.saveWithServer(folder);
await this.folderApiService.save(folder);
const newFolder = await this.folderService.get(folder.id);
const decFolder = await newFolder.decrypt();
const res = new FolderResponse(decFolder);

8
apps/cli/src/commands/delete.command.ts
View File

@@ -1,6 +1,7 @@
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { StateService } from "@bitwarden/common/abstractions/state.service";
import { Utils } from "@bitwarden/common/misc/utils";
import { Response } from "@bitwarden/node/cli/models/response";
@@ -12,7 +13,8 @@ export class DeleteCommand {
private cipherService: CipherService,
private folderService: FolderService,
private stateService: StateService,
private apiService: ApiService
private apiService: ApiService,
private folderApiService: FolderApiServiceAbstraction
) {}
async run(object: string, id: string, cmdOptions: Record<string, any>): Promise<Response> {
@@ -92,7 +94,7 @@ export class DeleteCommand {
}
try {
await this.folderService.deleteWithServer(id);
await this.folderApiService.delete(id);
return Response.success();
} catch (e) {
return Response.error(e);

8
apps/cli/src/commands/edit.command.ts
View File

@@ -1,7 +1,8 @@
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { FolderApiServiceAbstraction } from "@bitwarden/common/abstractions/folder/folder-api.service.abstraction";
import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { Utils } from "@bitwarden/common/misc/utils";
import { CipherExport } from "@bitwarden/common/models/export/cipherExport";
import { CollectionExport } from "@bitwarden/common/models/export/collectionExport";
@@ -21,7 +22,8 @@ export class EditCommand {
private cipherService: CipherService,
private folderService: FolderService,
private cryptoService: CryptoService,
private apiService: ApiService
private apiService: ApiService,
private folderApiService: FolderApiServiceAbstraction
) {}
async run(
@@ -125,7 +127,7 @@ export class EditCommand {
folderView = FolderExport.toView(req, folderView);
const encFolder = await this.folderService.encrypt(folderView);
try {
await this.folderService.saveWithServer(encFolder);
await this.folderApiService.save(encFolder);
const updatedFolder = await this.folderService.get(folder.id);
const decFolder = await updatedFolder.decrypt();
const res = new FolderResponse(decFolder);

2
apps/cli/src/commands/get.command.ts
View File

@@ -3,7 +3,7 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { OrganizationService } from "@bitwarden/common/abstractions/organization.service";
import { SearchService } from "@bitwarden/common/abstractions/search.service";
import { StateService } from "@bitwarden/common/abstractions/state.service";

2
apps/cli/src/commands/list.command.ts
View File

@@ -1,7 +1,7 @@
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
import { OrganizationService } from "@bitwarden/common/abstractions/organization.service";
import { SearchService } from "@bitwarden/common/abstractions/search.service";
import { Utils } from "@bitwarden/common/misc/utils";

9
apps/cli/src/commands/serve.command.ts
View File

@@ -79,13 +79,15 @@ export class ServeCommand {
this.main.folderService,
this.main.stateService,
this.main.cryptoService,
this.main.apiService
this.main.apiService,
this.main.folderApiService
);
this.editCommand = new EditCommand(
this.main.cipherService,
this.main.folderService,
this.main.cryptoService,
this.main.apiService
this.main.apiService,
this.main.folderApiService
);
this.generateCommand = new GenerateCommand(
this.main.passwordGenerationService,
@@ -102,7 +104,8 @@ export class ServeCommand {
this.main.cipherService,
this.main.folderService,
this.main.stateService,
this.main.apiService
this.main.apiService,
this.main.folderApiService
);
this.confirmCommand = new ConfirmCommand(this.main.apiService, this.main.cryptoService);
this.restoreCommand = new RestoreCommand(this.main.cipherService);

9
apps/cli/src/vault.program.ts
View File

@@ -229,7 +229,8 @@ export class VaultProgram extends Program {
this.main.folderService,
this.main.stateService,
this.main.cryptoService,
this.main.apiService
this.main.apiService,
this.main.folderApiService
);
const response = await command.run(object, encodedJson, cmd);
this.processResponse(response);
@@ -272,7 +273,8 @@ export class VaultProgram extends Program {
this.main.cipherService,
this.main.folderService,
this.main.cryptoService,
this.main.apiService
this.main.apiService,
this.main.folderApiService
);
const response = await command.run(object, id, encodedJson, cmd);
this.processResponse(response);
@@ -314,7 +316,8 @@ export class VaultProgram extends Program {
this.main.cipherService,
this.main.folderService,
this.main.stateService,
this.main.apiService
this.main.apiService,
this.main.folderApiService
);
const response = await command.run(object, id, cmd);
this.processResponse(response);