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

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+# [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/nodes/SQLQuery.js

@@ -29,7 +29,7 @@ module.exports = function (RED) {
         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.nextLink = result.data['odata.nextLink'] || result.data['@odata.nextLink'];
         msg.statusCode = result.status;
         node.status({ fill: 'green', shape: 'dot', text: 'success' });
         node.send(msg);

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,
@@ -27,6 +27,18 @@ module.exports = function (RED) {
     }
 
     node.on('input', async (msg, send, done) => {
+      // If Company setted from msg
+      if (node.credentials.companyType == 'msg') {
+        const company = msg[node.credentials.company];
+        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({});
 
@@ -36,7 +48,7 @@ module.exports = function (RED) {
         return;
       }
 
-      const headers = flowContext.get(`_YOU_SapServiceLayer_${node.id}.headers`);
+      const headers = globalContext.get(`_YOU_SapServiceLayer_${node.id}.headers`);
 
       msg._YOU_SapServiceLayer = {
         idAuth: node.id,
@@ -45,7 +57,7 @@ module.exports = function (RED) {
       if (!headers) {
         try {
           const result = await Support.login(node, node.id);
-          flowContext.set(`_YOU_SapServiceLayer_${node.id}.headers`, result.headers['set-cookie']);
+          globalContext.set(`_YOU_SapServiceLayer_${node.id}.headers`, result.headers['set-cookie']);
         } catch (error) {
           msg.payload = error;
           if (error.response && error.response.data) {
@@ -65,7 +77,9 @@ module.exports = function (RED) {
   RED.nodes.registerType('authenticateSap', AuthenticateSapNode, {
     credentials: {
       company: { type: 'text' },
+      companyType: { type: 'text' },
       user: { type: 'text' },
+      userType: { type: 'text' },
       password: { type: 'password' },
     },
   });

package/nodes/crossJoinSap.js

@@ -21,7 +21,7 @@ module.exports = function (RED) {
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
         msg.payload = result.data;
         msg.statusCode = result.status;
-        msg.nextLink = result.data['odata.nextLink'];
+        msg.nextLink = result.data['odata.nextLink'] || result.data['@odata.nextLink'];
         node.status({ fill: 'green', shape: 'dot', text: 'success' });
         node.send(msg);
       } catch (error) {

package/nodes/listSap.js

@@ -20,7 +20,7 @@ module.exports = function (RED) {
         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.nextLink = result.data['odata.nextLink'] || result.data['@odata.nextLink'];
         msg.statusCode = result.status;
         node.status({ fill: 'green', shape: 'dot', text: 'success' });
         node.send(msg);

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">

package/nodes/support.js

@@ -62,15 +62,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 = {
@@ -107,14 +107,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;
 
@@ -319,17 +319,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,6 +1,6 @@
 {
   "name": "@yousolution/node-red-contrib-you-sap-service-layer",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Unofficial module SAP Service Layer for NODE-RED",
   "license": "MIT",
   "scripts": {
@@ -19,6 +19,7 @@
   ],
   "author": "Andrea Trentin <andrea.trentin@yousolution.cloud>",
   "node-red": {
+    "version": ">=2.0.0",
     "nodes": {
       "authenticateSap": "/nodes/authenticateSap.js",
       "listSap": "/nodes/listSap.js",

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"
-  }
-}