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

Allow import to organization (#325)

Browse Source 
* Allow import to organization vaults

* Use organization-aware Importer
This commit is contained in:
Matt Gibson
2021-06-16 08:50:29 -05:00
committed by GitHub
parent 5a377f8ef9
commit 17ab740914
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/commands/import.command.ts
View File

@@ -1,5 +1,6 @@
import * as program from 'commander';
import { ImportService } from 'jslib-common/abstractions/import.service';
import { UserService } from 'jslib-common/abstractions/user.service';
import { Response } from 'jslib-node/cli/models/response';
import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse';
@@ -7,17 +8,30 @@ import { MessageResponse } from 'jslib-node/cli/models/response/messageResponse'
import { CliUtils } from '../utils';
export class ImportCommand {
constructor(private importService: ImportService) { }
constructor(private importService: ImportService, private userService: UserService) { }
async run(format: string, filepath: string, options: program.OptionValues): Promise<Response> {
const organizationId = options.organizationid;
if (organizationId != null) {
const organization = await this.userService.getOrganization(organizationId);
if (organization == null) {
return Response.badRequest(`You do not belong to an organization with the ID of ${organizationId}. Check the organization ID and sync your vault.`);
}
if (!organization.canAccessImportExport) {
return Response.badRequest('You are not authorized to import into the provided organization.');
}
}
if (options.formats || false) {
return this.list();
return await this.list();
} else {
return this.import(format, filepath);
return await this.import(format, filepath, organizationId);
}
}
private async import(format: string, filepath: string) {
private async import(format: string, filepath: string, organizationId: string) {
if (format == null || format === '') {
return Response.badRequest('`format` was not provided.');
}
@@ -25,7 +39,7 @@ export class ImportCommand {
return Response.badRequest('`filepath` was not provided.');
}
const importer = await this.importService.getImporter(format, null);
const importer = await this.importService.getImporter(format, organizationId);
if (importer === null) {
return Response.badRequest('Proper importer type required.');
}
@@ -36,7 +50,7 @@ export class ImportCommand {
return Response.badRequest('Import file was empty.');
}
const err = await this.importService.import(importer, contents, null);
const err = await this.importService.import(importer, contents, organizationId);
if (err != null) {
return Response.badRequest(err.message);
}