@5minds/node-red-contrib-processcube 1.5.2-develop-7add47-m2xezg12 → 1.5.2-feature-059ba7-m35qmr4f

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@5minds/node-red-contrib-processcube",
-    "version": "1.5.2-develop-7add47-m2xezg12",
+    "version": "1.5.2-feature-059ba7-m35qmr4f",
     "license": "MIT",
     "description": "Node-RED nodes for ProcessCube",
     "scripts": {
@@ -57,7 +57,7 @@
         "examples": "examples"
     },
     "dependencies": {
-        "@5minds/processcube_engine_client": "^5.1.0",
+        "@5minds/processcube_engine_client": "5.1.0-hotfix-a73235-m346kg1n",
         "jwt-decode": "^4.0.0",
         "openid-client": "^5.5.0"
     },

package/processcube-engine-config.js

@@ -36,6 +36,46 @@ module.exports = function (RED) {
             }
         };
 
+        async function getFreshIdentity(url) {
+            console.log('luis777');
+            if (
+                !RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node) ||
+                !RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node)
+            )
+                return null;
+            const res = await fetch(url + '/atlas_engine/api/v1/authority', {
+                method: 'GET',
+                headers: {
+                    Authorization: `Bearer ZHVtbXlfdG9rZW4=`,
+                    'Content-Type': 'application/json',
+                },
+            });
+
+            const issuer = await oidc.Issuer.discover(await res.json());
+
+            const client = new issuer.Client({
+                client_id: RED.util.evaluateNodeProperty(n.clientId, n.clientIdType, node),
+                client_secret: RED.util.evaluateNodeProperty(n.clientSecret, n.clientSecretType, node),
+            });
+
+            const tokenSet = await client.grant({
+                grant_type: 'client_credentials',
+                scope: 'engine_etw engine_read engine_write',
+            });
+
+            const accessToken = tokenSet.access_token;
+            const decodedToken = jwt.jwtDecode(accessToken);
+
+            const freshIdentity = {
+                token: tokenSet.access_token,
+                userId: decodedToken.sub,
+            };
+
+            configNode.setIdentity(freshIdentity);
+
+            return freshIdentity;
+        }
+
         node.on('close', async () => {
             if (this.engineClient) {
                 this.engineClient.dispose();
@@ -44,25 +84,25 @@ module.exports = function (RED) {
         });
 
         if (this.credentials.clientId && this.credentials.clientSecret) {
-            this.engineClient = new engine_client.EngineClient(this.url);
-
-            this.engineClient.applicationInfo
-                .getAuthorityAddress()
-                .then((authorityUrl) => {
-                    startRefreshingIdentityCycle(
-                        this.credentials.clientId,
-                        this.credentials.clientSecret,
-                        authorityUrl,
-                        node
-                    ).catch((reason) => {
-                        console.error(reason);
-                        node.error(reason);
-                    });
-                })
-                .catch((reason) => {
-                    console.error(reason);
-                    node.error(reason);
-                });
+            this.engineClient = new engine_client.EngineClient(this.url, () => getFreshIdentity(this.url));
+
+            // this.engineClient.applicationInfo
+            //     .getAuthorityAddress()
+            //     .then((authorityUrl) => {
+            //         startRefreshingIdentityCycle(
+            //             this.credentials.clientId,
+            //             this.credentials.clientSecret,
+            //             authorityUrl,
+            //             node
+            //         ).catch((reason) => {
+            //             console.error(reason);
+            //             node.error(reason);
+            //         });
+            //     })
+            //     .catch((reason) => {
+            //         console.error(reason);
+            //         node.error(reason);
+            //     });
         } else {
             this.engineClient = new engine_client.EngineClient(this.url);
         }
@@ -75,84 +115,84 @@ module.exports = function (RED) {
     });
 };
 
-async function getFreshTokenSet(clientId, clientSecret, authorityUrl) {
-    const issuer = await oidc.Issuer.discover(authorityUrl);
-
-    const client = new issuer.Client({
-        client_id: clientId,
-        client_secret: clientSecret,
-    });
-
-    const tokenSet = await client.grant({
-        grant_type: 'client_credentials',
-        scope: 'engine_etw engine_read engine_write',
-    });
-
-    return tokenSet;
-}
-
-function getIdentityForExternalTaskWorkers(tokenSet) {
-    const accessToken = tokenSet.access_token;
-    const decodedToken = jwt.jwtDecode(accessToken);
-
-    return {
-        token: tokenSet.access_token,
-        userId: decodedToken.sub,
-    };
-}
-
-async function getExpiresInForExternalTaskWorkers(tokenSet) {
-    let expiresIn = tokenSet.expires_in;
-
-    if (!expiresIn && tokenSet.expires_at) {
-        expiresIn = Math.floor(tokenSet.expires_at - Date.now() / 1000);
-    }
-
-    if (expiresIn === undefined) {
-        throw new Error('Could not determine the time until the access token for external task workers expires');
-    }
-
-    return expiresIn;
-}
-
-/**
- * Start refreshing the identity in regular intervals.
- * @param {TokenSet | null} tokenSet The token set to refresh the identity for
- * @returns {Promise<void>} A promise that resolves when the timer for refreshing the identity is initialized
- * */
-async function startRefreshingIdentityCycle(clientId, clientSecret, authorityUrl, configNode) {
-    let retries = 5;
-
-    const refresh = async () => {
-        try {
-            const newTokenSet = await getFreshTokenSet(clientId, clientSecret, authorityUrl);
-            const expiresIn = await getExpiresInForExternalTaskWorkers(newTokenSet);
-            const delay = expiresIn * DELAY_FACTOR * 1000;
-
-            freshIdentity = getIdentityForExternalTaskWorkers(newTokenSet);
-
-            configNode.setIdentity(freshIdentity);
-
-            retries = 5;
-            setTimeout(refresh, delay);
-        } catch (error) {
-            if (retries === 0) {
-                console.error(
-                    'Could not refresh identity for external task worker processes. Stopping all external task workers.',
-                    { error }
-                );
-                return;
-            }
-            console.error('Could not refresh identity for external task worker processes.', {
-                error,
-                retryCount: retries,
-            });
-            retries--;
-
-            const delay = 2 * 1000;
-            setTimeout(refresh, delay);
-        }
-    };
-
-    await refresh();
-}
+// async function getFreshTokenSet(clientId, clientSecret, authorityUrl) {
+//     const issuer = await oidc.Issuer.discover(authorityUrl);
+
+//     const client = new issuer.Client({
+//         client_id: clientId,
+//         client_secret: clientSecret,
+//     });
+
+//     const tokenSet = await client.grant({
+//         grant_type: 'client_credentials',
+//         scope: 'engine_etw engine_read engine_write',
+//     });
+
+//     return tokenSet;
+// }
+
+// function getIdentityForExternalTaskWorkers(tokenSet) {
+//     const accessToken = tokenSet.access_token;
+//     const decodedToken = jwt.jwtDecode(accessToken);
+
+//     return {
+//         token: tokenSet.access_token,
+//         userId: decodedToken.sub,
+//     };
+// }
+
+// async function getExpiresInForExternalTaskWorkers(tokenSet) {
+//     let expiresIn = tokenSet.expires_in;
+
+//     if (!expiresIn && tokenSet.expires_at) {
+//         expiresIn = Math.floor(tokenSet.expires_at - Date.now() / 1000);
+//     }
+
+//     if (expiresIn === undefined) {
+//         throw new Error('Could not determine the time until the access token for external task workers expires');
+//     }
+
+//     return expiresIn;
+// }
+
+// /**
+//  * Start refreshing the identity in regular intervals.
+//  * @param {TokenSet | null} tokenSet The token set to refresh the identity for
+//  * @returns {Promise<void>} A promise that resolves when the timer for refreshing the identity is initialized
+//  * */
+// async function startRefreshingIdentityCycle(clientId, clientSecret, authorityUrl, configNode) {
+//     let retries = 5;
+
+//     const refresh = async () => {
+//         try {
+//             const newTokenSet = await getFreshTokenSet(clientId, clientSecret, authorityUrl);
+//             const expiresIn = await getExpiresInForExternalTaskWorkers(newTokenSet);
+//             const delay = expiresIn * DELAY_FACTOR * 1000;
+
+//             freshIdentity = getIdentityForExternalTaskWorkers(newTokenSet);
+
+//             configNode.setIdentity(freshIdentity);
+
+//             retries = 5;
+//             setTimeout(refresh, delay);
+//         } catch (error) {
+//             if (retries === 0) {
+//                 console.error(
+//                     'Could not refresh identity for external task worker processes. Stopping all external task workers.',
+//                     { error }
+//                 );
+//                 return;
+//             }
+//             console.error('Could not refresh identity for external task worker processes.', {
+//                 error,
+//                 retryCount: retries,
+//             });
+//             retries--;
+
+//             const delay = 2 * 1000;
+//             setTimeout(refresh, delay);
+//         }
+//     };
+
+//     await refresh();
+// }