Merge pull request #1374 from OneSignal/fadi/sdk-2932-bug-onesignalnotificationss-event-permissionchange-not

SDK-2932 Denied permission should trigger notifications listener

Author: fadi-george

index.html

@@ -46,10 +46,15 @@
 
       // // uncomment to test push subscription change listener
       // OneSignalDeferred.push(function (OneSignal) {
-      //   OneSignal.User.PushSubscription.addEventListener(
-      //     'change',
-      //     pushSubscriptionChangeListener,
-      //   );
+      //   OneSignal.User.PushSubscription.addEventListener('change', (e) => {
+      //     console.log('PushSubscription.addEventListener', e);
+      //   });
+      //   OneSignal.Notifications.addEventListener('change', (e) => {
+      //     console.log('Notifications.addEventListener', e);
+      //   });
+      //   OneSignal.Notifications.addEventListener('permissionChange', (e) => {
+      //     console.log('permissionChange', e);
+      //   });
       // });
 
       // uncomment to test login

src/shared/helpers/permission.test.ts

@@ -34,13 +34,6 @@ test.each([
 ] as const)(
   'When permission changes to %s, ensure permissionChange fires with %s',
   async (permission, expected) => {
-    if (permission !== 'granted') {
-      await db.put('Options', {
-        key: 'notificationPermission',
-        value: 'granted',
-      });
-    }
-
     const expectedPromise = expectPermissionChangeEvent(expected);
     await callPermissionChange(permission);
     await expectedPromise;
@@ -97,6 +90,23 @@ test('Should update Notification.permission in time', async () => {
   await promise;
 });
 
+test('should handle denied permission', async () => {
+  TestEnvironment.initialize({
+    permission: 'default',
+  });
+
+  const { resolve, promise } = Promise.withResolvers<void>();
+  OneSignal.Notifications.addEventListener('permissionChange', (isGranted) => {
+    expect(isGranted).toBe(false);
+    expect(OneSignal.Notifications.permission).toBe(false);
+    expect(OneSignal.Notifications.permissionNative).toBe('denied');
+    resolve();
+  });
+
+  callPermissionChange('denied');
+  await promise;
+});
+
 Object.defineProperty(global.navigator, 'serviceWorker', {
   value: new MockServiceWorker(),
   writable: true,

src/shared/helpers/permissions.ts

@@ -51,12 +51,10 @@ const triggerBooleanPermissionChangeEvent = (
   force: boolean,
 ): void => {
   const newPermissionBoolean = newPermission === 'granted';
-  const previousPermissionBoolean = previousPermission === 'granted';
-  const triggerEvent =
-    newPermissionBoolean !== previousPermissionBoolean || force;
-  if (!triggerEvent) {
-    return;
-  }
+
+  const triggerEvent = newPermission !== previousPermission || force;
+  if (!triggerEvent) return;
+
   OneSignalEvent.trigger(
     OneSignal.EVENTS.NOTIFICATION_PERMISSION_CHANGED_AS_BOOLEAN,
     newPermissionBoolean,