bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 15:23:33 +00:00
Code Issues Releases Wiki Activity

Switch Notifications to only connect on unlocked (#13913)

Browse Source
This commit is contained in:
Justin Baur
2025-03-20 10:56:30 -04:00
committed by GitHub
parent 45d5b171b8
commit 23fbb56248
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts
View File

@@ -225,9 +225,10 @@ describe("NotificationsService", () => {
}); });
it.each([ it.each([
{ initialStatus: AuthenticationStatus.Locked, updatedStatus: AuthenticationStatus.Unlocked }, // Temporarily rolling back notifications being connected while locked
{ initialStatus: AuthenticationStatus.Unlocked, updatedStatus: AuthenticationStatus.Locked }, // { initialStatus: AuthenticationStatus.Locked, updatedStatus: AuthenticationStatus.Unlocked },
{ initialStatus: AuthenticationStatus.Locked, updatedStatus: AuthenticationStatus.Locked }, // { initialStatus: AuthenticationStatus.Unlocked, updatedStatus: AuthenticationStatus.Locked },
// { initialStatus: AuthenticationStatus.Locked, updatedStatus: AuthenticationStatus.Locked },
{ initialStatus: AuthenticationStatus.Unlocked, updatedStatus: AuthenticationStatus.Unlocked }, { initialStatus: AuthenticationStatus.Unlocked, updatedStatus: AuthenticationStatus.Unlocked },
])( ])(
"does not re-connect when the user transitions from $initialStatus to $updatedStatus", "does not re-connect when the user transitions from $initialStatus to $updatedStatus",
@@ -252,7 +253,11 @@ describe("NotificationsService", () => {
}, },
); );
it.each([AuthenticationStatus.Locked, AuthenticationStatus.Unlocked])( it.each([
// Temporarily disabling notifications connecting while in a locked state
// AuthenticationStatus.Locked,
AuthenticationStatus.Unlocked,
])(
"connects when a user transitions from logged out to %s", "connects when a user transitions from logged out to %s",
async (newStatus: AuthenticationStatus) => { async (newStatus: AuthenticationStatus) => {
emitActiveUser(mockUser1); emitActiveUser(mockUser1);

10
libs/common/src/platform/notifications/internal/default-notifications.service.ts
View File

@@ -123,13 +123,13 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
); );
} }
// This method name is a lie currently as we also have an access token
// when locked, this is eventually where we want to be but it increases load
// on signalR so we are rolling back until we can move the load of browser to
// web push.
private hasAccessToken$(userId: UserId) { private hasAccessToken$(userId: UserId) {
return this.authService.authStatusFor$(userId).pipe( return this.authService.authStatusFor$(userId).pipe(
map( map((authStatus) => authStatus === AuthenticationStatus.Unlocked),
(authStatus) =>
authStatus === AuthenticationStatus.Locked ||
authStatus === AuthenticationStatus.Unlocked,
),
distinctUntilChanged(), distinctUntilChanged(),
); );
} }