wip: test

Author: itrush

src/service-worker/ServiceWorker.ts

@@ -771,17 +771,17 @@ export class ServiceWorker {
         const defaultNotificationUrlFromConfig = config.origin;
         if (defaultNotificationUrlFromConfig) {
           launchUrl = defaultNotificationUrlFromConfig;
+
+          if (!dbDefaultNotificationUrl) {
+            // intentionally not awaiting this promise to not block notification click handling
+            await Database.setAppState({ defaultNotificationUrl: defaultNotificationUrlFromConfig }).catch(e => {
+              Log.error("Failed to save default notification url to db", e);
+            });
+          }
         }
       } catch (e) {
         Log.error("Failed to get app config to determine default notification url", e);
       }
-
-      if (!!launchUrl && !dbDefaultNotificationUrl) {
-        // intentionally not awaiting this promise to not block notification click handling
-        Database.setAppState({ defaultNotificationUrl: launchUrl }).catch(e => {
-          Log.error("Failed to save default notification url to db", e);
-        });
-      }
     }
 
     // If the user clicked an action button, use the URL provided by the action button

test/support/tester/NockOneSignalHelper.ts

@@ -38,6 +38,18 @@ export class NockOneSignalHelper {
       }
     });
   }
+  
+  static nockGetConfig(appId: string, body: any): NockScopeWithResultPromise {
+    return NockHelper.nockBase({
+      method: "get",
+      baseUrl: "https://onesignal.com",
+      path: `/sync/${appId}/web`,
+      reply: {
+        status: 200,
+        body: body
+      }
+    });
+  }
 
   static nockNotificationConfirmedDelivery(notificationId?: string): NockScopeWithResultPromise {
     return NockHelper.nockBase({

test/unit/context/sw/ServiceWorker.ts

@@ -18,6 +18,7 @@ import OneSignalUtils from '../../../../src/utils/OneSignalUtils';
 import { setupFakePlayerId } from '../../../support/tester/utils';
 import * as awaitableTimeout from '../../../../src/utils/AwaitableTimeout';
 import { NockOneSignalHelper } from '../../../../test/support/tester/NockOneSignalHelper';
+import { ConfigIntegrationKind } from '../../../../src/models/AppConfig';
 
 declare var self: MockServiceWorkerGlobalScope;
 
@@ -260,6 +261,38 @@ test('onNotificationClicked - notification PUT Before openWindow', async t => {
   t.deepEqual(callOrder, ["notificationPut", "openWindow"]);
 });
 
+test('onNotificationClicked - get web config before open if empty in database', async t => {
+  await Database.remove("Options", "defaultUrl");
+
+   // Assert the URL is empty in the database
+   const urlBefore = await Database.get("Options", "defaultUrl");
+   t.true(urlBefore === undefined || urlBefore === null);
+
+  const serverConfig = TestEnvironment.getFakeServerAppConfig(ConfigIntegrationKind.Custom, false, null, appConfig.appId);
+  t.is(serverConfig.config.origin, "http://localhost:3000");
+  const webConfigNock = NockOneSignalHelper.nockGetConfig(appConfig.appId, serverConfig);
+
+  const notificationId = Random.getRandomUuid();
+
+  const callOrder: string[] = [];
+  sandbox.stub(self.clients, "openWindow", function() {
+    callOrder.push("openWindow");
+  });
+
+  const notificationPutCall = NockOneSignalHelper.nockNotificationPut(notificationId);
+
+  const notificationEvent = mockNotificationNotificationEventInit(notificationId);
+  await OSServiceWorker.onNotificationClicked(notificationEvent);
+
+  t.true(webConfigNock.nockScope.isDone());
+  t.true(notificationPutCall.nockScope.isDone());
+  t.deepEqual(callOrder, ["notificationPut", "openWindow"]);
+
+  // Assert the URL is set after the handler runs
+  const urlAfter = await Database.get("Options", "defaultUrl");
+  t.is(urlAfter, "http://localhost:3000");
+});
+
 /***************************************************
  * sendConfirmedDelivery()
  ****************************************************/