diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.component.ts b/apps/web/src/app/auth/organization-invite/accept-organization.component.ts index 1f5d6d6be81..cc0d6cd26d5 100644 --- a/apps/web/src/app/auth/organization-invite/accept-organization.component.ts +++ b/apps/web/src/app/auth/organization-invite/accept-organization.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute, Params, Router } from "@angular/router"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { ToastService } from "@bitwarden/components"; import { BaseAcceptComponent } from "../../common/base.accept.component"; @@ -20,14 +20,14 @@ export class AcceptOrganizationComponent extends BaseAcceptComponent { constructor( router: Router, - platformUtilsService: PlatformUtilsService, i18nService: I18nService, route: ActivatedRoute, authService: AuthService, toastService: ToastService, private acceptOrganizationInviteService: AcceptOrganizationInviteService, + private logService: LogService, ) { - super(router, platformUtilsService, i18nService, route, authService, toastService); + super(router, i18nService, route, authService, toastService); } async authedHandler(qParams: Params): Promise { diff --git a/apps/web/src/app/auth/organization-invite/organization-invite.ts b/apps/web/src/app/auth/organization-invite/organization-invite.ts index ad36707e8a9..94f1376000f 100644 --- a/apps/web/src/app/auth/organization-invite/organization-invite.ts +++ b/apps/web/src/app/auth/organization-invite/organization-invite.ts @@ -19,14 +19,7 @@ export class OrganizationInvite { return Object.assign(new OrganizationInvite(), json); } - static fromParams(params: Params | null): OrganizationInvite | null { - // Conversation topic: - // What if the query parameters we passed in are null? How do we outwardly communicate - // that this happened? - if (params == null) { - return null; - } - + static fromParams(params: Params): OrganizationInvite { return Object.assign(new OrganizationInvite(), { email: params.email, initOrganization: params.initOrganization?.toLocaleLowerCase() === "true", diff --git a/apps/web/src/app/common/base.accept.component.ts b/apps/web/src/app/common/base.accept.component.ts index 9109910591d..82422c0fc61 100644 --- a/apps/web/src/app/common/base.accept.component.ts +++ b/apps/web/src/app/common/base.accept.component.ts @@ -6,7 +6,6 @@ import { first, switchMap, takeUntil } from "rxjs/operators"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { ToastService } from "@bitwarden/components"; @Directive() @@ -24,7 +23,6 @@ export abstract class BaseAcceptComponent implements OnInit { constructor( protected router: Router, - protected platformUtilService: PlatformUtilsService, protected i18nService: I18nService, protected route: ActivatedRoute, protected authService: AuthService,