From 84e97786691dce5ef9b1003711ed9574a821369c Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 13 Jun 2024 20:05:05 +0200 Subject: [PATCH] [PM-4139] Remove approve device logins setting and enable it by default (#9495) * Remove login with device setting and enable it by default * Remove unused i18n message --- .../browser/src/background/main.background.ts | 1 - .../src/app/accounts/settings.component.html | 14 -------- .../src/app/accounts/settings.component.ts | 13 +------- apps/desktop/src/locales/en/messages.json | 6 ---- .../src/vault/app/vault/vault.component.ts | 20 ++++------- .../src/services/jslib-services.module.ts | 1 - .../auth-request.service.abstraction.ts | 14 -------- .../auth-request/auth-request.service.spec.ts | 9 ----- .../auth-request/auth-request.service.ts | 33 ------------------- .../src/services/notifications.service.ts | 14 +++----- 10 files changed, 11 insertions(+), 114 deletions(-) diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index fe797dc8ba..3aabde4065 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -938,7 +938,6 @@ export default class MainBackground { logoutCallback, this.stateService, this.authService, - this.authRequestService, this.messagingService, ); diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html index ae0409cdbc..9245c51d55 100644 --- a/apps/desktop/src/app/accounts/settings.component.html +++ b/apps/desktop/src/app/accounts/settings.component.html @@ -166,20 +166,6 @@ "recommendedForSecurity" | i18n }} -
-
- -
- {{ "approveLoginRequestDesc" | i18n }} -
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts index 6b6a18958f..2ef5df2c7c 100644 --- a/apps/desktop/src/app/accounts/settings.component.ts +++ b/apps/desktop/src/app/accounts/settings.component.ts @@ -3,7 +3,7 @@ import { FormBuilder } from "@angular/forms"; import { BehaviorSubject, Observable, Subject, firstValueFrom } from "rxjs"; import { concatMap, debounceTime, filter, map, switchMap, takeUntil, tap } from "rxjs/operators"; -import { AuthRequestServiceAbstraction, PinServiceAbstraction } from "@bitwarden/auth/common"; +import { PinServiceAbstraction } from "@bitwarden/auth/common"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; @@ -90,7 +90,6 @@ export class SettingsComponent implements OnInit { biometric: false, autoPromptBiometrics: false, requirePasswordOnStart: false, - approveLoginRequests: false, // Account Preferences clearClipboard: [null], minimizeOnCopyToClipboard: false, @@ -135,7 +134,6 @@ export class SettingsComponent implements OnInit { private biometricStateService: BiometricStateService, private desktopAutofillSettingsService: DesktopAutofillSettingsService, private pinService: PinServiceAbstraction, - private authRequestService: AuthRequestServiceAbstraction, private logService: LogService, private nativeMessagingManifestService: NativeMessagingManifestService, ) { @@ -275,8 +273,6 @@ export class SettingsComponent implements OnInit { requirePasswordOnStart: await firstValueFrom( this.biometricStateService.requirePasswordOnStart$, ), - approveLoginRequests: - (await this.authRequestService.getAcceptAuthRequests(this.currentUserId)) ?? false, clearClipboard: await firstValueFrom(this.autofillSettingsService.clearClipboardDelay$), minimizeOnCopyToClipboard: await firstValueFrom(this.desktopSettingsService.minimizeOnCopy$), enableFavicons: await firstValueFrom(this.domainSettingsService.showFavicons$), @@ -722,13 +718,6 @@ export class SettingsComponent implements OnInit { ); } - async updateApproveLoginRequests() { - await this.authRequestService.setAcceptAuthRequests( - this.form.value.approveLoginRequests, - this.currentUserId, - ); - } - ngOnDestroy() { this.destroy$.next(); this.destroy$.complete(); diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index 82d57c205d..7846457294 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -2401,9 +2401,6 @@ "denyLogIn": { "message": "Deny login" }, - "approveLoginRequests": { - "message": "Approve login requests" - }, "logInConfirmedForEmailOnDevice": { "message": "Login confirmed for $EMAIL$ on $DEVICE$", "placeholders": { @@ -2438,9 +2435,6 @@ "thisRequestIsNoLongerValid": { "message": "This request is no longer valid." }, - "approveLoginRequestDesc": { - "message": "Use this device to approve login requests made from other devices." - }, "confirmLoginAtemptForMail": { "message": "Confirm login attempt for $EMAIL$", "placeholders": { diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts index 37992ecea0..f8a2bb773e 100644 --- a/apps/desktop/src/vault/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -8,7 +8,7 @@ import { ViewContainerRef, } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; -import { firstValueFrom, Subject, takeUntil } from "rxjs"; +import { Subject, takeUntil } from "rxjs"; import { first } from "rxjs/operators"; import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; @@ -16,7 +16,6 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; import { EventType } from "@bitwarden/common/enums"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; @@ -32,7 +31,6 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { DialogService } from "@bitwarden/components"; import { PasswordRepromptService } from "@bitwarden/vault"; -import { AuthRequestServiceAbstraction } from "../../../../../../libs/auth/src/common/abstractions"; import { SearchBarService } from "../../../app/layout/search/search-bar.service"; import { GeneratorComponent } from "../../../app/tools/generator.component"; import { invokeMenu, RendererMenuItem } from "../../../utils"; @@ -107,8 +105,6 @@ export class VaultComponent implements OnInit, OnDestroy { private apiService: ApiService, private dialogService: DialogService, private billingAccountProfileStateService: BillingAccountProfileStateService, - private authRequestService: AuthRequestServiceAbstraction, - private accountService: AccountService, ) {} async ngOnInit() { @@ -226,15 +222,11 @@ export class VaultComponent implements OnInit, OnDestroy { this.searchBarService.setEnabled(true); this.searchBarService.setPlaceholderText(this.i18nService.t("searchVault")); - const userId = (await firstValueFrom(this.accountService.activeAccount$)).id; - const approveLoginRequests = await this.authRequestService.getAcceptAuthRequests(userId); - if (approveLoginRequests) { - const authRequest = await this.apiService.getLastAuthRequest(); - if (authRequest != null) { - this.messagingService.send("openLoginApproval", { - notificationId: authRequest.id, - }); - } + const authRequest = await this.apiService.getLastAuthRequest(); + if (authRequest != null) { + this.messagingService.send("openLoginApproval", { + notificationId: authRequest.id, + }); } } diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 8c676bdb9d..78b2e81672 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -802,7 +802,6 @@ const safeProviders: SafeProvider[] = [ LOGOUT_CALLBACK, StateServiceAbstraction, AuthServiceAbstraction, - AuthRequestServiceAbstraction, MessagingServiceAbstraction, ], }), diff --git a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts index b7ae903eac..7e82045c5f 100644 --- a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts +++ b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts @@ -10,20 +10,6 @@ export abstract class AuthRequestServiceAbstraction { /** Emits an auth request id when an auth request has been approved. */ authRequestPushNotification$: Observable; - /** - * Returns true if the user has chosen to allow auth requests to show on this client. - * Intended to prevent spamming the user with auth requests. - * @param userId The user id. - * @throws If `userId` is not provided. - */ - abstract getAcceptAuthRequests: (userId: UserId) => Promise; - /** - * Sets whether to allow auth requests to show on this client for this user. - * @param accept Whether to allow auth requests to show on this client. - * @param userId The user id. - * @throws If `userId` is not provided. - */ - abstract setAcceptAuthRequests: (accept: boolean, userId: UserId) => Promise; /** * Returns an admin auth request for the given user if it exists. * @param userId The user id. diff --git a/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts b/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts index 5fa4f26bdd..a3b4400588 100644 --- a/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts +++ b/libs/auth/src/common/services/auth-request/auth-request.service.spec.ts @@ -62,15 +62,6 @@ describe("AuthRequestService", () => { }); }); - describe("AcceptAuthRequests", () => { - it("returns an error when userId isn't provided", async () => { - await expect(sut.getAcceptAuthRequests(undefined)).rejects.toThrow("User ID is required"); - await expect(sut.setAcceptAuthRequests(true, undefined)).rejects.toThrow( - "User ID is required", - ); - }); - }); - describe("AdminAuthRequest", () => { it("returns an error when userId isn't provided", async () => { await expect(sut.getAdminAuthRequest(undefined)).rejects.toThrow("User ID is required"); diff --git a/libs/auth/src/common/services/auth-request/auth-request.service.ts b/libs/auth/src/common/services/auth-request/auth-request.service.ts index 6b45bedb21..028721c513 100644 --- a/libs/auth/src/common/services/auth-request/auth-request.service.ts +++ b/libs/auth/src/common/services/auth-request/auth-request.service.ts @@ -22,20 +22,6 @@ import { MasterKey, UserKey } from "@bitwarden/common/types/key"; import { AuthRequestServiceAbstraction } from "../../abstractions/auth-request.service.abstraction"; -/** - * Disk-local to maintain consistency between tabs (even though - * approvals are currently only available on desktop). We don't - * want to clear this on logout as it's a user preference. - */ -export const ACCEPT_AUTH_REQUESTS_KEY = new UserKeyDefinition( - AUTH_REQUEST_DISK_LOCAL, - "acceptAuthRequests", - { - deserializer: (value) => value ?? false, - clearOn: [], - }, -); - /** * Disk-local to maintain consistency between tabs. We don't want to * clear this on logout since admin auth requests are long-lived. @@ -64,25 +50,6 @@ export class AuthRequestService implements AuthRequestServiceAbstraction { this.authRequestPushNotification$ = this.authRequestPushNotificationSubject.asObservable(); } - async getAcceptAuthRequests(userId: UserId): Promise { - if (userId == null) { - throw new Error("User ID is required"); - } - - const value = await firstValueFrom( - this.stateProvider.getUser(userId, ACCEPT_AUTH_REQUESTS_KEY).state$, - ); - return value; - } - - async setAcceptAuthRequests(accept: boolean, userId: UserId): Promise { - if (userId == null) { - throw new Error("User ID is required"); - } - - await this.stateProvider.setUserState(ACCEPT_AUTH_REQUESTS_KEY, accept, userId); - } - async getAdminAuthRequest(userId: UserId): Promise { if (userId == null) { throw new Error("User ID is required"); diff --git a/libs/common/src/services/notifications.service.ts b/libs/common/src/services/notifications.service.ts index 51589f52fa..d5c7170e23 100644 --- a/libs/common/src/services/notifications.service.ts +++ b/libs/common/src/services/notifications.service.ts @@ -4,7 +4,6 @@ import { firstValueFrom } from "rxjs"; import { LogoutReason } from "@bitwarden/auth/common"; -import { AuthRequestServiceAbstraction } from "../../../auth/src/common/abstractions"; import { ApiService } from "../abstractions/api.service"; import { NotificationsService as NotificationsServiceAbstraction } from "../abstractions/notifications.service"; import { AuthService } from "../auth/abstractions/auth.service"; @@ -21,8 +20,7 @@ import { EnvironmentService } from "../platform/abstractions/environment.service import { LogService } from "../platform/abstractions/log.service"; import { MessagingService } from "../platform/abstractions/messaging.service"; import { StateService } from "../platform/abstractions/state.service"; -import { SyncService } from "../platform/sync/sync.service"; -import { UserId } from "../types/guid"; +import { SyncService } from "../vault/abstractions/sync/sync.service.abstraction"; export class NotificationsService implements NotificationsServiceAbstraction { private signalrConnection: signalR.HubConnection; @@ -41,7 +39,6 @@ export class NotificationsService implements NotificationsServiceAbstraction { private logoutCallback: (logoutReason: LogoutReason) => Promise, private stateService: StateService, private authService: AuthService, - private authRequestService: AuthRequestServiceAbstraction, private messagingService: MessagingService, ) { this.environmentService.environment$.subscribe(() => { @@ -205,12 +202,9 @@ export class NotificationsService implements NotificationsServiceAbstraction { break; case NotificationType.AuthRequest: { - const userId = await this.stateService.getUserId(); - if (await this.authRequestService.getAcceptAuthRequests(userId as UserId)) { - this.messagingService.send("openLoginApproval", { - notificationId: notification.payload.id, - }); - } + this.messagingService.send("openLoginApproval", { + notificationId: notification.payload.id, + }); } break; default: