rejoiner 2.10.2 → 2.11.0

package/lib/config.js

@@ -2,13 +2,16 @@ const VERSION = require('../package.json').version
 
 const { REJOINER_API_KEY, REJOINER_SITE_ID, REJOINER_WEBHOOK_SECRET } = process.env
 
-const DEFAULT_BASE_URL = 'https://rj2.rejoiner.com/api/v1'
+const DEFAULT_API_VERSION = 1
+
+const DEFAULT_BASE_URL = 'https://rj2.rejoiner.com/api'
 const REJOINER_BASE_URL = process.env.REJOINER_BASE_URL || DEFAULT_BASE_URL
 
 module.exports = {
-  VERSION,
+  DEFAULT_API_VERSION,
   REJOINER_API_KEY,
+  REJOINER_BASE_URL,
   REJOINER_SITE_ID,
   REJOINER_WEBHOOK_SECRET,
-  REJOINER_BASE_URL,
+  VERSION,
 }

package/lib/endpoints/customer.js

@@ -11,11 +11,31 @@ const customerEndpoint = (client) => {
       if (always) return dispatchReturnData('post')(`${endpoint}/always_convert/`, data)
       return dispatchReturnData('post')(`${endpoint}/convert/`, data)
     },
-    cancel: email => postEmail(`${endpoint}/cancel/`, email),
-    unsubscribe: email => postEmail(`${endpoint}/unsubscribe/`, email),
-    optIn: email => postEmail(`${endpoint}/opt_in/`, email),
-    get: email => dispatchReturnData('get')(`customers/${email}/`),
-    update: data => putEmail(`customers/${data.email}/`, data),
+    cancel: (email) => postEmail(`${endpoint}/cancel/`, email),
+    unsubscribe: (email) => postEmail(`${endpoint}/unsubscribe/`, email),
+    optIn: (email) => postEmail(`${endpoint}/opt_in/`, email),
+    get: (email) => {
+      switch (client.version) {
+        case 1:
+          return dispatchReturnData('get')(`customers/${email}/`)
+        case 2:
+          return dispatchReturnData('get')('customers/by_email/', {
+            params: { email },
+          })
+        default:
+          throw new Error(`Invalid API version: ${client.version}`)
+      }
+    },
+    update: (data) => {
+      switch (client.version) {
+        case 1:
+          return putEmail(`customers/${data.email}/`, data)
+        case 2:
+          return postEmail('/customers/', data)
+        default:
+          throw new Error(`Invalid API version: ${client.version}`)
+      }
+    },
   }
 }
 

package/lib/endpoints/journeys.js

@@ -5,8 +5,8 @@ const path = 'journeys'
 const journeysEndpoint = (client) => {
   const { dispatchReturnData } = withClient(client)
 
-  const endpoint = journeyId => ({
-    nodes: nodeId => ({
+  const endpoint = (journeyId) => ({
+    nodes: (nodeId) => ({
       webhook: (email) => {
         const requestPath = `${path}/${journeyId}/nodes/${nodeId}/webhook_event_wait/`
 
@@ -19,11 +19,12 @@ const journeysEndpoint = (client) => {
         }
 
         if (typeof email === 'object' && typeof email.email === 'string') {
-          return dispatchReturnData('post')(requestPath, Object.assign(
-            { customer_data: {}, session_data: {} },
-            email,
-            { email: email.email.toLowerCase() },
-          ))
+          return dispatchReturnData('post')(requestPath, {
+            customer_data: {},
+            session_data: {},
+            ...email,
+            email: email.email.toLowerCase(),
+          })
         }
 
         return Promise.reject(new Error('Request is missing required email parameter.'))

package/lib/endpoints/lists.js

@@ -15,13 +15,13 @@ const listsEndpoint = (client) => {
 
       return dispatchReturnData('post')(`${endpoint}/`, name)
     },
-    contacts: listId => ({
+    contacts: (listId) => ({
       get: (page) => {
         const pagination = page ? `?page=${page}` : ''
         return dispatchReturnData('get')(`${endpoint}/${listId}/contacts/${pagination}`)
       },
-      add: email => postEmail(`${endpoint}/${listId}/contacts/`, email),
-      remove: email => postEmail(`${endpoint}/${listId}/contacts/remove/`, email),
+      add: (email) => postEmail(`${endpoint}/${listId}/contacts/`, email),
+      remove: (email) => postEmail(`${endpoint}/${listId}/contacts/remove/`, email),
     }),
   }
 }

package/lib/endpoints/ping.js

@@ -4,7 +4,7 @@ const pingEndpoint = (client) => {
   return {
     path: endpoint,
     ping: () => client.dispatch.get('/ping/')
-      .then(res => res.data),
+      .then((res) => res.data),
   }
 }
 

package/lib/endpoints/segments.js

@@ -7,7 +7,7 @@ const segmentsEndpoint = (client) => {
 
   return {
     path: endpoint,
-    customers: segmentId => ({
+    customers: (segmentId) => ({
       get: () => dispatchReturnData('get')(`${endpoint}/${segmentId}/customers/`),
     }),
   }

package/lib/helpers.js

@@ -1,6 +1,6 @@
 const withClient = (client) => {
-  const dispatchReturnData = method => (...args) => client.dispatch[method](...args)
-    .then(res => res.data)
+  const dispatchReturnData = (method) => (...args) => client.dispatch[method](...args)
+    .then((res) => res.data)
 
   const withEmail = (method, path, email) => {
     if (typeof email === 'string') {
@@ -8,11 +8,11 @@ const withClient = (client) => {
     }
 
     if (typeof email === 'object' && typeof email.email === 'string') {
-      return dispatchReturnData(method)(path, Object.assign(
-        {},
-        email,
-        { email: email.email.toLowerCase() },
-      ))
+      return dispatchReturnData(method)(path, {
+
+        ...email,
+        email: email.email.toLowerCase(),
+      })
     }
 
     return Promise.reject(new Error('Request is missing required email parameter.'))

package/lib/rejoiner.js

@@ -5,26 +5,29 @@ const path = require('path')
 const merge = require('lodash.merge')
 
 const {
-  VERSION,
+  DEFAULT_API_VERSION,
   REJOINER_API_KEY,
+  REJOINER_BASE_URL,
   REJOINER_SITE_ID,
   REJOINER_WEBHOOK_SECRET,
-  REJOINER_BASE_URL,
+  VERSION,
 } = require('./config')
 
 function Rejoiner2(options) {
   const opts = merge({}, options)
 
+  this.baseURL = opts.baseURL || REJOINER_BASE_URL
+  this.apiVersion = opts.apiVersion || DEFAULT_API_VERSION
+
   this.siteId = opts.siteId || REJOINER_SITE_ID
   this.apiKey = opts.apiKey || REJOINER_API_KEY
   this.webhookSecret = opts.webhookSecret || REJOINER_WEBHOOK_SECRET
-  this.baseURL = opts.baseURL || REJOINER_BASE_URL
 
   if (!this.siteId) throw new Error('Site ID must be configured')
   if (!this.apiKey) throw new Error('API Key must be configured')
 
   this.dispatch = axios.create({
-    baseURL: `${this.baseURL}/${this.siteId}`,
+    baseURL: `${this.baseURL}/v${this.apiVersion}/${this.siteId}`,
     headers: {
       Authorization: `Rejoiner ${this.apiKey}`,
       'User-Agent': `rejoiner2-node/v${VERSION}`,
@@ -32,7 +35,7 @@ function Rejoiner2(options) {
   })
 
   fs.readdirSync(path.join(__dirname, 'endpoints'))
-    .filter(file => file.indexOf('.') !== 0)
+    .filter((file) => file.indexOf('.') !== 0)
     .forEach((file) => {
       // eslint-disable-next-line global-require, import/no-dynamic-require
       const endpoint = require(path.join(__dirname, 'endpoints', file))(this)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rejoiner",
   "description": "Rejoiner REST API client wrapper for Node.js",
-  "version": "2.10.2",
+  "version": "2.11.0",
   "main": "lib/rejoiner.js",
   "author": "Sascha Bratton <sascha@brattonbratton.com>",
   "license": "MIT",
@@ -19,9 +19,9 @@
   ],
   "scripts": {
     "lint": "eslint lib --ext .js",
-    "test": "yarn lint",
-    "precommit": "yarn test",
-    "prepush": "yarn test"
+    "test": "npm run lint",
+    "precommit": "npm run test",
+    "prepush": "npm run test"
   },
   "dependencies": {
     "axios": ">=0.18.1",
@@ -29,10 +29,10 @@
     "lodash.merge": "^4.6.2"
   },
   "devDependencies": {
-    "eslint": "^5.3.0",
-    "eslint-config-airbnb-base": "^13.2.0",
+    "eslint": "^8.16.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.17.2",
-    "husky": "^0.14.3"
+    "husky": "^8.0.1"
   },
   "engines": {
     "node": ">=8.3.0"