From 99ddbc9cd639f190de01292c8ee5dc31fbcb189f Mon Sep 17 00:00:00 2001 From: Alec Rippberger Date: Thu, 10 Oct 2024 15:34:37 -0500 Subject: [PATCH] Removing register component changes. --- .../src/popup/services/services.module.ts | 12 +----- .../src/app/services/services.module.ts | 16 +------- apps/desktop/src/auth/register.component.ts | 4 +- .../register-form.component.spec.ts | 39 ++----------------- .../register-form/register-form.component.ts | 3 -- apps/web/src/app/core/core.module.ts | 11 +----- .../src/auth/components/register.component.ts | 7 +--- 7 files changed, 10 insertions(+), 82 deletions(-) diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 92fc411161..85f983ae6b 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -23,16 +23,13 @@ import { LoginComponentService, LockComponentService, } from "@bitwarden/auth/angular"; -import { LockService, LoginEmailService, PinServiceAbstraction } from "@bitwarden/auth/common"; +import { LockService, PinServiceAbstraction } from "@bitwarden/auth/common"; import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { - AccountService, - AccountService as AccountServiceAbstraction, -} from "@bitwarden/common/auth/abstractions/account.service"; +import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service"; import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction"; @@ -603,11 +600,6 @@ const safeProviders: SafeProvider[] = [ useClass: ForegroundLockService, deps: [MessageSender, MessageListener], }), - safeProvider({ - provide: LoginEmailService, - useClass: LoginEmailService, - deps: [AccountService, AuthService, StateProvider], - }), safeProvider({ provide: SdkClientFactory, useClass: flagEnabled("sdk") ? BrowserSdkClientFactory : NoopSdkClientFactory, diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 5bceb41056..f25140773e 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -26,21 +26,14 @@ import { } from "@bitwarden/auth/angular"; import { InternalUserDecryptionOptionsServiceAbstraction, - LoginEmailService, PinServiceAbstraction, } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { - AccountService, - AccountService as AccountServiceAbstraction, -} from "@bitwarden/common/auth/abstractions/account.service"; -import { - AuthService, - AuthService as AuthServiceAbstraction, -} from "@bitwarden/common/auth/abstractions/auth.service"; +import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; +import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { KdfConfigService, KdfConfigService as KdfConfigServiceAbstraction, @@ -333,11 +326,6 @@ const safeProviders: SafeProvider[] = [ ToastService, ], }), - safeProvider({ - provide: LoginEmailService, - useClass: LoginEmailService, - deps: [AccountService, AuthService, StateProvider], - }), safeProvider({ provide: SdkClientFactory, useClass: flagEnabled("sdk") ? DefaultSdkClientFactory : NoopSdkClientFactory, diff --git a/apps/desktop/src/auth/register.component.ts b/apps/desktop/src/auth/register.component.ts index 0484274770..e7c2cfd32b 100644 --- a/apps/desktop/src/auth/register.component.ts +++ b/apps/desktop/src/auth/register.component.ts @@ -4,7 +4,7 @@ import { Router } from "@angular/router"; import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/auth/components/register.component"; import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service"; -import { LoginEmailService, LoginStrategyServiceAbstraction } from "@bitwarden/auth/common"; +import { LoginStrategyServiceAbstraction } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; @@ -42,7 +42,6 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit, auditService: AuditService, dialogService: DialogService, toastService: ToastService, - loginEmailService: LoginEmailService, ) { super( formValidationErrorService, @@ -60,7 +59,6 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit, auditService, dialogService, toastService, - loginEmailService, ); } diff --git a/apps/web/src/app/auth/register-form/register-form.component.spec.ts b/apps/web/src/app/auth/register-form/register-form.component.spec.ts index 476d0c1f0b..f2d38e9284 100644 --- a/apps/web/src/app/auth/register-form/register-form.component.spec.ts +++ b/apps/web/src/app/auth/register-form/register-form.component.spec.ts @@ -1,7 +1,7 @@ -import { ComponentFixture, TestBed, fakeAsync, tick, flush } from "@angular/core/testing"; +import { ComponentFixture, TestBed } from "@angular/core/testing"; import { ReactiveFormsModule } from "@angular/forms"; import { RouterTestingModule } from "@angular/router/testing"; -import { of, BehaviorSubject } from "rxjs"; +import { of } from "rxjs"; import { OrganizationUserApiService } from "@bitwarden/admin-console/common"; import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service"; @@ -26,7 +26,6 @@ import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/pass import { DialogService, ToastService } from "@bitwarden/components"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy"; -import { LoginEmailService } from "../../../../../../libs/auth/src/common/services/login-email/login-email.service"; import { SharedModule } from "../../shared"; import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service"; @@ -59,15 +58,8 @@ class MockPasswordStrengthServiceAbstraction { describe("RegisterFormComponent", () => { let component: RegisterFormComponent; let fixture: ComponentFixture; - let loginEmailService: LoginEmailService; - let loginEmailSubject: BehaviorSubject; beforeEach(async () => { - loginEmailSubject = new BehaviorSubject(""); - const loginEmailServiceMock = { - loginEmail$: loginEmailSubject.asObservable(), - }; - const authServiceMock = { authStatuses$: of([]), }; @@ -89,7 +81,6 @@ describe("RegisterFormComponent", () => { imports: [ReactiveFormsModule, RouterTestingModule, SharedModule], declarations: [RegisterFormComponent], providers: [ - { provide: LoginEmailService, useValue: loginEmailServiceMock }, { provide: AuthService, useValue: authServiceMock }, { provide: EncryptService, useValue: encryptServiceMock }, { provide: PolicyApiServiceAbstraction, useValue: policyApiServiceMock }, @@ -123,33 +114,9 @@ describe("RegisterFormComponent", () => { fixture = TestBed.createComponent(RegisterFormComponent); component = fixture.componentInstance; - loginEmailService = TestBed.inject(LoginEmailService); - - // Ensure the form group is initialized - await component.ngOnInit(); - - // Subscribe to loginEmail$ to set the email value - loginEmailService.loginEmail$.subscribe((email) => { - component.formGroup.get("email")?.setValue(email); - }); - - fixture.detectChanges(); }); - it("creates without", () => { + it("creates without error", () => { expect(component).toBeTruthy(); }); - - it("sets email from loginEmailService", fakeAsync(() => { - // Emit a new email value to the loginEmailSubject - loginEmailSubject.next("test@example.com"); - // Simulate the passage of time to allow for async operations - tick(); - // Trigger change detection to update the view - fixture.detectChanges(); - // Ensure all pending asynchronous activities are completed - flush(); - - expect(component.formGroup.get("email")?.value).toBe("test@example.com"); - })); }); diff --git a/apps/web/src/app/auth/register-form/register-form.component.ts b/apps/web/src/app/auth/register-form/register-form.component.ts index d9bc32f06b..bf4a3e8203 100644 --- a/apps/web/src/app/auth/register-form/register-form.component.ts +++ b/apps/web/src/app/auth/register-form/register-form.component.ts @@ -20,7 +20,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { DialogService, ToastService } from "@bitwarden/components"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy"; -import { LoginEmailService } from "../../../../../../libs/auth/src/common/services/login-email/login-email.service"; import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service"; @Component({ @@ -54,7 +53,6 @@ export class RegisterFormComponent extends BaseRegisterComponent implements OnIn dialogService: DialogService, acceptOrgInviteService: AcceptOrganizationInviteService, toastService: ToastService, - loginEmailService: LoginEmailService, ) { super( formValidationErrorService, @@ -72,7 +70,6 @@ export class RegisterFormComponent extends BaseRegisterComponent implements OnIn auditService, dialogService, toastService, - loginEmailService, ); super.modifyRegisterRequest = async (request: RegisterRequest) => { // Org invites are deep linked. Non-existent accounts are redirected to the register page. diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 57140bcc55..59c9da3518 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -31,10 +31,7 @@ import { LockComponentService, SetPasswordJitService, } from "@bitwarden/auth/angular"; -import { - InternalUserDecryptionOptionsServiceAbstraction, - LoginEmailService, -} from "@bitwarden/auth/common"; +import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; @@ -44,7 +41,6 @@ import { } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/account-api.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service"; import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction"; import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction"; @@ -272,11 +268,6 @@ const safeProviders: SafeProvider[] = [ SsoLoginServiceAbstraction, ], }), - safeProvider({ - provide: LoginEmailService, - useClass: LoginEmailService, - deps: [AccountService, AuthService, StateProvider], - }), safeProvider({ provide: CollectionAdminService, useClass: DefaultCollectionAdminService, diff --git a/libs/angular/src/auth/components/register.component.ts b/libs/angular/src/auth/components/register.component.ts index ea48d55ca2..8f6e8f4f06 100644 --- a/libs/angular/src/auth/components/register.component.ts +++ b/libs/angular/src/auth/components/register.component.ts @@ -2,11 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { AbstractControl, UntypedFormBuilder, ValidatorFn, Validators } from "@angular/forms"; import { Router } from "@angular/router"; -import { - LoginEmailService, - LoginStrategyServiceAbstraction, - PasswordLoginCredentials, -} from "@bitwarden/auth/common"; +import { LoginStrategyServiceAbstraction, PasswordLoginCredentials } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { DEFAULT_KDF_CONFIG } from "@bitwarden/common/auth/models/domain/kdf-config"; @@ -103,7 +99,6 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn protected auditService: AuditService, protected dialogService: DialogService, protected toastService: ToastService, - protected loginEmailService: LoginEmailService, ) { super(environmentService, i18nService, platformUtilsService, toastService); this.showTerms = !platformUtilsService.isSelfHost();