fix oauth state after redirect

Author: skadefro

OpenFlow/src/OAuthProvider.ts

@@ -45,13 +45,13 @@ export class OAuthProvider {
             app.get('/oauth/login', async (req, res) => {
                 instance.clients = await Config.db.query<Base>({ _type: "oauthclient" }, null, 10, 0, null, "config", Crypt.rootToken());
                 if (instance.clients == null || instance.clients.length == 0) return res.status(500).json({ message: 'OAuth not configured' });
-                let state = req.params.state;
-                if (state == null) state = encodeURIComponent(req.query.state as any);
-                const access_type = req.query.access_type;
-                const client_id = req.query.client_id;
-                const redirect_uri = req.query.redirect_uri;
-                const response_type = req.query.response_type;
-                const scope = req.query.scope;
+                let state = (req.params.state ? req.params.state : req.params["amp;state"]);
+                if (state == null) state = encodeURIComponent((req.query.state ? req.query.state : req.query["amp;state"]) as any);
+                const access_type = (req.query.access_type ? req.query.access_type : req.query["amp;access_type"]);
+                const client_id = (req.query.client_id ? req.query.client_id : req.query["amp;client_id"]);
+                const redirect_uri = (req.query.redirect_uri ? req.query.redirect_uri : req.query["amp;redirect_uri"]);
+                const response_type = (req.query.response_type ? req.query.response_type : req.query["amp;response_type"]);
+                const scope = (req.query.scope ? req.query.scope : req.query["amp;scope"]);
                 let client = instance.getClientById(client_id);
                 if (req.user) {
                     if (!NoderedUtil.IsNullUndefinded(client) && !Array.isArray(client.redirectUris)) {
@@ -160,7 +160,7 @@ export class OAuthProvider {
         const clients = this.clients.filter((client) => {
             return client.clientId === clientId;
         });
-        return clients.length ? clients[0] : false;
+        return clients.length ? clients[0] : null;
     }
 
     public async saveToken(token, client, user) {
@@ -212,6 +212,7 @@ export class OAuthProvider {
         expiresAt.setMonth(expiresAt.getMonth() + 1);
         user = TokenUser.From(user);
         let client = this.getClientById(client_id);
+        if (NoderedUtil.IsNullUndefinded(client)) return null;
 
         let role = client.defaultrole;
         const keys: string[] = Object.keys(client.rolemappings);

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.84",
+  "version": "1.1.87",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.1.84
+1.1.87

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.84"
+    image: "cloudhack/openflow:1.1.87"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.84"
+    image: "cloudhack/openflownodered:1.1.87"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "cloudhack/openflow:1.1.84"
+    image: "cloudhack/openflow:1.1.87"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.84"
+    image: "cloudhack/openflownodered:1.1.87"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.84"
+    image: "cloudhack/openflow:1.1.87"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.84"
+    image: "cloudhack/openflownodered:1.1.87"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.84"
+    image: "cloudhack/openflow:1.1.87"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.84"
+    image: "cloudhack/openflownodered:1.1.87"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.84",
+  "version": "1.1.87",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {