Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-12-05 09:14:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge 7ef801ab7b into d32365fbba

Browse Source
This commit is contained in:
Thomas Avery 2025-12-05 01:32:00 +01:00 committed by GitHub
commit 1dc3e151f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 496 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
apps/browser/src/_locales/en/messages.json
View File

@ -3240,9 +3240,6 @@
"copyCustomFieldNameNotUnique": {
"message": "No unique identifier found."
},
"removeMasterPasswordForOrganizationUserKeyConnector": {
"message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
},
"organizationName": {
"message": "Organization name"
},
@ -5879,6 +5876,45 @@
"cardNumberLabel": {
"message": "Card number"
},
"removeMasterPasswordForOrgUserKeyConnector":{
"message": "Your organization is no longer using master passwords to log into Bitwarden. To continue, verify the organization and domain."
},
"continueWithLogIn": {
"message": "Continue with log in"
},
"doNotContinue": {
"message": "Do not continue"
},
"domain": {
"message": "Domain"
},
"keyConnectorDomainTooltip": {
"message": "This domain will store your account encryption keys, so make sure you trust it. If you're not sure, check with your admin."
},
"verifyYourOrganization": {
"message": "Verify your organization to log in"
},
"organizationVerified":{
"message": "Organization verified"
},
"domainVerified":{
"message": "Domain verified"
},
"leaveOrganizationContent": {
"message": "If you don't verify your organization, your access to the organization will be revoked."
},
"leaveNow": {
"message": "Leave now"
},
"verifyYourDomainToLogin": {
"message": "Verify your domain to log in"
},
"verifyYourDomainDescription": {
"message": "To continue with log in, verify this domain."
},
"confirmKeyConnectorOrganizationUserDescription": {
"message": "To continue with log in, verify the organization and domain."
},
"sessionTimeoutSettingsAction": {
"message": "Timeout action"
}

51
apps/browser/src/key-management/key-connector/remove-password.component.html
View File

@ -1,51 +0,0 @@
<popup-page>
<popup-header slot="header" pageTitle="{{ 'removeMasterPassword' | i18n }}">
<ng-container slot="end">
<app-pop-out></app-pop-out>
</ng-container>
</popup-header>
@if (loading) {
<div class="tw-text-center">
<i
class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
title="{{ 'loading' | i18n }}"
aria-hidden="true"
></i>
<span class="tw-sr-only">{{ "loading" | i18n }}</span>
</div>
} @else {
<p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
<p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
<p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
<p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
<p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
<button
type="button"
bitButton
buttonType="primary"
block
(click)="convert()"
[disabled]="action"
class="tw-mb-2"
>
<i
class="bwi bwi-spinner bwi-spin"
title="{{ 'loading' | i18n }}"
aria-hidden="true"
*ngIf="continuing"
></i>
{{ "removeMasterPassword" | i18n }}
</button>
<button type="button" bitButton block (click)="leave()" [disabled]="action">
<i
class="bwi bwi-spinner bwi-spin"
title="{{ 'loading' | i18n }}"
aria-hidden="true"
*ngIf="leaving"
></i>
{{ "leaveOrganization" | i18n }}
</button>
}
</popup-page>

14
apps/browser/src/key-management/key-connector/remove-password.component.ts
View File

@ -1,14 +0,0 @@
// FIXME (PM-22628): angular imports are forbidden in background
// eslint-disable-next-line no-restricted-imports
import { Component } from "@angular/core";
import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "app-remove-password",
templateUrl: "remove-password.component.html",
standalone: false,
})
export class RemovePasswordComponent extends BaseRemovePasswordComponent {}

24
apps/browser/src/popup/app-routing.module.ts
View File

@ -43,7 +43,11 @@ import {
TwoFactorAuthGuard,
} from "@bitwarden/auth/angular";
import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
import { LockComponent, ConfirmKeyConnectorDomainComponent } from "@bitwarden/key-management-ui";
import {
LockComponent,
ConfirmKeyConnectorDomainComponent,
RemovePasswordComponent,
} from "@bitwarden/key-management-ui";
import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
import { AuthExtensionRoute } from "../auth/popup/constants/auth-extension-route.constant";
@ -59,7 +63,6 @@ import { NotificationsSettingsComponent } from "../autofill/popup/settings/notif
import { PremiumV2Component } from "../billing/popup/settings/premium-v2.component";
import { PhishingWarning } from "../dirt/phishing-detection/popup/phishing-warning.component";
import { ProtectedByComponent } from "../dirt/phishing-detection/popup/protected-by-component";
import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
import BrowserPopupUtils from "../platform/browser/browser-popup-utils";
import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service";
import { RouteCacheOptions } from "../platform/services/popup-view-cache-background.service";
@ -188,9 +191,22 @@ const routes: Routes = [
},
{
path: "remove-password",
component: RemovePasswordComponent,
component: ExtensionAnonLayoutWrapperComponent,
canActivate: [authGuard],
data: { elevation: 1 } satisfies RouteDataProperties,
children: [
{
path: "",
component: RemovePasswordComponent,
data: {
pageTitle: {
key: "verifyYourOrganization",
},
showBackButton: false,
pageIcon: LockIcon,
} satisfies ExtensionAnonLayoutWrapperData,
},
],
},
{
path: "view-cipher",
@ -646,7 +662,7 @@ const routes: Routes = [
component: ConfirmKeyConnectorDomainComponent,
data: {
pageTitle: {
key: "confirmKeyConnectorDomain",
key: "verifyYourOrganization",
},
showBackButton: true,
pageIcon: DomainIcon,

9
apps/browser/src/popup/app.module.ts
View File

@ -28,7 +28,6 @@ import { CurrentAccountComponent } from "../auth/popup/account-switching/current
import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
import { AutofillComponent } from "../autofill/popup/settings/autofill.component";
import { NotificationsSettingsComponent } from "../autofill/popup/settings/notifications.component";
import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
import { PopOutComponent } from "../platform/popup/components/pop-out.component";
import { PopupFooterComponent } from "../platform/popup/layout/popup-footer.component";
import { PopupHeaderComponent } from "../platform/popup/layout/popup-header.component";
@ -85,13 +84,7 @@ import "../platform/popup/locales";
CalloutModule,
LinkModule,
],
declarations: [
AppComponent,
ColorPasswordPipe,
ColorPasswordCountPipe,
TabsV2Component,
RemovePasswordComponent,
],
declarations: [AppComponent, ColorPasswordPipe, ColorPasswordCountPipe, TabsV2Component],
exports: [CalloutModule],
providers: [CurrencyPipe, DatePipe],
bootstrap: [AppComponent],

25
apps/desktop/src/app/app-routing.module.ts
View File

@ -42,10 +42,13 @@ import {
} from "@bitwarden/auth/angular";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
import { LockComponent, ConfirmKeyConnectorDomainComponent } from "@bitwarden/key-management-ui";
import {
LockComponent,
ConfirmKeyConnectorDomainComponent,
RemovePasswordComponent,
} from "@bitwarden/key-management-ui";
import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
import { VaultV2Component } from "../vault/app/vault/vault-v2.component";
import { VaultComponent } from "../vault/app/vault-v3/vault.component";
@ -114,11 +117,6 @@ const routes: Routes = [
component: SendComponent,
canActivate: [authGuard],
},
{
path: "remove-password",
component: RemovePasswordComponent,
canActivate: [authGuard],
},
{
path: "passkeys",
component: Fido2PlaceholderComponent,
@ -320,13 +318,24 @@ const routes: Routes = [
pageIcon: LockIcon,
} satisfies AnonLayoutWrapperData,
},
{
path: "remove-password",
component: RemovePasswordComponent,
canActivate: [authGuard],
data: {
pageTitle: {
key: "verifyYourOrganization",
},
pageIcon: LockIcon,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
},
{
path: "confirm-key-connector-domain",
component: ConfirmKeyConnectorDomainComponent,
canActivate: [],
data: {
pageTitle: {
key: "confirmKeyConnectorDomain",
key: "verifyYourOrganization",
},
pageIcon: DomainIcon,
} satisfies RouteDataProperties & AnonLayoutWrapperData,

2
apps/desktop/src/app/app.module.ts
View File

@ -15,7 +15,6 @@ import { DeleteAccountComponent } from "../auth/delete-account.component";
import { LoginModule } from "../auth/login/login.module";
import { SshAgentService } from "../autofill/services/ssh-agent.service";
import { PremiumComponent } from "../billing/app/accounts/premium.component";
import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module";
import { VaultV2Component } from "../vault/app/vault/vault-v2.component";
@ -50,7 +49,6 @@ import { SharedModule } from "./shared/shared.module";
ColorPasswordCountPipe,
HeaderComponent,
PremiumComponent,
RemovePasswordComponent,
SearchComponent,
],
providers: [SshAgentService],

20
apps/desktop/src/key-management/key-connector/remove-password.component.html
View File

@ -1,20 +0,0 @@
<div id="remove-password-page" *ngIf="!loading">
<div class="content">
<h1>{{ "removeMasterPassword" | i18n }}</h1>
<p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
<p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
<p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
<p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
<p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
<div class="buttons">
<button type="submit" class="btn primary block" [disabled]="action" (click)="convert()">
<b [hidden]="continuing">{{ "removeMasterPassword" | i18n }}</b>
<i class="bwi bwi-spinner bwi-spin" [hidden]="!continuing" aria-hidden="true"></i>
</button>
<button type="button" class="btn secondary block" [disabled]="action" (click)="leave()">
<b [hidden]="leaving">{{ "leaveOrganization" | i18n }}</b>
<i class="bwi bwi-spinner bwi-spin" [hidden]="!leaving" aria-hidden="true"></i>
</button>
</div>
</div>
</div>

12
apps/desktop/src/key-management/key-connector/remove-password.component.ts
View File

@ -1,12 +0,0 @@
import { Component } from "@angular/core";
import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "app-remove-password",
templateUrl: "remove-password.component.html",
standalone: false,
})
export class RemovePasswordComponent extends BaseRemovePasswordComponent {}

42
apps/desktop/src/locales/en/messages.json
View File

@ -2619,9 +2619,6 @@
"removedMasterPassword": {
"message": "Master password removed"
},
"removeMasterPasswordForOrganizationUserKeyConnector": {
"message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
},
"organizationName": {
"message": "Organization name"
},
@ -4250,6 +4247,45 @@
"upgradeToPremium": {
"message": "Upgrade to Premium"
},
"removeMasterPasswordForOrgUserKeyConnector":{
"message": "Your organization is no longer using master passwords to log into Bitwarden. To continue, verify the organization and domain."
},
"continueWithLogIn": {
"message": "Continue with log in"
},
"doNotContinue": {
"message": "Do not continue"
},
"domain": {
"message": "Domain"
},
"keyConnectorDomainTooltip": {
"message": "This domain will store your account encryption keys, so make sure you trust it. If you're not sure, check with your admin."
},
"verifyYourOrganization": {
"message": "Verify your organization to log in"
},
"organizationVerified":{
"message": "Organization verified"
},
"domainVerified":{
"message": "Domain verified"
},
"leaveOrganizationContent": {
"message": "If you don't verify your organization, your access to the organization will be revoked."
},
"leaveNow": {
"message": "Leave now"
},
"verifyYourDomainToLogin": {
"message": "Verify your domain to log in"
},
"verifyYourDomainDescription": {
"message": "To continue with log in, verify this domain."
},
"confirmKeyConnectorOrganizationUserDescription": {
"message": "To continue with log in, verify the organization and domain."
},
"sessionTimeoutSettingsAction": {
"message": "Timeout action"
},

37
apps/web/src/app/key-management/key-connector/remove-password.component.html
View File

@ -1,37 +0,0 @@
<div *ngIf="loading" class="tw-text-center">
<i
class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
title="{{ 'loading' | i18n }}"
aria-hidden="true"
></i>
<span class="tw-sr-only">{{ "loading" | i18n }}</span>
</div>
<div *ngIf="!loading">
<p>{{ "removeMasterPasswordForOrganizationUserKeyConnector" | i18n }}</p>
<p class="tw-mb-0">{{ "organizationName" | i18n }}:</p>
<p class="tw-text-muted tw-mb-6">{{ organization.name }}</p>
<p class="tw-mb-0">{{ "keyConnectorDomain" | i18n }}:</p>
<p class="tw-text-muted tw-mb-6">{{ organization.keyConnectorUrl }}</p>
<button
bitButton
type="button"
buttonType="primary"
class="tw-w-full tw-mb-2"
[bitAction]="convert"
[block]="true"
>
{{ "removeMasterPassword" | i18n }}
</button>
<button
bitButton
type="button"
buttonType="secondary"
class="tw-w-full"
[bitAction]="leave"
[block]="true"
>
{{ "leaveOrganization" | i18n }}
</button>
</div>

12
apps/web/src/app/key-management/key-connector/remove-password.component.ts
View File

@ -1,12 +0,0 @@
import { Component } from "@angular/core";
import { RemovePasswordComponent as BaseRemovePasswordComponent } from "@bitwarden/key-management-ui";
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "app-remove-password",
templateUrl: "remove-password.component.html",
standalone: false,
})
export class RemovePasswordComponent extends BaseRemovePasswordComponent {}

11
apps/web/src/app/oss-routing.module.ts
View File

@ -51,7 +51,7 @@ import {
import { canAccessEmergencyAccess } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
import { LockComponent } from "@bitwarden/key-management-ui";
import { LockComponent, RemovePasswordComponent } from "@bitwarden/key-management-ui";
import { premiumInterestRedirectGuard } from "@bitwarden/web-vault/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard";
import { flagEnabled, Flags } from "../utils/flags";
@ -79,7 +79,6 @@ import { EnvironmentSelectorComponent } from "./components/environment-selector/
import { RouteDataProperties } from "./core";
import { ReportsModule } from "./dirt/reports";
import { ConfirmKeyConnectorDomainComponent } from "./key-management/key-connector/confirm-key-connector-domain.component";
import { RemovePasswordComponent } from "./key-management/key-connector/remove-password.component";
import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
import { UserLayoutComponent } from "./layouts/user-layout.component";
import { RequestSMAccessComponent } from "./secrets-manager/secrets-manager-landing/request-sm-access.component";
@ -544,9 +543,9 @@ const routes: Routes = [
canActivate: [authGuard],
data: {
pageTitle: {
key: "removeMasterPassword",
key: "verifyYourOrganization",
},
titleId: "removeMasterPassword",
titleId: "verifyYourOrganization",
pageIcon: LockIcon,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
},
@ -556,9 +555,9 @@ const routes: Routes = [
canActivate: [],
data: {
pageTitle: {
key: "confirmKeyConnectorDomain",
key: "verifyYourOrganization",
},
titleId: "confirmKeyConnectorDomain",
titleId: "verifyYourOrganization",
pageIcon: DomainIcon,
} satisfies RouteDataProperties & AnonLayoutWrapperData,
},

3
apps/web/src/app/shared/loose-components.module.ts
View File

@ -7,7 +7,6 @@ import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.comp
import { FreeBitwardenFamiliesComponent } from "../billing/members/free-bitwarden-families.component";
import { SponsoredFamiliesComponent } from "../billing/settings/sponsored-families.component";
import { SponsoringOrgRowComponent } from "../billing/settings/sponsoring-org-row.component";
import { RemovePasswordComponent } from "../key-management/key-connector/remove-password.component";
import { HeaderModule } from "../layouts/header/header.module";
import { OrganizationBadgeModule } from "../vault/individual-vault/organization-badge/organization-badge.module";
import { PipesModule } from "../vault/individual-vault/pipes/pipes.module";
@ -21,7 +20,6 @@ import { SharedModule } from "./shared.module";
declarations: [
RecoverDeleteComponent,
RecoverTwoFactorComponent,
RemovePasswordComponent,
SponsoredFamiliesComponent,
FreeBitwardenFamiliesComponent,
SponsoringOrgRowComponent,
@ -31,7 +29,6 @@ import { SharedModule } from "./shared.module";
exports: [
RecoverDeleteComponent,
RecoverTwoFactorComponent,
RemovePasswordComponent,
SponsoredFamiliesComponent,
VerifyEmailTokenComponent,
VerifyRecoverDeleteComponent,

42
apps/web/src/locales/en/messages.json
View File

@ -7098,9 +7098,6 @@
"invalidVerificationCode": {
"message": "Invalid verification code"
},
"removeMasterPasswordForOrganizationUserKeyConnector": {
"message": "A master password is no longer required for members of the following organization. Please confirm the domain below with your organization administrator."
},
"keyConnectorDomain": {
"message": "Key Connector domain"
},
@ -12206,6 +12203,45 @@
}
}
},
"removeMasterPasswordForOrgUserKeyConnector":{
"message": "Your organization is no longer using master passwords to log into Bitwarden. To continue, verify the organization and domain."
},
"continueWithLogIn": {
"message": "Continue with log in"
},
"doNotContinue": {
"message": "Do not continue"
},
"domain": {
"message": "Domain"
},
"keyConnectorDomainTooltip": {
"message": "This domain will store your account encryption keys, so make sure you trust it. If you're not sure, check with your admin."
},
"verifyYourOrganization": {
"message": "Verify your organization to log in"
},
"organizationVerified":{
"message": "Organization verified"
},
"domainVerified":{
"message": "Domain verified"
},
"leaveOrganizationContent": {
"message": "If you don't verify your organization, your access to the organization will be revoked."
},
"leaveNow": {
"message": "Leave now"
},
"verifyYourDomainToLogin": {
"message": "Verify your domain to log in"
},
"verifyYourDomainDescription": {
"message": "To continue with log in, verify this domain."
},
"confirmKeyConnectorOrganizationUserDescription": {
"message": "To continue with log in, verify the organization and domain."
},
"confirmNoSelectedCriticalApplicationsTitle": {
"message": "No critical applications are selected"
},

7
libs/angular/src/services/jslib-services.module.ts
View File

@ -184,7 +184,9 @@ import { DefaultChangeKdfApiService } from "@bitwarden/common/key-management/kdf
import { ChangeKdfApiService } from "@bitwarden/common/key-management/kdf/change-kdf-api.service.abstraction";
import { DefaultChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf.service";
import { ChangeKdfService } from "@bitwarden/common/key-management/kdf/change-kdf.service.abstraction";
import { KeyConnectorApiService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector-api.service";
import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
import { DefaultKeyConnectorApiService } from "@bitwarden/common/key-management/key-connector/services/default-key-connector-api.service";
import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/services/key-connector.service";
import { KeyApiService } from "@bitwarden/common/key-management/keys/services/abstractions/key-api-service.abstraction";
import { RotateableKeySetService } from "@bitwarden/common/key-management/keys/services/abstractions/rotateable-key-set.service";
@ -1827,6 +1829,11 @@ const safeProviders: SafeProvider[] = [
useClass: IpcSessionRepository,
deps: [StateProvider],
}),
safeProvider({
provide: KeyConnectorApiService,
useClass: DefaultKeyConnectorApiService,
deps: [ApiServiceAbstraction],
}),
safeProvider({
provide: PremiumInterestStateService,
useClass: NoopPremiumInterestStateService,

1
libs/auth/src/angular/two-factor-auth/two-factor-auth.component.spec.ts
View File

@ -421,6 +421,7 @@ describe("TwoFactorAuthComponent", () => {
keyConnectorUrl:
mockUserDecryptionOpts.noMasterPasswordWithKeyConnector.keyConnectorOption!
.keyConnectorUrl,
organizationSsoIdentifier: "test-sso-id",
}),
);
const authResult = new AuthResult();

7
libs/common/src/key-management/key-connector/abstractions/key-connector-api.service.ts Normal file
View File

@ -0,0 +1,7 @@
import { KeyConnectorConfirmationDetailsResponse } from "../models/response/key-connector-confirmation-details.response";
export abstract class KeyConnectorApiService {
abstract getConfirmationDetails(
orgSsoIdentifier: string,
): Promise<KeyConnectorConfirmationDetailsResponse>;
}

1
libs/common/src/key-management/key-connector/models/key-connector-domain-confirmation.ts
View File

@ -1,3 +1,4 @@
export interface KeyConnectorDomainConfirmation {
keyConnectorUrl: string;
organizationSsoIdentifier: string;
}

10
libs/common/src/key-management/key-connector/models/response/key-connector-confirmation-details.response.ts Normal file
View File

@ -0,0 +1,10 @@
import { BaseResponse } from "../../../../models/response/base.response";
export class KeyConnectorConfirmationDetailsResponse extends BaseResponse {
organizationName: string;
constructor(response: any) {
super(response);
this.organizationName = this.getResponseProperty("OrganizationName");
}
}

54
libs/common/src/key-management/key-connector/services/default-key-connector-api.service.spec.ts Normal file
View File

@ -0,0 +1,54 @@
import { mock, MockProxy } from "jest-mock-extended";
import { ApiService } from "../../../abstractions/api.service";
import { KeyConnectorConfirmationDetailsResponse } from "../models/response/key-connector-confirmation-details.response";
import { DefaultKeyConnectorApiService } from "./default-key-connector-api.service";
describe("DefaultKeyConnectorApiService", () => {
let apiService: MockProxy<ApiService>;
let sut: DefaultKeyConnectorApiService;
beforeEach(() => {
apiService = mock<ApiService>();
sut = new DefaultKeyConnectorApiService(apiService);
});
describe("getConfirmationDetails", () => {
it("encodes orgSsoIdentifier in URL", async () => {
const orgSsoIdentifier = "test org/with special@chars";
const expectedEncodedIdentifier = encodeURIComponent(orgSsoIdentifier);
const mockResponse = {};
apiService.send.mockResolvedValue(mockResponse);
await sut.getConfirmationDetails(orgSsoIdentifier);
expect(apiService.send).toHaveBeenCalledWith(
"GET",
`/accounts/key-connector/confirmation-details/${expectedEncodedIdentifier}`,
null,
true,
true,
);
});
it("returns expected response", async () => {
const orgSsoIdentifier = "test-org";
const expectedOrgName = "example";
const mockResponse = { OrganizationName: expectedOrgName };
apiService.send.mockResolvedValue(mockResponse);
const result = await sut.getConfirmationDetails(orgSsoIdentifier);
expect(result).toBeInstanceOf(KeyConnectorConfirmationDetailsResponse);
expect(result.organizationName).toBe(expectedOrgName);
expect(apiService.send).toHaveBeenCalledWith(
"GET",
"/accounts/key-connector/confirmation-details/test-org",
null,
true,
true,
);
});
});
});

20
libs/common/src/key-management/key-connector/services/default-key-connector-api.service.ts Normal file
View File

@ -0,0 +1,20 @@
import { ApiService } from "../../../abstractions/api.service";
import { KeyConnectorApiService } from "../abstractions/key-connector-api.service";
import { KeyConnectorConfirmationDetailsResponse } from "../models/response/key-connector-confirmation-details.response";
export class DefaultKeyConnectorApiService implements KeyConnectorApiService {
constructor(private apiService: ApiService) {}
async getConfirmationDetails(
orgSsoIdentifier: string,
): Promise<KeyConnectorConfirmationDetailsResponse> {
const r = await this.apiService.send(
"GET",
"/accounts/key-connector/confirmation-details/" + encodeURIComponent(orgSsoIdentifier),
null,
true,
true,
);
return new KeyConnectorConfirmationDetailsResponse(r);
}
}

5
libs/common/src/key-management/key-connector/services/key-connector.service.spec.ts
View File

@ -603,7 +603,10 @@ describe("KeyConnectorService", () => {
const data$ = keyConnectorService.requiresDomainConfirmation$(mockUserId);
const data = await firstValueFrom(data$);
expect(data).toEqual({ keyConnectorUrl: conversion.keyConnectorUrl });
expect(data).toEqual({
keyConnectorUrl: conversion.keyConnectorUrl,
organizationSsoIdentifier: conversion.organizationId,
});
});
it("should return observable of null value when no data is set", async () => {

13
libs/common/src/key-management/key-connector/services/key-connector.service.ts
View File

@ -202,9 +202,16 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
}
requiresDomainConfirmation$(userId: UserId): Observable<KeyConnectorDomainConfirmation | null> {
return this.stateProvider
.getUserState$(NEW_SSO_USER_KEY_CONNECTOR_CONVERSION, userId)
.pipe(map((data) => (data != null ? { keyConnectorUrl: data.keyConnectorUrl } : null)));
return this.stateProvider.getUserState$(NEW_SSO_USER_KEY_CONNECTOR_CONVERSION, userId).pipe(
map((data) =>
data != null
? {
keyConnectorUrl: data.keyConnectorUrl,
organizationSsoIdentifier: data.organizationId,
}
: null,
),
);
}
private handleKeyConnectorError(e: any) {

29
libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.html
View File

@ -8,17 +8,34 @@
<span class="tw-sr-only">{{ "loading" | i18n }}</span>
</div>
} @else {
<div class="tw-mb-4">
<p class="tw-mb-1 tw-text-sm tw-font-medium">{{ "keyConnectorDomain" | i18n }}:</p>
<p class="tw-text-muted tw-break-all">{{ keyConnectorUrl }}</p>
</div>
@if (organizationName) {
<p>{{ "confirmKeyConnectorOrganizationUserDescription" | i18n }}</p>
<p class="tw-mb-0 tw-font-bold">{{ "organization" | i18n }}</p>
<p class="tw-mb-6">{{ organizationName }}</p>
} @else {
<p>{{ "verifyYourDomainDescription" | i18n }}</p>
}
<p class="tw-mb-0 tw-font-bold tw-inline-flex tw-items-center">
{{ "domain" | i18n }}
<button
type="button"
[label]="'keyConnectorDomainTooltip' | i18n"
tooltipPosition="above-center"
bitIconButton="bwi-info-circle"
size="small"
></button>
</p>
<p class="tw-mb-6 tw-font-mono">{{ keyConnectorHostName }}</p>
<div class="tw-flex tw-flex-col tw-gap-2">
<button bitButton type="button" buttonType="primary" [bitAction]="confirm" [block]="true">
{{ "confirm" | i18n }}
{{ "continueWithLogIn" | i18n }}
</button>
<button bitButton type="button" buttonType="secondary" [bitAction]="cancel" [block]="true">
{{ "cancel" | i18n }}
{{ "doNotContinue" | i18n }}
</button>
</div>
}

79
libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.spec.ts
View File

@ -2,13 +2,17 @@ import { Router } from "@angular/router";
import { mock } from "jest-mock-extended";
import { of } from "rxjs";
import { KeyConnectorApiService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector-api.service";
import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
import { KeyConnectorDomainConfirmation } from "@bitwarden/common/key-management/key-connector/models/key-connector-domain-confirmation";
import { KeyConnectorConfirmationDetailsResponse } from "@bitwarden/common/key-management/key-connector/models/response/key-connector-confirmation-details.response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { SyncService } from "@bitwarden/common/platform/sync";
import { mockAccountServiceWith } from "@bitwarden/common/spec";
import { UserId } from "@bitwarden/common/types/guid";
import { AnonLayoutWrapperDataService, ToastService } from "@bitwarden/components";
import { ConfirmKeyConnectorDomainComponent } from "./confirm-key-connector-domain.component";
@ -16,8 +20,10 @@ describe("ConfirmKeyConnectorDomainComponent", () => {
let component: ConfirmKeyConnectorDomainComponent;
const userId = "test-user-id" as UserId;
const expectedHostName = "key-connector-url.com";
const confirmation: KeyConnectorDomainConfirmation = {
keyConnectorUrl: "https://key-connector-url.com",
organizationSsoIdentifier: "org-sso-identifier",
};
const mockRouter = mock<Router>();
@ -25,6 +31,10 @@ describe("ConfirmKeyConnectorDomainComponent", () => {
const mockKeyConnectorService = mock<KeyConnectorService>();
const mockLogService = mock<LogService>();
const mockMessagingService = mock<MessagingService>();
const mockKeyConnectorApiService = mock<KeyConnectorApiService>();
const mockToastService = mock<ToastService>();
const mockI18nService = mock<I18nService>();
const mockAnonLayoutWrapperDataService = mock<AnonLayoutWrapperDataService>();
let mockAccountService = mockAccountServiceWith(userId);
const onBeforeNavigation = jest.fn();
@ -33,6 +43,8 @@ describe("ConfirmKeyConnectorDomainComponent", () => {
mockAccountService = mockAccountServiceWith(userId);
mockI18nService.t.mockImplementation((key) => `${key}-used-i18n`);
component = new ConfirmKeyConnectorDomainComponent(
mockRouter,
mockLogService,
@ -40,6 +52,10 @@ describe("ConfirmKeyConnectorDomainComponent", () => {
mockMessagingService,
mockSyncService,
mockAccountService,
mockKeyConnectorApiService,
mockToastService,
mockI18nService,
mockAnonLayoutWrapperDataService,
);
jest.spyOn(component, "onBeforeNavigation").mockImplementation(onBeforeNavigation);
@ -67,17 +83,41 @@ describe("ConfirmKeyConnectorDomainComponent", () => {
expect(component.loading).toEqual(true);
});
it("sets organization name to undefined when getOrganizationName throws error", async () => {
mockKeyConnectorApiService.getConfirmationDetails.mockRejectedValue(new Error("API error"));
await component.ngOnInit();
expect(component.organizationName).toBeUndefined();
expect(component.userId).toEqual(userId);
expect(component.keyConnectorUrl).toEqual(confirmation.keyConnectorUrl);
expect(component.keyConnectorHostName).toEqual(expectedHostName);
expect(component.loading).toEqual(false);
expect(mockAnonLayoutWrapperDataService.setAnonLayoutWrapperData).toHaveBeenCalledWith({
pageTitle: { key: "verifyYourDomainToLogin" },
});
});
it("should set component properties correctly", async () => {
const expectedOrgName = "Test Organization";
mockKeyConnectorApiService.getConfirmationDetails.mockResolvedValue({
organizationName: expectedOrgName,
} as KeyConnectorConfirmationDetailsResponse);
await component.ngOnInit();
expect(component.userId).toEqual(userId);
expect(component.organizationName).toEqual(expectedOrgName);
expect(component.keyConnectorUrl).toEqual(confirmation.keyConnectorUrl);
expect(component.keyConnectorHostName).toEqual(expectedHostName);
expect(component.loading).toEqual(false);
});
});
describe("confirm", () => {
it("should call keyConnectorService.convertNewSsoUserToKeyConnector with full sync and navigation to home page", async () => {
it("calls domain verified toast when organization name is not set", async () => {
mockKeyConnectorApiService.getConfirmationDetails.mockRejectedValue(new Error("API error"));
await component.ngOnInit();
await component.confirm();
@ -94,6 +134,43 @@ describe("ConfirmKeyConnectorDomainComponent", () => {
expect(mockSyncService.fullSync.mock.invocationCallOrder[0]).toBeLessThan(
mockMessagingService.send.mock.invocationCallOrder[0],
);
expect(mockToastService.showToast).toHaveBeenCalledWith({
variant: "success",
message: "domainVerified-used-i18n",
});
expect(mockMessagingService.send.mock.invocationCallOrder[0]).toBeLessThan(
onBeforeNavigation.mock.invocationCallOrder[0],
);
expect(onBeforeNavigation.mock.invocationCallOrder[0]).toBeLessThan(
mockRouter.navigate.mock.invocationCallOrder[0],
);
});
it("should call keyConnectorService.convertNewSsoUserToKeyConnector with full sync and navigation to home page", async () => {
mockKeyConnectorApiService.getConfirmationDetails.mockResolvedValue({
organizationName: "Test Org Name",
} as KeyConnectorConfirmationDetailsResponse);
await component.ngOnInit();
await component.confirm();
expect(mockKeyConnectorService.convertNewSsoUserToKeyConnector).toHaveBeenCalledWith(userId);
expect(mockSyncService.fullSync).toHaveBeenCalledWith(true);
expect(mockRouter.navigate).toHaveBeenCalledWith(["/"]);
expect(mockMessagingService.send).toHaveBeenCalledWith("loggedIn");
expect(onBeforeNavigation).toHaveBeenCalled();
expect(
mockKeyConnectorService.convertNewSsoUserToKeyConnector.mock.invocationCallOrder[0],
).toBeLessThan(mockSyncService.fullSync.mock.invocationCallOrder[0]);
expect(mockSyncService.fullSync.mock.invocationCallOrder[0]).toBeLessThan(
mockMessagingService.send.mock.invocationCallOrder[0],
);
expect(mockToastService.showToast).toHaveBeenCalledWith({
variant: "success",
message: "organizationVerified-used-i18n",
});
expect(mockMessagingService.send.mock.invocationCallOrder[0]).toBeLessThan(
onBeforeNavigation.mock.invocationCallOrder[0],
);

61
libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts
View File

@ -5,12 +5,21 @@ import { firstValueFrom } from "rxjs";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import { KeyConnectorApiService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector-api.service";
import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { SyncService } from "@bitwarden/common/platform/sync";
import { UserId } from "@bitwarden/common/types/guid";
import { BitActionDirective, ButtonModule } from "@bitwarden/components";
import {
AnonLayoutWrapperDataService,
BitActionDirective,
ButtonModule,
IconButtonModule,
ToastService,
} from "@bitwarden/components";
import { I18nPipe } from "@bitwarden/ui-common";
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
@ -19,11 +28,13 @@ import { I18nPipe } from "@bitwarden/ui-common";
selector: "confirm-key-connector-domain",
templateUrl: "confirm-key-connector-domain.component.html",
standalone: true,
imports: [CommonModule, ButtonModule, I18nPipe, BitActionDirective],
imports: [CommonModule, ButtonModule, I18nPipe, BitActionDirective, IconButtonModule],
})
export class ConfirmKeyConnectorDomainComponent implements OnInit {
loading = true;
keyConnectorUrl!: string;
keyConnectorHostName!: string;
organizationName: string | undefined;
userId!: UserId;
// FIXME(https://bitwarden.atlassian.net/browse/CL-903): Migrate to Signals
@ -37,6 +48,10 @@ export class ConfirmKeyConnectorDomainComponent implements OnInit {
private messagingService: MessagingService,
private syncService: SyncService,
private accountService: AccountService,
private keyConnectorApiService: KeyConnectorApiService,
private toastService: ToastService,
private i18nService: I18nService,
private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
) {}
async ngOnInit() {
@ -57,14 +72,36 @@ export class ConfirmKeyConnectorDomainComponent implements OnInit {
return;
}
this.keyConnectorUrl = confirmation.keyConnectorUrl;
this.organizationName = await this.getOrganizationName(confirmation.organizationSsoIdentifier);
// PM-29133 Remove during cleanup.
if (this.organizationName == undefined) {
this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
pageTitle: { key: "verifyYourDomainToLogin" },
});
}
this.keyConnectorUrl = confirmation.keyConnectorUrl;
this.keyConnectorHostName = Utils.getHostname(confirmation.keyConnectorUrl);
this.loading = false;
}
confirm = async () => {
await this.keyConnectorService.convertNewSsoUserToKeyConnector(this.userId);
if (this.organizationName) {
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("organizationVerified"),
});
} else {
// PM-29133 Remove during cleanup.
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("domainVerified"),
});
}
await this.syncService.fullSync(true);
this.messagingService.send("loggedIn");
@ -77,4 +114,22 @@ export class ConfirmKeyConnectorDomainComponent implements OnInit {
cancel = async () => {
this.messagingService.send("logout");
};
private async getOrganizationName(
organizationSsoIdentifier: string,
): Promise<string | undefined> {
try {
const details =
await this.keyConnectorApiService.getConfirmationDetails(organizationSsoIdentifier);
return details.organizationName;
} catch (error) {
// PM-29133 Remove during cleanup.
// Old self hosted servers may not have this endpoint yet. On error log a warning and continue without organization name.
this.logService.warning(
`[ConfirmKeyConnectorDomainComponent] Unable to get key connector confirmation details for organizationSsoIdentifier ${organizationSsoIdentifier}:`,
error,
);
return undefined;
}
}
}

35
libs/key-management-ui/src/key-connector/remove-password.component.html Normal file
View File

@ -0,0 +1,35 @@
@if (loading) {
<div class="tw-text-center">
<i
class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
title="{{ 'loading' | i18n }}"
aria-hidden="true"
></i>
<span class="tw-sr-only">{{ "loading" | i18n }}</span>
</div>
} @else {
<p>{{ "removeMasterPasswordForOrgUserKeyConnector" | i18n }}</p>
<p class="tw-mb-0 tw-font-bold">{{ "organization" | i18n }}</p>
<p class="tw-mb-6">{{ organization.name }}</p>
<p class="tw-mb-0 tw-font-bold tw-inline-flex tw-items-center">
{{ "domain" | i18n }}
<button
type="button"
[label]="'keyConnectorDomainTooltip' | i18n"
tooltipPosition="above-center"
bitIconButton="bwi-info-circle"
size="small"
></button>
</p>
<p class="tw-mb-6 tw-font-mono">{{ keyConnectorHostName }}</p>
<div class="tw-flex tw-flex-col tw-gap-2">
<button bitButton type="button" buttonType="primary" [block]="true" [bitAction]="convert">
{{ "continueWithLogIn" | i18n }}
</button>
<button bitButton type="button" buttonType="secondary" [block]="true" [bitAction]="leave">
{{ "doNotContinue" | i18n }}
</button>
</div>
}

2
libs/key-management-ui/src/key-connector/remove-password.component.spec.ts
View File

@ -19,6 +19,7 @@ describe("RemovePasswordComponent", () => {
let component: RemovePasswordComponent;
const userId = "test-user-id" as UserId;
const expectedHostName = "key-connector-url.com";
const organization = {
id: "test-organization-id",
name: "test-organization-name",
@ -62,6 +63,7 @@ describe("RemovePasswordComponent", () => {
expect(component["activeUserId"]).toBe("test-user-id");
expect(component.organization).toEqual(organization);
expect(component.loading).toEqual(false);
expect(component.keyConnectorHostName).toBe(expectedHostName);
expect(mockKeyConnectorService.getManagingOrganization).toHaveBeenCalledWith(userId);
expect(mockSyncService.fullSync).toHaveBeenCalledWith(false);

32
libs/key-management-ui/src/key-connector/remove-password.component.ts
View File

@ -1,4 +1,5 @@
import { Directive, OnInit } from "@angular/core";
import { CommonModule } from "@angular/common";
import { Component, OnInit } from "@angular/core";
import { Router } from "@angular/router";
import { firstValueFrom } from "rxjs";
@ -9,17 +10,33 @@ import { KeyConnectorService } from "@bitwarden/common/key-management/key-connec
import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
import { UserId } from "@bitwarden/common/types/guid";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { DialogService, ToastService } from "@bitwarden/components";
import {
DialogService,
ToastService,
ButtonModule,
BitActionDirective,
IconButtonModule,
} from "@bitwarden/components";
import { I18nPipe } from "@bitwarden/ui-common";
@Directive()
// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
@Component({
selector: "km-ui-remove-password",
templateUrl: "remove-password.component.html",
standalone: true,
imports: [CommonModule, ButtonModule, I18nPipe, BitActionDirective, IconButtonModule],
})
export class RemovePasswordComponent implements OnInit {
continuing = false;
leaving = false;
loading = true;
organization!: Organization;
keyConnectorHostName!: string;
private activeUserId!: UserId;
constructor(
@ -55,6 +72,7 @@ export class RemovePasswordComponent implements OnInit {
await this.router.navigate(["/"]);
return;
}
this.keyConnectorHostName = Utils.getHostname(this.organization.keyConnectorUrl);
this.loading = false;
}
@ -73,7 +91,7 @@ export class RemovePasswordComponent implements OnInit {
this.toastService.showToast({
variant: "success",
message: this.i18nService.t("removedMasterPassword"),
message: this.i18nService.t("organizationVerified"),
});
await this.router.navigate(["/"]);
@ -86,9 +104,11 @@ export class RemovePasswordComponent implements OnInit {
leave = async () => {
const confirmed = await this.dialogService.openSimpleDialog({
title: this.organization.name,
content: { key: "leaveOrganizationConfirmation" },
title: { key: "leaveOrganization" },
content: { key: "leaveOrganizationContent" },
type: "warning",
acceptButtonText: { key: "leaveNow" },
cancelButtonText: { key: "cancel" },
});
if (!confirmed) {