Multicluster support changes and cluster origin added

Author: brijeshgajjarfynd

express/api_routes.js

@@ -9,9 +9,9 @@ function setupProxyRoutes(extension) {
     const apiRoutes = express.Router({  mergeParams: true });
     const applicationProxyRoutes = express.Router({  mergeParams: true });
 
-    applicationProxyRoutes.use(["/:cluster_id", "/"],async (req, res, next) => {
+    applicationProxyRoutes.use( "/" ,async (req, res, next) => {
         try {
-            const clusterId = req.params.cluster_id;
+            const clusterId = req.query.cluster_origin;
             if (clusterId) {
                 extension = ExtensionFactory.getExtension(clusterId)
             }
@@ -34,9 +34,9 @@ function setupProxyRoutes(extension) {
         }
     });
 
-    apiRoutes.use(["/:cluster_id", "/"], sessionMiddleware(extension, true), async (req, res, next) => {
+    apiRoutes.use( "/" , sessionMiddleware(extension, true), async (req, res, next) => {
         try {
-            const clusterId = req.params.cluster_id;
+            const clusterId = req.query.cluster_origin;
             if (clusterId) {
                 extension = ExtensionFactory.getExtension(clusterId)
             }

express/extension_factory.js

@@ -8,7 +8,7 @@ class ExtensionFactory {
     static getExtension(clusterId) {
         const clusterExt = ExtensionFactory._extensionMap[clusterId]
         if (clusterId !== null && !clusterExt) {
-            throw FdkInvalidCluster(`Extension instance not found for clusterId ${clusterId}`);
+            throw new FdkInvalidCluster(`Extension instance not found for clusterId ${clusterId}`);
         }
         return clusterExt;
     }
@@ -27,7 +27,8 @@ class ExtensionFactory {
             if (!ExtensionFactory._defaultExt) {
                 ExtensionFactory._defaultExt = extInstance;
             }
-            ExtensionFactory._extensionMap[extConfig.cluster_id] = extInstance;
+            const cluster_id = clusterId || extConfig.cluster.replace("https://", "").replace("http://", "");
+            ExtensionFactory._extensionMap[cluster_id] = extInstance;
             promises.push(extInstance.initialize(extConfig))
         }
         return Promise.all(promises);

express/middleware/session_middleware.js

@@ -5,7 +5,7 @@ const { SESSION_COOKIE_NAME } = require('./../constants');
 function sessionMiddleware(extension, strict) {
     return async (req, res, next) => {
         try {
-            const clusterId = req.params.cluster_id;
+            const clusterId = req.query.cluster_origin;
             if (clusterId) {
                 extension = ExtensionFactory.getExtension(clusterId)
             }

express/routes.js

@@ -12,10 +12,10 @@ const FdkRoutes = express.Router();
 
 function setupRoutes(ext) {
 
-    FdkRoutes.get(["/:cluster_id/fp/install", "/fp/install"], async (req, res, next) => {
+    FdkRoutes.get("/fp/install", async (req, res, next) => {
         // ?company_id=1&client_id=123313112122
         try {
-            const cluster_id = req.params.cluster_id;
+            const cluster_id = req.query.cluster_origin;
             if (cluster_id) {
                 ext = ExtensionFactory.getExtension(cluster_id)
             }
@@ -91,10 +91,10 @@ function setupRoutes(ext) {
         }
     });
 
-    FdkRoutes.get(["/:cluster_id/fp/auth", "/fp/auth"], sessionMiddleware(ext, false), async (req, res, next) => {
+    FdkRoutes.get("/fp/auth", sessionMiddleware(ext, false), async (req, res, next) => {
         // ?code=ddjfhdsjfsfh&client_id=jsfnsajfhkasf&company_id=1&state=jashoh
         try {
-            const cluster_id = req.params.cluster_id;
+            const cluster_id = req.query.cluster_origin;
             if (cluster_id) {
                 ext = ExtensionFactory.getExtension(cluster_id)
             }
@@ -173,11 +173,11 @@ function setupRoutes(ext) {
     });
 
 
-    FdkRoutes.post(["/:cluster_id/fp/auto_install", "/fp/auto_install"], sessionMiddleware(ext, false), async (req, res, next) => {
+    FdkRoutes.post("/fp/auto_install", sessionMiddleware(ext, false), async (req, res, next) => {
         try {
 
             let { company_id, code } = req.body;
-            const cluster_id = req.params.cluster_id;
+            const cluster_id = req.query.cluster_origin;
             if (cluster_id) {
                 ext = ExtensionFactory.getExtension(cluster_id)
             }
@@ -227,10 +227,13 @@ function setupRoutes(ext) {
         }
     });
 
-    FdkRoutes.post(["/:cluster_id/fp/uninstall", "/fp/uninstall"], async (req, res, next) => {
+    FdkRoutes.post("/fp/uninstall", async (req, res, next) => {
         try {
             let { company_id } = req.body;
-            const cluster_id = req.params.cluster_id;
+            const cluster_id = req.query.cluster_origin;
+            if (cluster_id) {
+                ext = ExtensionFactory.getExtension(cluster_id)
+            }
             let sid;
             if (!ext.isOnlineAccessMode()) {
                 sid = Session.generateSessionId(false, {

express/webhook.js

@@ -291,7 +291,7 @@ class WebhookRegistry {
         }
         try {
             const { body } = req;
-            const clusterId = req.params.cluster_id;
+            const clusterId = body.referer || req.query.cluster_origin;
             if (body.event.name === TEST_WEBHOOK_EVENT_NAME) {
                 return;
             }