fix: allow setting of clientUrl for web push registrations

Author: gyoshev

src/LeanplumInternal.ts

@@ -560,7 +560,8 @@ Use "npm update leanplum-sdk" or go to https://docs.leanplum.com/reference#javas
    * @return {Promise} Resolves if true, rejects if false.
    */
   isWebPushSubscribed(): Promise<boolean> {
-    return this._pushManager.isWebPushSubscribed()
+    const clientUrl = this._webPushOptions?.clientUrl || ''
+    return this._pushManager.isWebPushSubscribed(clientUrl)
   }
 
   setWebPushOptions(options: WebPushOptions): void {
@@ -598,7 +599,8 @@ Use "npm update leanplum-sdk" or go to https://docs.leanplum.com/reference#javas
    * @return {Promise}            Resolves on success, otherwise rejects.
    */
   unregisterFromWebPush(): Promise<void> {
-    return this._pushManager.unsubscribeUser()
+    const clientUrl = this._webPushOptions?.clientUrl || ''
+    return this._pushManager.unsubscribeUser(clientUrl)
   }
 
   /**

src/PushManager.ts

@@ -53,12 +53,12 @@ export default class PushManager {
    * Whether or not the browser is subscribed to web push notifications.
    * @return {Promise} True if subscribed, else false.
    */
-  public async isWebPushSubscribed(): Promise<boolean> {
+  public async isWebPushSubscribed(clientUrl = ''): Promise<boolean> {
     if (!this.isWebPushSupported()) {
       return false
     }
 
-    const registration = await this.getServiceWorkerRegistration()
+    const registration = await this.getServiceWorkerRegistration(clientUrl)
 
     if (!registration) {
       return false
@@ -139,8 +139,8 @@ export default class PushManager {
    * Unsubscribe the user(browser) from push.
    * @return {Promise} Resolves if unsubscribed, otherwise rejects.
    */
-  public async unsubscribeUser(): Promise<void> {
-    const subscribed = await this.isWebPushSubscribed()
+  public async unsubscribeUser(clientUrl = ''): Promise<void> {
+    const subscribed = await this.isWebPushSubscribed(clientUrl)
 
     if (subscribed) {
       try {
@@ -161,9 +161,9 @@ export default class PushManager {
    * Retrieves the service worker registration object from browser.
    * @return {object} Returns the registration or null.
    */
-  private async getServiceWorkerRegistration(): Promise<ServiceWorkerRegistration> {
+  private async getServiceWorkerRegistration(clientUrl = ''): Promise<ServiceWorkerRegistration> {
     if (!this.serviceWorkerRegistration) {
-      this.serviceWorkerRegistration = await this.serviceWorker.getRegistration()
+      this.serviceWorkerRegistration = await this.serviceWorker.getRegistration(clientUrl)
     }
 
     return this.serviceWorkerRegistration

src/types/public.ts

@@ -55,6 +55,7 @@ export type EventType = 'start' | 'resume' | 'track' | 'setUserAttribute' | 'adv
 export interface WebPushOptions {
   serviceWorkerUrl?: string;
   scope?: string;
+  clientUrl?: string;
 }
 
 export enum ActionParameterType {

test/specs/LeanplumInternal.test.ts

@@ -563,6 +563,23 @@ describe(LeanplumInternal, () => {
         expect(registerCall[0]).toEqual(serviceWorkerUrl)
         expect(registerCall[1]).toEqual({ scope })
       })
+
+      it('can set client url for push regsitration', async() => {
+        pushManagerMock.isWebPushSupported.mockReturnValueOnce(true)
+
+        const clientUrl = '/products'
+
+        lp.setWebPushOptions({ clientUrl })
+
+        await lp.registerForWebPush()
+        await lp.unregisterFromWebPush()
+
+        const isSubscribed = pushManagerMock.isWebPushSubscribed.mock.calls
+        expect(isSubscribed.every(call => call[0] === clientUrl)).toBe(true);
+
+        const unsubscribeUser = pushManagerMock.unsubscribeUser.mock.calls
+        expect(unsubscribeUser.every(call => call[0] === clientUrl)).toBe(true);
+      })
     })
 
     describe('unregisterFromWebPush', () => {