pusher 5.1.2 → 5.2.0

package/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## 5.2.0
+
+- [CHANGED] Remove old notification references. It's no longer being used
+
+## 5.1.3
+
+[FIXED] Parsing of the extraTokens in webhook's isValid method
+
 ## 5.1.2
 
-- [CHANGED] Add types/node-fetch to dependencies.
+- [CHANGED] Add types/node-fetch to dependencies.
+
 ## 5.1.1-beta (2022-06-01)
 
 [FIXED] Updated typescript types with new user features.
@@ -90,7 +99,7 @@ const pusher = new Pusher.forURL(process.env.PUSHER_URL, {
 
 ## 2.2.1 (2019-07-03)
 
-no-op release to fix the description on https://www.npmjs.com/package/pusher
+no-op release to fix the description on <https://www.npmjs.com/package/pusher>
 
 ## 2.2.0 (2018-11-26)
 

package/lib/pusher.js

@@ -9,7 +9,6 @@ const requests = require("./requests")
 const PusherConfig = require("./pusher_config")
 const Token = require("./token")
 const WebHook = require("./webhook")
-const NotificationClient = require("./notification_client")
 
 const validateChannel = function (channel) {
   if (
@@ -52,10 +51,8 @@ const validateUserData = function (userData) {
  * @constructor
  * @param {Object} options
  * @param {String} [options.host="api.pusherapp.com"] API hostname
- * @param {String} [options.notification_host="api.pusherapp.com"] Notification API hostname
  * @param {Boolean} [options.useTLS=false] whether to use TLS
  * @param {Boolean} [options.encrypted=false] deprecated; renamed to `useTLS`
- * @param {Boolean} [options.notification_encrypted=false] whether to use TLS for notifications
  * @param {Integer} [options.port] port, default depends on the scheme
  * @param {Integer} options.appId application ID
  * @param {String} options.key application key
@@ -65,11 +62,6 @@ const validateUserData = function (userData) {
  */
 function Pusher(options) {
   this.config = new PusherConfig(options)
-  const notificationOptions = Object.assign({}, options, {
-    host: options.notificationHost,
-    encrypted: options.notificationEncrypted,
-  })
-  this.notificationClient = new NotificationClient(notificationOptions)
 }
 
 /** Create a Pusher instance using a URL.
@@ -237,10 +229,6 @@ Pusher.prototype.triggerBatch = function (batch) {
   return events.triggerBatch(this, batch)
 }
 
-Pusher.prototype.notify = function () {
-  this.notificationClient.notify.apply(this.notificationClient, arguments)
-}
-
 /** Makes a POST request to Pusher, handles the authentication.
  *
  * Returns a promise resolving to a response, or rejecting to a RequestError.

package/lib/token.js

@@ -7,31 +7,31 @@ const util = require("./util")
  * @param {String} key app key
  * @param {String} secret app secret
  */
-function Token(key, secret) {
-  this.key = key
-  this.secret = secret
-}
-
-/** Signs the string using the secret.
- *
- * @param {String} string
- * @returns {String}
- */
-Token.prototype.sign = function (string) {
-  return crypto
-    .createHmac("sha256", this.secret)
-    .update(Buffer.from(string))
-    .digest("hex")
-}
-
-/** Checks if the string has correct signature.
- *
- * @param {String} string
- * @param {String} signature
- * @returns {Boolean}
- */
-Token.prototype.verify = function (string, signature) {
-  return util.secureCompare(this.sign(string), signature)
+class Token {
+  constructor(key, secret) {
+    this.key = key
+    this.secret = secret
+  }
+  /** Signs the string using the secret.
+   *
+   * @param {String} string
+   * @returns {String}
+   */
+  sign(string) {
+    return crypto
+      .createHmac("sha256", this.secret)
+      .update(Buffer.from(string))
+      .digest("hex")
+  }
+  /** Checks if the string has correct signature.
+   *
+   * @param {String} string
+   * @param {String} signature
+   * @returns {Boolean}
+   */
+  verify(string, signature) {
+    return util.secureCompare(this.sign(string), signature)
+  }
 }
 
 module.exports = Token

package/lib/webhook.js

@@ -1,4 +1,5 @@
 const errors = require("./errors")
+const Token = require("./token")
 
 /** Provides validation and access methods for a WebHook.
  *
@@ -46,7 +47,10 @@ WebHook.prototype.isValid = function (extraTokens) {
 
   const tokens = [this.token].concat(extraTokens)
   for (const i in tokens) {
-    const token = tokens[i]
+    let token = tokens[i]
+    if (token instanceof Token === false) {
+      token = new Token(token.key, token.secret)
+    }
     if (this.key == token.key && token.verify(this.body, this.signature)) {
       return true
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pusher",
   "description": "Node.js client to interact with the Pusher Channels REST API",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "author": "Pusher <support@pusher.com>",
   "contributors": [
     {

package/lib/notification_client.js

@@ -1,25 +0,0 @@
-const requests = require("./requests")
-const NotificationConfig = require("./notification_config")
-
-function NotificationClient(options) {
-  this.config = new NotificationConfig(options)
-}
-
-NotificationClient.prototype.notify = function (interests, notification) {
-  if (!Array.isArray(interests)) {
-    throw new Error("Interests must be an array")
-  }
-
-  if (interests.length == 0) {
-    throw new Error("Interests array must not be empty")
-  }
-
-  const body = Object.assign({ interests: interests }, notification)
-  return requests.send(this.config, {
-    method: "POST",
-    body: body,
-    path: "/notifications",
-  })
-}
-
-module.exports = NotificationClient

package/lib/notification_config.js

@@ -1,18 +0,0 @@
-const Config = require("./config")
-
-const DEFAULT_HOST = "nativepush-cluster1.pusher.com"
-const API_PREFIX = "server_api"
-const API_VERSION = "v1"
-
-function NotificationConfig(options) {
-  Config.call(this, options)
-  this.host = options.host || DEFAULT_HOST
-}
-
-Object.assign(NotificationConfig.prototype, Config.prototype)
-
-NotificationConfig.prototype.prefixPath = function (subPath) {
-  return "/" + API_PREFIX + "/" + API_VERSION + "/apps/" + this.appId + subPath
-}
-
-module.exports = NotificationConfig

package/tests/integration/pusher/notification_client.js

@@ -1,49 +0,0 @@
-const expect = require("expect.js")
-const NotificationClient = require("../../../lib/notification_client")
-const nock = require("nock")
-
-describe("NativeNotificationClient", function () {
-  let client
-
-  beforeEach(function () {
-    client = new NotificationClient({
-      appId: 1234,
-      key: "f00d",
-      secret: "tofu",
-    })
-    nock.cleanAll()
-    nock.disableNetConnect()
-  })
-
-  afterEach(function () {
-    nock.cleanAll()
-    nock.enableNetConnect()
-  })
-
-  xit("should send in the success case", function (done) {
-    const mock = nock("nativepush-cluster1.pusher.com:80")
-    client.notify(
-      ["yolo"],
-      {
-        apns: {
-          aps: {
-            alert: {
-              title: "yolo",
-              body: "woot",
-            },
-          },
-        },
-        gcm: {
-          notification: {
-            title: "huzzah",
-            icon: "woot",
-          },
-        },
-      },
-      function () {
-        expect(mock.isDone()).to.be(true)
-        done()
-      }
-    )
-  })
-})