Merge pull request cablelabs#175 from cablelabs/issue-170

Issue 170
cxfidc · Oct 26, 2018 · deff6e2 · deff6e2
2 parents f365fa1 + b9dcf04
commit deff6e2
Show file tree

Hide file tree

Showing 4 changed files with 768 additions and 1,173 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,9 @@
     "passport": "^0.2.2",
     "passport-local": "^1.0.0",
     "pug": "^2.0.3",
+    "ramda": "^0.25.0",
     "request": "^2.85.0",
+    "request-promise": "^4.2.2",
     "serve-favicon": "^2.5.0",
     "session-file-store": "^0.2.1",
     "sqlite3": "^4.0.2",

diff --git a/rest/models/INetwork.js b/rest/models/INetwork.js
@@ -71,10 +71,7 @@ async function authorizeAndTest (network, modelAPI, k, me, dataAPI) {
   try {
     const connection = await modelAPI.networkTypeAPI.connect(network, network.securityData)
     if (connection instanceof Object) {
-      // Object.assign(network.securityData, connection)
-      for (var prop in connection) {
-        network.securityData[prop] = connection[prop]
-      }
+      Object.assign(network.securityData, connection)
     } else {
       network.securityData.access_token = connection
     }