@yousolution/node-red-contrib-you-sap-service-layer 0.1.0 → 0.2.1

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file.
 
+# [0.2.0] - 2024-06-19
+
+> *Warning Breaking Change!* please make backups of flows and try in test environment before upgrading
+
+- We have improved the management of login token expiration
+- We have updated the manage dynamic login on AUTH Request
+- We have updated the result handling in PATCH request
+- We have resolved an error send Entry on UDT PATCH request
+- We have updated the result handling in SERVICE request
+- We have updated the error parsing function
+- We Add Service "OrdersService_Preview" on SERVICE
+- Bug Fix
+- Library Axios & Odata Updated
+
+# [0.1.1] - 2022-12-09
+
+- Added label output to nextLink block
+- Fix authentication for subflows compatibility
+- Bug fix
+
 # [0.1.0] - 2022-07-28
 
 - Added sqlQuery node to execute saved sql from SAP Service Layer

package/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   nodered:
-    image: nodered/node-red:2.0.6-12
+    image: nodered/node-red:3.1.0
     # network_mode: host
     extra_hosts:
       - "api.yousolution.local:192.168.1.100"

package/nodes/SQLQuery.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function SQLQuery(config) {
@@ -28,11 +29,13 @@ module.exports = function (RED) {
         const options = { method: 'POST', hasRawQuery: false, isSQLQuery: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
-        msg.nextLink = result.data['odata.nextLink'];
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
+        msg.nextLink = result.data['odata.nextLink'] || result.data['@odata.nextLink'];
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/authenticateSap.html

@@ -9,8 +9,10 @@
       version: {value: ''}
     },
     credentials: {
-      company: {type: "string"}, 
+      company: {type: "string"},
+      companyType: {type: 'string'},
       user: {type:"string"},
+      userType: {type: 'string'},
       password: {type:"password"}
     },
     inputs:1,
@@ -18,6 +20,19 @@
     icon: 'font-awesome/fa-lock',
     label: function() {
       return this.name||"Sap authenticate";
+    },
+    oneditprepare: function() { 
+      $("#node-input-company").typedInput({
+        default:"msg",
+        types:["msg", "str"],
+        typeField: "#node-input-companyType"
+      });
+
+      $("#node-input-user").typedInput({
+        default:"msg",
+        types:["msg", "str"],
+        typeField: "#node-input-userType"
+      });
     }
   });
 </script>
@@ -49,11 +64,13 @@
   <div class="form-row">
     <label for="node-input-company"><i class="fa fa-tag"></i> Company</label>
     <input type="text" id="node-input-company" placeholder="company">
+    <input type="hidden" id="node-input-companyType">
   </div>
 
   <div class="form-row">
     <label for="node-input-user"><i class="fa fa-tag"></i> User</label>
     <input type="text" id="node-input-user" placeholder="user">
+    <input type="hidden" id="node-input-userType">
   </div>
 
   <div class="form-row">

package/nodes/authenticateSap.js

@@ -9,9 +9,9 @@ module.exports = function (RED) {
     // reset status
     node.status({});
 
-    const flowContext = node.context().flow;
+    const globalContext = node.context().global;
 
-    flowContext.set(`_YOU_SapServiceLayer_${node.id}`, {
+    globalContext.set(`_YOU_SapServiceLayer_${node.id}`, {
       host: config.host,
       port: config.port,
       version: config.version,
@@ -22,50 +22,107 @@ module.exports = function (RED) {
       },
     });
 
-    if (!node.credentials.user || !node.credentials.password || !node.credentials.company) {
+    if (!node.credentials.user || !node.credentials.company) {
       node.status({ fill: 'gray', shape: 'ring', text: 'Missing credentials' });
     }
 
     node.on('input', async (msg, send, done) => {
+
+      if(!node.credentials.password && !msg.password){
+        node.status({ fill: 'gray', shape: 'ring', text: 'Missing credentials Password Code' });
+      }
+
+      if(msg.password){
+        globalContext.set(`_YOU_SapServiceLayer_${node.id}.credentials.Password`, msg.password);
+        //node.status({ fill: 'gray', shape: 'ring', text: 'Missing credentials Password Code' });
+      }
+      
+      // If Company setted from msg
+      if (node.credentials.companyType == 'msg') {
+        const company = msg[node.credentials.company];
+        let currentCompany = globalContext.get(`_YOU_SapServiceLayer_${node.id}.credentials.CompanyDB`);
+
+        if(company !== currentCompany) {
+          globalContext.set(`_YOU_SapServiceLayer_${node.id}.headers`, null);
+        }
+
+        globalContext.set(`_YOU_SapServiceLayer_${node.id}.credentials.CompanyDB`, company);
+
+      }
+
+      // If User setted from msg
+      if (node.credentials.userType == 'msg') {
+        const user = msg[node.credentials.user];
+        globalContext.set(`_YOU_SapServiceLayer_${node.id}.credentials.UserName`, user);
+      }
+
       // reset status
       node.status({});
 
-      if (!node.credentials.user || !node.credentials.password || !node.credentials.company) {
+      if (!node.credentials.user || !node.credentials.company) {
         node.status({ fill: 'red', shape: 'dot', text: 'Missing credentials' });
         done(new Error('Missing credentials'));
         return;
       }
 
-      const headers = flowContext.get(`_YOU_SapServiceLayer_${node.id}.headers`);
+      let currentDate = new Date();
+      const headers = globalContext.get(`_YOU_SapServiceLayer_${node.id}.headers`);
+      const exipiredTime = globalContext.get(`_YOU_SapServiceLayer_${node.id}.exp`);
+      let validToken = true;
 
       msg._YOU_SapServiceLayer = {
         idAuth: node.id,
       };
 
-      if (!headers) {
+      if(headers && exipiredTime) {
+        let providedDate = new Date(exipiredTime);
+        let timeDifference = currentDate - providedDate;
+        let minutesDifference = timeDifference / (1000 * 60);
+        validToken = minutesDifference > 25 ? false : true;
+      }
+
+
+      if (!headers  || !validToken) {
         try {
           const result = await Support.login(node, node.id);
-          flowContext.set(`_YOU_SapServiceLayer_${node.id}.headers`, result.headers['set-cookie']);
+          if(result.data.hasOwnProperty("error")) {
+            node.error( result.data.error , msg);
+            node.status({ fill: 'red', shape: 'dot', text: 'disconnected' });
+          }
+          else {
+            globalContext.set(`_YOU_SapServiceLayer_${node.id}.headers`, result.headers['set-cookie']);
+            globalContext.set(`_YOU_SapServiceLayer_${node.id}.exp`, currentDate.toISOString());
+            node.send(msg);
+            node.status({ fill: 'green', shape: 'dot', text: 'connected' });
+          }
+          // globalContext.set(`_YOU_SapServiceLayer_${node.id}.headers`, result.headers['set-cookie']);
+          // globalContext.set(`_YOU_SapServiceLayer_${node.id}.exp`, currentDate.toISOString());
         } catch (error) {
           msg.payload = error;
           if (error.response && error.response.data) {
             msg.statusCode = error.response.status;
             msg.payload = error.response.data;
           }
-          node.send(msg);
+          node.error( error , msg);
+          //node.send(msg);
           node.status({ fill: 'red', shape: 'dot', text: 'disconnected' });
           done(error);
-          return;
+          //return;
         }
       }
-      node.send(msg);
-      node.status({ fill: 'green', shape: 'dot', text: 'connected' });
+      else {
+        node.send(msg);
+        node.status({ fill: 'green', shape: 'dot', text: 'connected' });
+      }
+
     });
   }
   RED.nodes.registerType('authenticateSap', AuthenticateSapNode, {
     credentials: {
       company: { type: 'text' },
+      companyType: { type: 'text' },
       user: { type: 'text' },
+      userType: { type: 'text' },
       password: { type: 'password' },
     },
   });

package/nodes/closeSap.js

@@ -1,6 +1,8 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
+
 
 module.exports = function (RED) {
   function CloseSapNode(config) {
@@ -18,10 +20,12 @@ module.exports = function (RED) {
         const options = { method: 'POST', hasRawQuery: false, hasEntityId: true, isClose: true };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data);// result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/createSQLQuery.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function CreateSQLQuery(config) {
@@ -53,10 +54,12 @@ module.exports = function (RED) {
         const options = { method: 'POST', hasRawQuery: false, isCreateSQLQuery: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result;
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/createSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function CreateSapNode(config) {
@@ -22,13 +23,16 @@ module.exports = function (RED) {
         const options = { method: 'POST', hasRawQuery: false, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result;
+        msg.payload =VerifyErrorSL(node, msg, result.data);// result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
-        done(error);
+        //node.error(error, msg);
+       // done(error);
       }
     });
   }

package/nodes/crossJoinSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 // const buildQuery = require('odata-query').default;
 
 module.exports = function (RED) {
@@ -19,11 +20,13 @@ module.exports = function (RED) {
         const options = { method: 'GET', hasRawQuery: true, hasEntityId: false, isCrossJoin: true };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data);// result.data;
         msg.statusCode = result.status;
-        msg.nextLink = result.data['odata.nextLink'];
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        msg.nextLink = result.data['odata.nextLink'] || result.data['@odata.nextLink'];
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/deleteSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function DeleteSapNode(config) {
@@ -18,10 +19,12 @@ module.exports = function (RED) {
         const options = { method: 'DELETE', hasRawQuery: true, hasEntityId: true, data: {} };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data, true );// result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/getSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 // const buildQuery = require('odata-query').default;
 
 module.exports = function (RED) {
@@ -17,10 +18,12 @@ module.exports = function (RED) {
         const options = { method: 'GET', hasRawQuery: true, hasEntityId: true };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/listSap.js

@@ -2,6 +2,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
 const buildQuery = require('odata-query').default;
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function ListSapNode(config) {
@@ -19,11 +20,13 @@ module.exports = function (RED) {
         const options = { method: 'GET', hasRawQuery: true };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
-        msg.nextLink = result.data['odata.nextLink'];
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
+        msg.nextLink = result.data['odata.nextLink'] || result.data['@odata.nextLink'];
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/manageErrors.js

@@ -0,0 +1,39 @@
+
+function VerifyErrorSL (node, msg, response, consentEmpty=false) {
+    if (!response.hasOwnProperty("success") && !response.hasOwnProperty("error") && !Object.keys(response).length && !consentEmpty) {  // Error Generic
+        msg.payload = response;
+        node.error('Not Valid Requests', msg)
+        node.status({ fill: 'red', shape: 'dot', text: 'Not Valid  Requests' });
+    }
+    else if(response.hasOwnProperty("error")){ //Error ServiceLayer
+        if(response.error.hasOwnProperty('message')){
+            if(response.error.message.hasOwnProperty('value')) {
+                msg.payload = response;
+                node.error(response.error.message.value, msg)
+                node.status({ fill: 'red', shape: 'dot', text: response.error.message.value });
+            }
+            else {
+                msg.payload = response;
+                node.error(response.error.message , msg)
+                node.status({ fill: 'red', shape: 'dot', text: response.error.message });
+            }
+        }
+        else {
+            msg.payload = response;
+            node.error(response.reason , msg)
+            node.status({ fill: 'red', shape: 'dot', text: JSON.stringify(response) });
+        }
+
+    }
+    else { // OK Response 
+        return response;
+    }
+
+
+}
+ 
+
+
+module.exports = {
+    VerifyErrorSL: VerifyErrorSL,
+};

package/nodes/manipulateEntitySap.js

@@ -2,6 +2,7 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
 const entities = require('../resources/entities.json');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function ManipulateEntitySap(config) {
@@ -24,10 +25,12 @@ module.exports = function (RED) {
         const options = { method: 'POST', hasRawQuery: false, hasEntityId: true, isManipulate: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/nextLink.html

@@ -1,91 +1,100 @@
 <script type="text/javascript">
-  RED.nodes.registerType('nextLink',{
+  RED.nodes.registerType('nextLink', {
     category: 'Sap',
     color: '#FFC300',
     defaults: {
-      name: {value: ''},
-      nextLink: {value: ''}
+      name: { value: '' },
+      nextLink: { value: '' },
     },
-    inputs:1,
-    outputs:2,
+    inputs: 1,
+    outputs: 2,
+    outputLabels: ['next', 'end'],
+    // outputLabels: function (index) {
+    //   if (index == 0) {
+    //     return 'next iteration';
+    //   }
+    //   return 'last iteration';
+    // },
     icon: 'font-awesome/fa-arrows-h',
-    label: function() {
-      return this.name||"Next link";
+    label: function () {
+      return this.name || 'Next link';
     },
-    oneditprepare: function() {
-      $("#node-input-nextLink").typedInput({
-        type:"msg",
-        types:["msg"],
-        typeField: "#node-input-nextLink-type",
-        value: 'nextLink'
+    oneditprepare: function () {
+      $('#node-input-nextLink').typedInput({
+        type: 'msg',
+        types: ['msg'],
+        typeField: '#node-input-nextLink-type',
+        value: 'nextLink',
       });
-    }
+    },
   });
 </script>
 
-
-
-  
 <script type="text/html" data-template-name="nextLink">
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-    <input type="text" id="node-input-name" placeholder="Name">
+    <input type="text" id="node-input-name" placeholder="Name" />
   </div>
 
   <div class="form-row">
     <label for="node-input-type"><i class="fa fa-gears"></i> NextLink</label>
-    <input type="text" id="node-input-nextLink">
-    <input type="hidden" id="node-input-nextLink-type">
+    <input type="text" id="node-input-nextLink" />
+    <input type="hidden" id="node-input-nextLink-type" />
   </div>
 </script>
-  
+
 <!-- Documentation -->
 <script type="text/html" data-help-name="nextLink">
   <p>Next link</p>
-  
+
   <h3>Inputs</h3>
-    <dl class="message-properties">
-      <dt>Name
-        <span class="property-type">string</span>
-      </dt>
-      <dd> the node's name </dd>
-      <dt>NextLink
-        <span class="property-type">string</span>
-      </dt>
-      <dd> the url link to next Service Layer page </dd>
-    </dl>
-  
-   <h3>Outputs</h3>
-    <ol class="node-ports">
-      <li>Standard output
-        <dl class="message-properties">
-          <dt>payload <span class="property-type">msg</span></dt>
-          <dd>It returns the message with next link to the next page.</dd>
-        </dl>
-      </li>
-      <li>Standard output
-        <dl class="message-properties">
-          <dt>payload <span class="property-type">msg</span></dt>
-          <dd>It returns the message when the last page is reached.</dd>
-        </dl>
-      </li>
-    </ol>
-  
+  <dl class="message-properties">
+    <dt>
+      Name
+      <span class="property-type">string</span>
+    </dt>
+    <dd>the node's name</dd>
+    <dt>
+      NextLink
+      <span class="property-type">string</span>
+    </dt>
+    <dd>the url link to next Service Layer page</dd>
+  </dl>
+
+  <h3>Outputs</h3>
+  <ol class="node-ports">
+    <li>
+      Standard output
+      <dl class="message-properties">
+        <dt>payload <span class="property-type">msg</span></dt>
+        <dd>It returns the message with next link to the next page.</dd>
+      </dl>
+    </li>
+    <li>
+      Standard output
+      <dl class="message-properties">
+        <dt>payload <span class="property-type">msg</span></dt>
+        <dd>It returns the message when the last page is reached.</dd>
+      </dl>
+    </li>
+  </ol>
+
   <h3>Details</h3>
-      <p>this node is used to get the next page of result of items from service layer.
-        See the examples to understand how to use it.
-      </p>
-      <!-- <p><code>msg.payload</code> is used as the payload of the published message.
+  <p>this node is used to get the next page of result of items from service layer. See the examples to understand how to use it.</p>
+  <!-- <p><code>msg.payload</code> is used as the payload of the published message.
       If it contains an Object it will be converted to a JSON string before being sent.
       If it contains a binary Buffer the message will be published as-is.</p>
       <p>The topic used can be configured in the node or, if left blank, can be set
       by <code>msg.topic</code>.</p>
       <p>Likewise the QoS and retain values can be configured in the node or, if left
       blank, set by <code>msg.qos</code> and <code>msg.retain</code> respectively.</p> -->
-  
+
   <h3>References</h3>
-      <ul>
-          <li><a href="https://sap-samples.github.io/smb-summit-hackathon/b1sl.html" target="_black">Service layer API docs</a> - for more details </li>
-          <li><a href="https://github.com/yousolution-cloud/node-red-contrib-you-sap-service-layer">@yousolution-cloud/node-red-contrib-you-sap-service-layer</a> - the nodes github repository</li>
-      </ul>
-</script>
+  <ul>
+    <li><a href="https://sap-samples.github.io/smb-summit-hackathon/b1sl.html" target="_black">Service layer API docs</a> - for more details</li>
+    <li>
+      <a href="https://github.com/yousolution-cloud/node-red-contrib-you-sap-service-layer">@yousolution-cloud/node-red-contrib-you-sap-service-layer</a> - the
+      nodes github repository
+    </li>
+  </ul>
+</script>

package/nodes/patchSap.html

@@ -4,6 +4,7 @@
     color: '#FFC300',
     defaults: {
       name: {value: ''},
+      method: {value: 'PATCH'},
       entity: {value: ''},
       udo: {value: ''},
       udt: {value: ''},
@@ -84,6 +85,14 @@
     <input type="text" id="node-input-name" placeholder="Name">
   </div>
 
+  <div class="form-row">
+    <label for="node-input-type"><i class="fa fa-cog"></i> Method</label>
+    <select name="node-input-method" id="node-input-method">
+      <option value="PATCH">PATCH</option>
+      <option value="PUT">PUT</option>
+    </select>
+  </div>
+
   <div class="form-row">
     <label for="node-input-type"><i class="fa fa-cube"></i> Entity</label>
     <select name="node-input-entity" id="node-input-entity">
@@ -330,12 +339,12 @@
     </select>
   </div>
 
-  <div class="form-row" style="display:none" id="container-UDO">
+  <div class="form-row" style="display:none" id="container-udo">
     <label for="node-input-udo"><i class="fa fa-tag"></i> UDO</label>
     <input type="text" id="node-input-udo" placeholder="UDO Name">
   </div>
 
-  <div class="form-row" style="display:none" id="container-UDT">
+  <div class="form-row" style="display:none" id="container-udt">
     <label for="node-input-udt"><i class="fa fa-tag"></i> UDT</label>
     <input type="text" id="node-input-udt" placeholder="UDT Name">
   </div>

package/nodes/patchSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function PatchSapNode(config) {
@@ -23,10 +24,12 @@ module.exports = function (RED) {
         const options = { method: 'PATCH', hasRawQuery: false, hasEntityId: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data, true);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/serviceSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 const services = require('../resources/services.json');
 
 module.exports = function (RED) {
@@ -23,10 +24,12 @@ module.exports = function (RED) {
         const options = { method: 'POST', hasRawQuery: false, isService: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result;
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/support.js

@@ -7,6 +7,7 @@ const thickIdApi = [
   'AssetClasses',
   'AssetDepreciationGroups',
   'AssetGroups',
+  'AlternateCatNum',
   'BankChargesAllocationCodes',
   'BusinessPartners',
   'CampaignResponseType',
@@ -62,15 +63,15 @@ const thickIdApi = [
 ];
 
 async function login(node, idAuth) {
-  const flowContext = node.context().flow;
+  const globalContext = node.context().global;
 
-  const host = flowContext.get(`_YOU_SapServiceLayer_${idAuth}.host`);
-  const port = flowContext.get(`_YOU_SapServiceLayer_${idAuth}.port`);
-  const version = flowContext.get(`_YOU_SapServiceLayer_${idAuth}.version`);
+  const host = globalContext.get(`_YOU_SapServiceLayer_${idAuth}.host`);
+  const port = globalContext.get(`_YOU_SapServiceLayer_${idAuth}.port`);
+  const version = globalContext.get(`_YOU_SapServiceLayer_${idAuth}.version`);
 
   const url = `https://${host}:${port}/b1s/${version}/Login`;
 
-  const credentials = flowContext.get(`_YOU_SapServiceLayer_${idAuth}.credentials`);
+  const credentials = globalContext.get(`_YOU_SapServiceLayer_${idAuth}.credentials`);
   const dataString = JSON.stringify(credentials);
 
   const options = {
@@ -83,12 +84,7 @@ async function login(node, idAuth) {
       'Content-Length': dataString.length,
     },
   };
-
-  // try {
   return await axiosLibrary(options);
-  // } catch (error) {
-  //   throw Error(`ERROR FUNCTION LOGIN: ${error}`);
-  // }
 }
 
 async function sendRequest({ node, msg, config, axios, login, options }) {
@@ -107,14 +103,14 @@ async function sendRequest({ node, msg, config, axios, login, options }) {
   } catch (error) {
     // Refresh headers re-login
     if (error.response && (error.response.status == 401 || error.response.status == 301)) {
-      const flowContext = node.context().flow;
+      const globalCotext = node.context().global;
       // try {
       // update cookies for session timeout
       const result = await login(node, requestOptions.idAuthNode);
-      flowContext.set(`_YOU_SapServiceLayer_${requestOptions.idAuthNode}.headers`, result.headers['set-cookie']);
+      globalCotext.set(`_YOU_SapServiceLayer_${requestOptions.idAuthNode}.headers`, result.headers['set-cookie']);
 
       try {
-        const headers = flowContext.get(`_YOU_SapServiceLayer_${requestOptions.idAuthNode}.headers`).join(';');
+        const headers = globalCotext.get(`_YOU_SapServiceLayer_${requestOptions.idAuthNode}.headers`).join(';');
 
         requestOptions.axiosOptions.headers.Cookie = headers;
 
@@ -124,10 +120,13 @@ async function sendRequest({ node, msg, config, axios, login, options }) {
           msg.statusCode = error.response.status;
           msg.payload = error.response.data;
           msg.requestUrl = requestOptions.axiosOptions.url;
-          node.send(msg);
-          throw new Error(JSON.stringify(error.response.data));
+          //node.send(msg);
+          node.error(JSON.stringify(error.response.data), msg);
+          //throw new Error(JSON.stringify(error.response.data));
+        }
+        else {
+          throw error;
         }
-        throw error;
       }
       // }
     }
@@ -135,10 +134,14 @@ async function sendRequest({ node, msg, config, axios, login, options }) {
       msg.statusCode = error.response.status;
       msg.payload = error.response.data;
       msg.requestUrl = requestOptions.axiosOptions.url;
-      node.send(msg);
-      throw new Error(JSON.stringify(error.response.data));
+      //node.send(msg);
+      node.error(JSON.stringify(error.response.data), msg)
+     // throw new Error(JSON.stringify(error.response.data));
+    }
+    else {
+      throw error;
     }
-    throw error;
+
   }
 }
 
@@ -252,7 +255,13 @@ function generateRequest(node, msg, config, options) {
     }
 
     if (thickIdApi.includes(entity) || config.entity === 'UDT') {
-      url = `https://${host}:${port}/b1s/${version}/${entity}('${entityId}')`;
+      if(Number.isInteger(entityId)){
+        url = `https://${host}:${port}/b1s/${version}/${entity}(${entityId})`;
+      }
+      else {
+        url = `https://${host}:${port}/b1s/${version}/${entity}('${entityId}')`;
+      }
+      
     } else {
       url = `https://${host}:${port}/b1s/${version}/${entity}(${entityId})`;
     }
@@ -319,17 +328,17 @@ function generateRequest(node, msg, config, options) {
 
 function getSapParams(node, msg) {
   try {
-    const flowContext = node.context().flow;
+    const globalContext = node.context().global;
 
     const idAuthNode = msg._YOU_SapServiceLayer.idAuth;
-    const host = flowContext.get(`_YOU_SapServiceLayer_${idAuthNode}.host`);
-    const port = flowContext.get(`_YOU_SapServiceLayer_${idAuthNode}.port`);
-    const version = flowContext.get(`_YOU_SapServiceLayer_${idAuthNode}.version`);
+    const host = globalContext.get(`_YOU_SapServiceLayer_${idAuthNode}.host`);
+    const port = globalContext.get(`_YOU_SapServiceLayer_${idAuthNode}.port`);
+    const version = globalContext.get(`_YOU_SapServiceLayer_${idAuthNode}.version`);
 
     // if (!flowContext.get(`_YOU_SapServiceLayer_${idAuthNode}.headers`)) {
     //   throw new Error('Authentication failed');
     // }
-    const cookies = flowContext.get(`_YOU_SapServiceLayer_${idAuthNode}.headers`).join(';');
+    const cookies = globalContext.get(`_YOU_SapServiceLayer_${idAuthNode}.headers`).join(';');
 
     return { idAuthNode: idAuthNode, host: host, port: port, version: version, cookies: cookies };
   } catch (error) {

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@yousolution/node-red-contrib-you-sap-service-layer",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "Unofficial module SAP Service Layer for NODE-RED",
   "license": "MIT",
   "scripts": {
-    "update": "npm pack && mv yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz ./data && cd data && npm i yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz && docker-compose restart",
+    "update": "run-script-os",
+    "update:linux:darwin": "npm pack && mv yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz ./data && cd data && npm i yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz && docker-compose restart",
+    "update:win32": "npm pack && copy yousolution-node-red-contrib-you-sap-service-layer-%npm_package_version%.tgz .\\data\\ && cd .\\data\\ && npm i yousolution-node-red-contrib-you-sap-service-layer-%npm_package_version%.tgz && docker-compose restart",
+    "update:default": "npm pack && mv yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz ./data && cd data && npm i yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz && docker-compose restart",
     "test": "mocha 'test/**/*.spec.js'",
     "coverage": "nyc npm run test"
   },
@@ -19,6 +22,7 @@
   ],
   "author": "Andrea Trentin <andrea.trentin@yousolution.cloud>",
   "node-red": {
+    "version": ">=2.0.0",
     "nodes": {
       "authenticateSap": "/nodes/authenticateSap.js",
       "listSap": "/nodes/listSap.js",
@@ -36,8 +40,8 @@
     }
   },
   "dependencies": {
-    "axios": "^0.23.0",
-    "odata-query": "^6.7.1"
+    "axios": "^1.2.2",
+    "odata-query": "^7.0.4"
   },
   "repository": {
     "type": "git",
@@ -55,6 +59,7 @@
     "node-red": "^2.1.4",
     "node-red-node-test-helper": "^0.2.7",
     "nyc": "^15.1.0",
+    "run-script-os": "^1.1.6",
     "sinon": "^12.0.1"
   }
 }

package/resources/services.json

@@ -200,7 +200,7 @@
   "NFModelsService": ["NFModelsService_GetList"],
   "NFTaxCategoriesService": ["NFTaxCategoriesService_GetList"],
   "OccurrenceCodesService": ["OccurrenceCodesService_GetList"],
-  "OrdersService": ["OrdersService_GetApprovalTemplates", "OrdersService_HandleApprovalRequest"],
+  "OrdersService": ["OrdersService_GetApprovalTemplates", "OrdersService_Preview" ,"OrdersService_HandleApprovalRequest"],
   "PartnersSetupsService": ["PartnersSetupsService_GetList"],
   "PaymentBlocksService": ["PaymentBlocksService_GetPaymentBlockList"],
   "PaymentCalculationService": ["PaymentCalculationService_GetPaymentAmount"],

package/test/support.spec.js

@@ -19,7 +19,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -96,7 +96,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -163,7 +163,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -211,7 +211,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -262,7 +262,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -312,7 +312,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -364,7 +364,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -405,7 +405,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -457,7 +457,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -498,7 +498,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -559,7 +559,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -609,7 +609,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -661,7 +661,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -713,7 +713,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -755,7 +755,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -797,7 +797,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -839,7 +839,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -891,7 +891,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -942,7 +942,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -993,7 +993,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1044,7 +1044,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1081,7 +1081,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {},
             },
           };
@@ -1103,7 +1103,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1147,7 +1147,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1189,7 +1189,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1247,7 +1247,7 @@ describe('support library', () => {
       const node = {
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1296,7 +1296,7 @@ describe('support library', () => {
         send: () => {},
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';
@@ -1354,7 +1354,7 @@ describe('support library', () => {
         send: () => {},
         context: () => {
           return {
-            flow: {
+            global: {
               get: (param) => {
                 if (param == '_YOU_SapServiceLayer_1.host') {
                   return 'host';

package/data/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "node-red-project",
-  "description": "A Node-RED Project",
-  "version": "0.0.1",
-  "private": true,
-  "dependencies": {
-    "@types/node-red": "^1.1.1",
-    "@yousolution/node-red-contrib-you-sap-service-layer": "file:yousolution-node-red-contrib-you-sap-service-layer-0.1.0.tgz",
-    "@yousolution/node-red-contrib-you-yousolution.cloud": "0.0.1",
-    "faker": "^6.6.6",
-    "node-red-contrib-sse-client": "~0.2.2",
-    "node-red-node-email": "~1.14.0"
-  }
-}