@braze/web-sdk 6.10.2 → 6.12.0

package/src/Push/push-manager.js

@@ -1,43 +1,43 @@
-import { isArray as g, isEqual as oi } from "../util/code-utils.js";
-import ui from "../models/push-token.js";
-import { logger as b, EncodingUtils as ai } from "../../shared-lib/index.js";
+import { EncodingUtils as oi, logger as b } from "../../shared-lib/index.js";
 import { STORAGE_KEYS as s } from "../managers/storage-manager.js";
+import ui from "../models/push-token.js";
 import { User } from "../User/index.js";
-import It from "./utils/push-utils.js";
-import { getErrorMessage as hi } from "../util/error-utils.js";
+import { isArray as g, isEqual as hi } from "../util/code-utils.js";
+import { getErrorMessage as ci } from "../util/error-utils.js";
+import Dt from "./utils/push-utils.js";
 export default class na {
-  constructor(i, t, e, s, r, n, o, u, a, h, c) {
+  constructor(i, e, t, s, r, o, n, u, h, a, c) {
     (this.iu = i),
-      (this.tu = t),
       (this.eu = e),
+      (this.tu = t),
       (this.su = r),
-      (this.ru = n),
-      (this.nu = o),
+      (this.ru = o),
+      (this.ou = n),
       (this.h = u),
-      (this.ou = a),
-      (this.uu = h),
+      (this.nu = h),
+      (this.uu = a),
       (this.j = c),
       (this.iu = i),
-      (this.tu = t),
       (this.eu = e),
-      (this.au = s + "/safari/" + t),
+      (this.tu = t),
+      (this.hu = s + "/safari/" + e),
       (this.su = r || "/service-worker.js"),
-      (this.nu = o),
+      (this.ou = n),
       (this.h = u),
-      (this.ou = a || !1),
-      (this.uu = h || !1),
+      (this.nu = h || !1),
+      (this.uu = a || !1),
       (this.j = c),
-      (this.hu = It.cu()),
-      (this.fu = It.lu());
+      (this.au = Dt.cu()),
+      (this.fu = Dt.du());
   }
-  du() {
+  lu() {
     return this.uu;
   }
-  pu(i, t, e, s, r) {
+  pu(i, e, t, s, r) {
     i.unsubscribe()
       .then((i) => {
         i
-          ? this.bu(t, e, s, r)
+          ? this.bu(e, t, s, r)
           : (b.error("Failed to unsubscribe device from push."),
             "function" == typeof r && r(!1));
       })
@@ -46,101 +46,101 @@ export default class na {
           "function" == typeof r && r(!1);
       });
   }
-  yu(i, t, e) {
+  mu(i, e, t) {
     var s;
     const r = ((i) => {
       if ("string" == typeof i) return i;
       if (0 !== i.endpoint.indexOf("https://android.googleapis.com/gcm/send"))
         return i.endpoint;
-      let t = i.endpoint;
-      const e = i;
+      let e = i.endpoint;
+      const t = i;
       return (
-        e.mu &&
-          -1 === i.endpoint.indexOf(e.mu) &&
-          (t = i.endpoint + "/" + e.mu),
-        t
+        t.gu &&
+          -1 === i.endpoint.indexOf(t.gu) &&
+          (e = i.endpoint + "/" + t.gu),
+        e
       );
     })(i);
-    let n = null,
-      o = null;
+    let o = null,
+      n = null;
     const u = i;
     if (null != u.getKey)
       try {
         const i = Array.from(new Uint8Array(u.getKey("p256dh"))),
-          t = Array.from(new Uint8Array(u.getKey("auth")));
-        (n = btoa(String.fromCharCode.apply(null, i))),
-          (o = btoa(String.fromCharCode.apply(null, t)));
+          e = Array.from(new Uint8Array(u.getKey("auth")));
+        (o = btoa(String.fromCharCode.apply(null, i))),
+          (n = btoa(String.fromCharCode.apply(null, e)));
       } catch (i) {
-        b.error(hi(i));
+        b.error(ci(i));
       }
-    const a = ((i) => {
-      let t;
+    const h = ((i) => {
+      let e;
       return i.options &&
-        (t = i.options.applicationServerKey) &&
-        t.byteLength &&
-        t.byteLength > 0
-        ? btoa(String.fromCharCode.apply(null, Array.from(new Uint8Array(t))))
+        (e = i.options.applicationServerKey) &&
+        e.byteLength &&
+        e.byteLength > 0
+        ? btoa(String.fromCharCode.apply(null, Array.from(new Uint8Array(e))))
             .replace(/\+/g, "-")
             .replace(/\//g, "_")
         : null;
     })(u);
-    null === (s = this.iu) || void 0 === s || s.gu(r, t, n, o, a),
-      r && "function" == typeof e && e(r, n, o);
+    null === (s = this.iu) || void 0 === s || s.yu(r, e, o, n, h),
+      r && "function" == typeof t && t(r, o, n);
   }
   vu() {
     var i;
     null === (i = this.iu) || void 0 === i || i.wu(!0);
   }
-  ku(i, t) {
-    var e;
-    null === (e = this.iu) || void 0 === e || e.wu(!1),
+  Pu(i, e) {
+    var t;
+    null === (t = this.iu) || void 0 === t || t.wu(!1),
       b.info(i),
-      "function" == typeof t && t(!1);
+      "function" == typeof e && e(!1);
   }
-  Pu(i, t, e, s) {
+  ku(i, e, t, s) {
     var r;
-    if ("default" === t.permission)
+    if ("default" === e.permission)
       try {
         window.safari.pushNotification.requestPermission(
-          this.au,
+          this.hu,
           i,
           {
-            api_key: this.tu,
+            api_key: this.eu,
             device_id:
-              (null === (r = this.eu) || void 0 === r ? void 0 : r.ve().id) ||
+              (null === (r = this.tu) || void 0 === r ? void 0 : r.ve().id) ||
               "",
           },
-          (t) => {
-            "granted" === t.permission &&
+          (e) => {
+            "granted" === e.permission &&
               this.iu &&
               this.iu.setPushNotificationSubscriptionType(
                 User.NotificationSubscriptionTypes.OPTED_IN,
               ),
-              this.Pu(i, t, e, s);
+              this.ku(i, e, t, s);
           },
         );
       } catch (i) {
-        this.ku("Could not request permission for push: " + i, s);
+        this.Pu("Could not request permission for push: " + i, s);
       }
     else
-      "denied" === t.permission
-        ? this.ku(
+      "denied" === e.permission
+        ? this.Pu(
             "The user has blocked notifications from this site, or Safari push is not configured in the Braze dashboard.",
             s,
           )
-        : "granted" === t.permission &&
+        : "granted" === e.permission &&
           (b.info("Device successfully subscribed to push."),
-          this.yu(t.deviceToken, new Date(), e));
+          this.mu(e.deviceToken, new Date(), t));
   }
-  requestPermission(i, t, e) {
+  requestPermission(i, e, t) {
     const s = (s) => {
       switch (s) {
         case "granted":
           return void ("function" == typeof i && i());
         case "default":
-          return void ("function" == typeof t && t());
-        case "denied":
           return void ("function" == typeof e && e());
+        case "denied":
+          return void ("function" == typeof t && t());
         default:
           b.error("Received unexpected permission result " + s);
       }
@@ -159,17 +159,17 @@ export default class na {
         : (r = !0);
     }
   }
-  bu(i, t, e, s) {
+  bu(i, e, t, s) {
     const r = { userVisibleOnly: !0 };
-    null != t && (r.applicationServerKey = t),
+    null != e && (r.applicationServerKey = e),
       i.pushManager
         .subscribe(r)
         .then((i) => {
           b.info("Device successfully subscribed to push."),
-            this.yu(i, new Date(), e);
+            this.mu(i, new Date(), t);
         })
         .catch((i) => {
-          It.isPushBlocked()
+          Dt.isPushBlocked()
             ? (b.info("Permission for push notifications was denied."),
               "function" == typeof s && s(!1))
             : (b.error("Push subscription failed: " + i),
@@ -177,7 +177,7 @@ export default class na {
         });
   }
   Du() {
-    if (this.ou) return navigator.serviceWorker.getRegistration(this.su);
+    if (this.nu) return navigator.serviceWorker.getRegistration(this.su);
     const i = this.ru ? { scope: this.ru } : void 0;
     return navigator.serviceWorker.register(this.su, i).then(() =>
       navigator.serviceWorker.ready.then(
@@ -193,158 +193,201 @@ export default class na {
     );
   }
   Su(i) {
-    this.ou ||
+    this.nu ||
       (i.unregister(), b.info("Service worker successfully unregistered."));
   }
-  subscribe(i, t) {
-    if (!It.isPushSupported())
-      return b.info(na.Au), void ("function" == typeof t && t(!1));
-    if (this.hu) {
-      if (!this.ou && null != window.location) {
+  subscribe(i, e) {
+    if (!Dt.isPushSupported())
+      return b.info(na.Au), void ("function" == typeof e && e(!1));
+    if (this.au) {
+      if (!this.nu && null != window.location) {
         let i = this.su;
         -1 === i.indexOf(window.location.host) &&
           (i = window.location.host + i),
           -1 === i.indexOf(window.location.protocol) &&
             (i = window.location.protocol + "//" + i);
       }
-      if (It.isPushBlocked())
-        return void this.ku(
+      if (Dt.isPushBlocked())
+        return void this.Pu(
           "Notifications from this site are blocked. This may be a temporary embargo or a permanent denial.",
-          t,
+          e,
         );
-      if (this.h && !this.h.ju() && 0 === this.h.Qt())
+      if (this.h && !this.h.Wu() && 0 === this.h.Qt())
         return (
           b.info(
             "Waiting for VAPID key from server config before subscribing to push.",
           ),
-          void this.h.xu(() => {
-            this.subscribe(i, t);
+          void this.h.ju(() => {
+            this.subscribe(i, e);
           })
         );
-      const e = () => {
+      const t = () => {
           b.info("Permission for push notifications was denied."),
-            "function" == typeof t && t(!1);
+            "function" == typeof e && e(!1);
         },
-        r = () => {
+        s = () => {
           let i = "Permission for push notifications was ignored.";
-          It.isPushBlocked() &&
+          Dt.isPushBlocked() &&
             (i +=
               " The browser has automatically blocked further permission requests for a period (probably 1 week)."),
             b.info(i),
-            "function" == typeof t && t(!0);
+            "function" == typeof e && e(!0);
         },
-        n = It.isPushPermissionGranted(),
+        r = Dt.isPushPermissionGranted(),
         o = () => {
-          !n &&
+          !r &&
             this.iu &&
             this.iu.setPushNotificationSubscriptionType(
               User.NotificationSubscriptionTypes.OPTED_IN,
             ),
-            this.Du()
-              .then((e) => {
-                if (null == e)
-                  return (
-                    b.error(
-                      "No service worker registration. Set the `manageServiceWorkerExternally` initialization option to false or ensure that your service worker is registered before calling registerPush.",
-                    ),
-                    void ("function" == typeof t && t(!0))
-                  );
-                e.pushManager
-                  .getSubscription()
-                  .then((r) => {
-                    var n;
-                    let o = null;
-                    if (
-                      (null !=
-                        (null === (n = this.h) || void 0 === n
-                          ? void 0
-                          : n.ju()) && (o = ai.Nu(this.h.ju())),
-                      r)
-                    ) {
-                      let n,
-                        u = null,
-                        a = null;
-                      if ((this.j && (n = this.j.St(s.It.Uu)), n && !g(n))) {
-                        let i;
-                        try {
-                          i = ui._u(n).Wu;
-                        } catch (t) {
-                          i = null;
-                        }
-                        null == i ||
-                          isNaN(i.getTime()) ||
-                          0 === i.getTime() ||
-                          ((u = i),
-                          (a = new Date(u)),
-                          a.setMonth(u.getMonth() + 6));
-                      }
-                      null != o &&
-                      r.options &&
-                      r.options.applicationServerKey &&
-                      r.options.applicationServerKey.byteLength &&
-                      r.options.applicationServerKey.byteLength > 0 &&
-                      !oi(o, new Uint8Array(r.options.applicationServerKey))
-                        ? (r.options.applicationServerKey.byteLength > 12
-                            ? b.info(
-                                "Device was already subscribed to push using a different VAPID provider, creating new subscription.",
-                              )
-                            : b.info(
-                                "Attempting to upgrade a gcm_sender_id-based push registration to VAPID - depending on the browser this may or may not result in the same gcm_sender_id-based subscription.",
-                              ),
-                          this.pu(r, e, o, i, t))
-                        : r.expirationTime &&
-                          new Date(r.expirationTime).valueOf() <=
-                            new Date().valueOf()
-                        ? (b.info(
-                            "Push subscription is expired, creating new subscription.",
-                          ),
-                          this.pu(r, e, o, i, t))
-                        : n && g(n)
-                        ? this.pu(r, e, o, i, t)
-                        : null == a
-                        ? (b.info(
-                            "No push subscription creation date found, creating new subscription.",
-                          ),
-                          this.pu(r, e, o, i, t))
-                        : a.valueOf() <= new Date().valueOf()
-                        ? (b.info(
-                            "Push subscription older than 6 months, creating new subscription.",
-                          ),
-                          this.pu(r, e, o, i, t))
-                        : (b.info(
-                            "Device already subscribed to push, sending existing subscription to backend.",
-                          ),
-                          this.yu(r, u, i));
-                    } else this.bu(e, o, i, t);
-                  })
-                  .catch((i) => {
-                    b.error("Error checking current push subscriptions: " + i);
-                  });
-              })
-              .catch((i) => {
-                b.error("ServiceWorker registration failed: " + i);
-              });
+            this.Nu(i, e);
         };
-      this.requestPermission(o, r, e);
+      this.requestPermission(o, s, t);
     } else if (this.fu) {
-      if (null == this.nu || "" === this.nu)
+      if (null == this.ou || "" === this.ou)
         return (
           b.error(
             "You must supply the safariWebsitePushId initialization option in order to use registerPush on Safari",
           ),
-          void ("function" == typeof t && t(!0))
+          void ("function" == typeof e && e(!0))
         );
-      const e = window.safari.pushNotification.permission(this.nu);
-      this.Pu(this.nu, e, i, t);
+      const t = window.safari.pushNotification.permission(this.ou);
+      this.ku(this.ou, t, i, e);
     }
   }
-  unsubscribe(i, t) {
-    if (!It.isPushSupported())
+  registerPush(i, e) {
+    if (!Dt.isPushSupported())
+      return b.info(na.Au), void ("function" == typeof e && e(!1));
+    if (this.au) {
+      if (Dt.isPushBlocked())
+        return void this.Pu(
+          "Notifications from this site are blocked. This may be a temporary embargo or a permanent denial.",
+          e,
+        );
+      if (this.h && !this.h.Wu() && 0 === this.h.Qt())
+        return (
+          b.info(
+            "Waiting for VAPID key from server config before registering push.",
+          ),
+          void this.h.ju(() => {
+            this.registerPush(i, e);
+          })
+        );
+      if (!Dt.isPushPermissionGranted())
+        return void b.info(
+          "Push permission has not been granted, so registerPush is a no-op. Call requestPushPermission to prompt the user for permission.",
+        );
+      this.Nu(i, e);
+    } else if (this.fu) {
+      if (null == this.ou || "" === this.ou)
+        return (
+          b.error(
+            "You must supply the safariWebsitePushId initialization option in order to use registerPush on Safari",
+          ),
+          void ("function" == typeof e && e(!0))
+        );
+      const t = window.safari.pushNotification.permission(this.ou);
+      "granted" === t.permission
+        ? this.ku(this.ou, t, i, e)
+        : "denied" === t.permission
+        ? this.Pu(
+            "The user has blocked notifications from this site, or Safari push is not configured in the Braze dashboard.",
+            e,
+          )
+        : b.info(
+            "Push permission has not been granted, so registerPush is a no-op. Call requestPushPermission to prompt the user for permission.",
+          );
+    }
+  }
+  Nu(i, e) {
+    this.Du()
+      .then((t) => {
+        if (null == t)
+          return (
+            b.error(
+              "No service worker registration. Set the `manageServiceWorkerExternally` initialization option to false or ensure that your service worker is registered before calling registerPush.",
+            ),
+            void ("function" == typeof e && e(!0))
+          );
+        t.pushManager
+          .getSubscription()
+          .then((r) => {
+            var o;
+            let n = null;
+            if (
+              (null !=
+                (null === (o = this.h) || void 0 === o ? void 0 : o.Wu()) &&
+                (n = oi.Tu(this.h.Wu())),
+              r)
+            ) {
+              let o,
+                u = null,
+                h = null;
+              if ((this.j && (o = this.j.St(s.It.xu)), o && !g(o))) {
+                let i;
+                try {
+                  i = ui._u(o).Uu;
+                } catch (e) {
+                  i = null;
+                }
+                null == i ||
+                  isNaN(i.getTime()) ||
+                  0 === i.getTime() ||
+                  ((u = i), (h = new Date(u)), h.setMonth(u.getMonth() + 6));
+              }
+              null != n &&
+              r.options &&
+              r.options.applicationServerKey &&
+              r.options.applicationServerKey.byteLength &&
+              r.options.applicationServerKey.byteLength > 0 &&
+              !hi(n, new Uint8Array(r.options.applicationServerKey))
+                ? (r.options.applicationServerKey.byteLength > 12
+                    ? b.info(
+                        "Device was already subscribed to push using a different VAPID provider, creating new subscription.",
+                      )
+                    : b.info(
+                        "Attempting to upgrade a gcm_sender_id-based push registration to VAPID - depending on the browser this may or may not result in the same gcm_sender_id-based subscription.",
+                      ),
+                  this.pu(r, t, n, i, e))
+                : r.expirationTime &&
+                  new Date(r.expirationTime).valueOf() <= new Date().valueOf()
+                ? (b.info(
+                    "Push subscription is expired, creating new subscription.",
+                  ),
+                  this.pu(r, t, n, i, e))
+                : o && g(o)
+                ? this.pu(r, t, n, i, e)
+                : null == h
+                ? (b.info(
+                    "No push subscription creation date found, creating new subscription.",
+                  ),
+                  this.pu(r, t, n, i, e))
+                : h.valueOf() <= new Date().valueOf()
+                ? (b.info(
+                    "Push subscription older than 6 months, creating new subscription.",
+                  ),
+                  this.pu(r, t, n, i, e))
+                : (b.info(
+                    "Device already subscribed to push, sending existing subscription to backend.",
+                  ),
+                  this.mu(r, u, i));
+            } else this.bu(t, n, i, e);
+          })
+          .catch((i) => {
+            b.error("Error checking current push subscriptions: " + i);
+          });
+      })
+      .catch((i) => {
+        b.error("ServiceWorker registration failed: " + i);
+      });
+  }
+  unsubscribe(i, e) {
+    if (!Dt.isPushSupported())
       return b.info(na.Au), void ("function" == typeof i && i());
-    this.hu
-      ? navigator.serviceWorker.getRegistration(this.su).then((e) => {
-          e
-            ? e.pushManager
+    this.au
+      ? navigator.serviceWorker.getRegistration(this.su).then((t) => {
+          t
+            ? t.pushManager
                 .getSubscription()
                 .then((s) => {
                   s
@@ -360,19 +403,19 @@ export default class na {
                             : (b.error(
                                 "Failed to unsubscribe device from push.",
                               ),
-                              "function" == typeof t && t()),
-                            this.Su(e);
+                              "function" == typeof e && e()),
+                            this.Su(t);
                         })
                         .catch((i) => {
                           b.error("Push unsubscription error: " + i),
-                            "function" == typeof t && t();
+                            "function" == typeof e && e();
                         }))
                     : (b.info("Device already unsubscribed from push."),
                       "function" == typeof i && i());
                 })
                 .catch((i) => {
                   b.error("Error unsubscribing from push: " + i),
-                    "function" == typeof t && t();
+                    "function" == typeof e && e();
                 })
             : (b.info("Device already unsubscribed from push."),
               "function" == typeof i && i());

package/src/Push/register-push.js

@@ -0,0 +1,9 @@
+import r from "../managers/braze-instance.js";
+import ra from "./push-manager-factory.js";
+export function registerPush(t, n) {
+  if (r.rr())
+    return ra.ra().registerPush((n, o, e) => {
+      const s = r.nn();
+      s && s.requestImmediateDataFlush(), "function" == typeof t && t(n, o, e);
+    }, n);
+}

package/src/Push/unregister-push-token-on-server.js

@@ -8,18 +8,18 @@ export function unregisterPushTokenOnServer() {
   const e = r.m();
   if (!e) return;
   const t = r.p(),
-    n = null == t ? void 0 : t.St(s.It.Uu);
+    n = null == t ? void 0 : t.St(s.It.xu);
   if (!n || "object" != typeof n || Array.isArray(n)) return;
   const o = ui._u(n);
   if (!o.endpoint) return;
   const i = e.Z({}, !0);
   i.push_token = o.endpoint;
-  const a = e.tt(i, h.it.qa);
+  const a = e.tt(i, h.it.ka);
   e.et(
     i,
     (n = -1) => {
       r.rr() &&
-        (h.nt(t, h.it.qa, new Date().valueOf()),
+        (h.nt(t, h.it.ka, new Date().valueOf()),
         -1 !== n && a.push(["X-Braze-Req-Tokens-Remaining", n.toString()]),
         l.ot({
           url: `${e.ht()}/push/unregister`,
@@ -30,6 +30,6 @@ export function unregisterPushTokenOnServer() {
           },
         }));
     },
-    h.it.qa,
+    h.it.ka,
   );
 }