mirror of
https://github.com/bitwarden/browser
synced 2025-12-06 00:13:28 +00:00
Revert "feat(sso-config): Auth/[PM-18470] Pre-populate Key Connector URL (#16…" (#16534)
This reverts commit debe7b1f19.
This commit is contained in:
@@ -9,7 +9,7 @@ import {
|
||||
Validators,
|
||||
} from "@angular/forms";
|
||||
import { ActivatedRoute } from "@angular/router";
|
||||
import { concatMap, firstValueFrom, Subject, switchMap, takeUntil } from "rxjs";
|
||||
import { concatMap, firstValueFrom, Subject, takeUntil } from "rxjs";
|
||||
|
||||
import { ControlsOf } from "@bitwarden/angular/types/controls-of";
|
||||
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
||||
@@ -34,7 +34,6 @@ import { OrganizationSsoRequest } from "@bitwarden/common/auth/models/request/or
|
||||
import { OrganizationSsoResponse } from "@bitwarden/common/auth/models/response/organization-sso.response";
|
||||
import { SsoConfigView } from "@bitwarden/common/auth/models/view/sso-config.view";
|
||||
import { getUserId } from "@bitwarden/common/auth/services/account.service";
|
||||
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
||||
import { Utils } from "@bitwarden/common/platform/misc/utils";
|
||||
@@ -202,7 +201,6 @@ export class SsoComponent implements OnInit, OnDestroy {
|
||||
private accountService: AccountService,
|
||||
private organizationApiService: OrganizationApiServiceAbstraction,
|
||||
private toastService: ToastService,
|
||||
private environmentService: EnvironmentService,
|
||||
) {}
|
||||
|
||||
async ngOnInit() {
|
||||
@@ -253,32 +251,6 @@ export class SsoComponent implements OnInit, OnDestroy {
|
||||
.subscribe();
|
||||
|
||||
this.showKeyConnectorOptions = this.platformUtilsService.isSelfHost();
|
||||
|
||||
// Only setup listener if key connector is a possible selection
|
||||
if (this.showKeyConnectorOptions) {
|
||||
this.listenForKeyConnectorSelection();
|
||||
}
|
||||
}
|
||||
|
||||
listenForKeyConnectorSelection() {
|
||||
this.ssoConfigForm?.controls?.memberDecryptionType.valueChanges
|
||||
.pipe(
|
||||
switchMap(async (memberDecryptionType) => {
|
||||
if (memberDecryptionType === MemberDecryptionType.KeyConnector) {
|
||||
// Pre-populate a default key connector URL (user can still change it)
|
||||
const env = await firstValueFrom(this.environmentService.environment$);
|
||||
const webVaultUrl = env.getWebVaultUrl();
|
||||
const defaultKeyConnectorUrl = webVaultUrl + "/key-connector/";
|
||||
|
||||
this.ssoConfigForm.controls.keyConnectorUrl.setValue(defaultKeyConnectorUrl);
|
||||
} else {
|
||||
// Otherwise clear the key connector URL
|
||||
this.ssoConfigForm.controls.keyConnectorUrl.setValue("");
|
||||
}
|
||||
}),
|
||||
takeUntil(this.destroy$),
|
||||
)
|
||||
.subscribe();
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
|
||||
Reference in New Issue
Block a user