Merge pull request #338 from OpenFn/nexmo-security-patch

Nexmo security patch
OpenFn · Aug 3, 2023 · 0de4e6b · 0de4e6b
2 parents 64bd37c + 8591b67
commit 0de4e6b
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 144 deletions.
diff --git a/.changeset/forty-bees-sit.md b/.changeset/forty-bees-sit.md
@@ -0,0 +1,6 @@
+---
+'@openfn/language-nexmo': minor
+---
+
+- update nexmo to `v2.9.1``
+- expandReferences on sendSMS
diff --git a/packages/nexmo/package.json b/packages/nexmo/package.json
@@ -20,9 +20,8 @@
     "configuration-schema.json"
   ],
   "dependencies": {
-    "@openfn/language-common": "^1.8.1",
-    "nexmo": "2.1.1",
-    "request": "^2.88.2"
+    "@openfn/language-common": "workspace:^",
+    "nexmo": "2.9.1"
   },
   "devDependencies": {
     "@openfn/buildtools": "workspace:^1.0.2",
@@ -33,7 +32,6 @@
     "esdoc-es7-plugin": "0.0.3",
     "esno": "^0.16.3",
     "mocha": "^10.1.0",
-    "nock": "^13.2.9",
     "rimraf": "^3.0.2"
   },
   "repository": {
@@ -49,4 +47,4 @@
     "./package.json": "./package.json"
   },
   "types": "types/index.d.ts"
-}
+}
diff --git a/packages/nexmo/src/Adaptor.js b/packages/nexmo/src/Adaptor.js
@@ -1,8 +1,8 @@
 import {
   execute as commonExecute,
-  expandReferences,
   composeNextState,
 } from '@openfn/language-common';
+import { expandReferences } from '@openfn/language-common/util';
 import Nexmo from 'nexmo';
 
 /**
@@ -45,26 +45,37 @@ export function execute(...operations) {
 export function sendSMS(from, toNumber, message) {
   return state => {
     const { apiKey, apiSecret } = state.configuration;
+    const [resolvedFrom, resolvedToNumber, resolvedMessage] = expandReferences(
+      state,
+      from,
+      toNumber,
+      message
+    );
 
     const nexmo = new Nexmo({
       apiKey: apiKey,
       apiSecret: apiSecret,
     });
 
     return new Promise((resolve, reject) => {
-      nexmo.message.sendSms(from, toNumber, message, (error, response) => {
-        if (error) {
-          console.error(error);
-          reject(error);
-        } else if (response.messages[0].status != '0') {
-          console.error('Nexmo Error:');
-          console.error(response);
-          reject(response);
-        } else {
-          console.log(response);
-          resolve(response);
+      nexmo.message.sendSms(
+        resolvedFrom,
+        resolvedToNumber,
+        resolvedMessage,
+        (error, response) => {
+          if (error) {
+            console.error(error);
+            reject(error);
+          } else if (response.messages[0].status != '0') {
+            console.error('Nexmo Error:');
+            console.error(response);
+            reject(response);
+          } else {
+            console.log(response);
+            resolve(response);
+          }
         }
-      });
+      );
     }).then(response => {
       const nextState = composeNextState(state, response);
       return nextState;