Merge pull request cablelabs#200 from cablelabs/issue-155

When a Put happens on a authorized network, do not pull or push. Thi…
cxfidc · Nov 8, 2018 · e566339 · e566339
2 parents e11459f + 2a96fd5
commit e566339
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/rest/networkProtocols/LoRaOpenSource_2.js b/rest/networkProtocols/LoRaOpenSource_2.js
@@ -1440,7 +1440,6 @@ module.exports.pushDeviceProfile = function (sessionData, network, deviceProfile
           })
         }
         else {
-          appLogger.log('WTF')
           appLogger.log(dpNetworkId + '')
 
           reject(new Error('Something bad happened with the Protocol Table'))

diff --git a/rest/restNetworks.js b/rest/restNetworks.js
@@ -464,6 +464,7 @@ exports.initialize = function (app, server) {
     restServer.isAdminCompany],
   function (req, res, next) {
     var data = req.body
+    var pullFlag = (data.securityData && data.securityData.authorized === false)
     data.id = parseInt(req.params.id)
     modelAPI.networks.updateNetwork(data)
       .then(function (rec) {
@@ -498,6 +499,9 @@ exports.initialize = function (app, server) {
             if (network.securityData.authorized === false) {
               restServer.respond(res, 200, network)
             }
+            else if (!pullFlag) {
+              restServer.respond(res, 200, network)
+            }
             else {
               modelAPI.networks.pullNetwork(network.id)
                 .then(result => {
-Original file line number
+Diff line change
@@ Expand Up @@
               })
             }
             else {
-              appLogger.log('WTF')
               appLogger.log(dpNetworkId + '')
               reject(new Error('Something bad happened with the Protocol Table'))
@@ Expand Down @@