Fix demo shell proxies (#7613)

Alfresco · May 6, 2022 · 6d60e45 · 6d60e45
1 parent 90009d7
commit 6d60e45
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 25 deletions.
diff --git a/demo-shell/proxy-helpers.js b/demo-shell/proxy-helpers.js
@@ -0,0 +1,65 @@
+module.exports = {
+    getDeployedAppsProxy: function(processHost, deployedApps) {
+        let deployedAppProxy = {};
+
+        if (deployedApps) {
+            try {
+                const deployedAppsArray = JSON.parse(deployedApps);
+                for (const app of deployedAppsArray) {
+                    const appName = app.name;
+                    const appPath = `/${appName}`;
+                    const appPathRewrite = `^/${appName}`;
+
+                    deployedAppProxy = {
+                        ...deployedAppProxy,
+                        [appPath]: {
+                            target: `${processHost}`,
+                            secure: false,
+                            pathRewrite: {
+                                [appPathRewrite]: appName,
+                            },
+                            changeOrigin: true,
+                        },
+                    };
+                }
+            } catch (e) {
+                console.log(e);
+            }
+        }
+
+        return deployedAppProxy;
+    },
+    getShareProxy: function(host) {
+        console.log('Target for /alfresco', host);
+        return {
+            '/alfresco': {
+                target: host,
+                secure: false,
+                logLevel: 'debug',
+                changeOrigin: true,
+                onProxyReq: function(request) {
+                    if(request["method"] !== "GET")
+                        request.setHeader("origin", host);
+                },
+                // workaround for REPO-2260
+                onProxyRes: function (proxyRes, req, res) {
+                    const header = proxyRes.headers['www-authenticate'];
+                    if (header && header.startsWith('Basic')) {
+                        proxyRes.headers['www-authenticate'] = 'x' + header;
+                    }
+                },
+            },
+        }
+    },
+    getApsProxy: function(host) {
+        console.log('Target for /activiti-app', host);
+        return {
+            '/activiti-app': {
+                target: host,
+                secure: false,
+                logLevel: 'debug',
+                changeOrigin: true,
+            },
+        }
+    }
+};
diff --git a/demo-shell/proxy.conf.js b/demo-shell/proxy.conf.js
@@ -1,29 +1,14 @@
 require('dotenv').config();
 
-var PROXY_HOST_ADF = process.env.PROXY_HOST_ADF;
-console.log('PROXY_HOST_ADF' + PROXY_HOST_ADF);
+const { getDeployedAppsProxy, getShareProxy, getApsProxy } = require('./proxy-helpers');
+
+const legacyHost = process.env.PROXY_HOST_ADF;
+const cloudHost = process.env.CLOUD_PROXY_HOST_ADF;
+const cloudApps = process.env.APP_CONFIG_APPS_DEPLOYED;
+const apsHost = process.env.PROXY_HOST_ADF;
+
 module.exports = {
-    "/alfresco": {
-        "target": (PROXY_HOST_ADF || "http://localhost:8080"),
-        "secure": false,
-        "pathRewrite": {
-            "^/alfresco/alfresco": ""
-        },
-        "changeOrigin": true,
-        // workaround for REPO-2260
-        onProxyRes: function (proxyRes, req, res) {
-            const header = proxyRes.headers['www-authenticate'];
-            if (header && header.startsWith('Basic')) {
-                proxyRes.headers['www-authenticate'] = 'x' + header;
-            }
-        }
-    },
-    "/activiti-app": {
-        "target": (PROXY_HOST_ADF || "http://localhost:8080"),
-        "secure": false,
-        "pathRewrite": {
-            "^/activiti-app/activiti-app": ""
-        },
-        "changeOrigin": true
-    }
+    ...getShareProxy(legacyHost),
+    ...getApsProxy(apsHost),
+    ...getDeployedAppsProxy(cloudHost, cloudApps)
 };