bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-13 06:54:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'km/pm-18017/show-key-connector-domain' into km/pm-18017/show-key-connector-domain-for-new-sso-users

Browse Source
This commit is contained in:
Maciej Zieniuk
2025-04-11 12:15:08 +01:00
parent cd96bb93ae db0ee9bb71
commit 7c30bdb70d
7 changed files with 51 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/cli/src/key-management/convert-to-key-connector.command.spec.ts
View File

@@ -130,7 +130,10 @@ describe("ConvertToKeyConnectorCommand", () => {
expect(response).not.toBeNull();
expect(response.success).toEqual(true);
expect(keyConnectorService.migrateUser).toHaveBeenCalledWith(userId);
expect(keyConnectorService.migrateUser).toHaveBeenCalledWith(
organization.keyConnectorUrl,
userId,
);
expect(environmentService.setEnvironment).toHaveBeenCalledWith(Region.SelfHosted, {
keyConnector: organization.keyConnectorUrl,
} as Urls);

2
apps/cli/src/key-management/convert-to-key-connector.command.ts
View File

@@ -64,7 +64,7 @@ export class ConvertToKeyConnectorCommand {
if (answer.convert === "remove") {
try {
await this.keyConnectorService.migrateUser(this.userId);
await this.keyConnectorService.migrateUser(organization.keyConnectorUrl, this.userId);
} catch (e) {
await this.logout();
throw e;