From d944ae12ca0d77c76879053afaa1c763ff17113f Mon Sep 17 00:00:00 2001 From: Patrick Pimentel Date: Thu, 28 Aug 2025 15:35:26 -0400 Subject: [PATCH] fix(extension-device-approval): [PM-14943] Answering Service Full Implementation - Minor changes to default server notifications service. --- .../default-server-notifications.service.ts | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts index 79a22cfe017..60a5ecb461d 100644 --- a/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts +++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts @@ -165,9 +165,24 @@ export class DefaultServerNotificationsService implements ServerNotificationsSer } private hasAccessToken$(userId: UserId) { - return this.authService.authStatusFor$(userId).pipe( - map((authStatus) => authStatus === AuthenticationStatus.Unlocked), - distinctUntilChanged(), + return this.configService.getFeatureFlag$(FeatureFlag.PushNotificationsWhenLocked).pipe( + switchMap((featureFlagEnabled) => { + if (featureFlagEnabled) { + return this.authService.authStatusFor$(userId).pipe( + map( + (authStatus) => + authStatus === AuthenticationStatus.Locked || + authStatus === AuthenticationStatus.Unlocked, + ), + distinctUntilChanged(), + ); + } else { + return this.authService.authStatusFor$(userId).pipe( + map((authStatus) => authStatus === AuthenticationStatus.Unlocked), + distinctUntilChanged(), + ); + } + }), ); }