improve oauth

Author: skadefro

OpenFlow/src/OAuthProvider.ts

@@ -37,7 +37,7 @@ export class OAuthProvider {
                 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 redirect_uri = (req.query.redirect_uri ? req.query.redirect_uri : req.query["amp;redirect_uri"]) as string;
                 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);
@@ -54,9 +54,7 @@ export class OAuthProvider {
                     const code = Math.random().toString(36).substr(2, 9);
 
                     instance._logger.info("[OAuth][" + (req.user as any).username + "] /oauth/login " + state);
-                    instance.codes[code] = req.user;
-                    instance.codes[code].redirect_uri = redirect_uri;
-                    instance.codes[code].client_id = client_id;
+                    instance.saveAuthorizationCode(code, client, req.user, redirect_uri);
                     res.redirect(`${redirect_uri}?state=${state}&code=${code}`);
                 } else {
                     instance._logger.info("[OAuth][anon] /oauth/login " + state);
@@ -164,6 +162,7 @@ export class OAuthProvider {
     public async saveToken(token, client, user) {
         this._logger.info("[OAuth] saveToken " + token);
         const result: any = {
+            name: "Token for " + user.name,
             accessToken: token.accessToken,
             access_token: token.accessToken,
             accessTokenExpiresAt: token.accessTokenExpiresAt,
@@ -180,8 +179,22 @@ export class OAuthProvider {
         await Config.db.InsertOne(result, "oauthtokens", 0, false, Crypt.rootToken());
         return result;
     }
-    saveAuthorizationCode(code, client, user) {
+    public async saveAuthorizationCode(code: string, client: any, user: any, redirect_uri: string) {
         this._logger.info("[OAuth] saveAuthorizationCode " + code);
+        const codeobject = Object.assign({}, user);
+        delete codeobject._id;
+        codeobject._type = 'code';
+        codeobject.code = code;
+        codeobject.redirect_uri = redirect_uri;
+        codeobject.client_id = client.clientId
+        this.codes[code] = codeobject;
+        await Config.db.InsertOne(codeobject, "oauthtokens", 1, false, Crypt.rootToken());
+        this._logger.info("[OAuth] saveAuthorizationCode " + code + " saved");
+        // instance.codes[code].client_id = client_id;
+
+
+        // await Config.db.InsertOne(result, "oauthtokens", 0, false, Crypt.rootToken());
+
         // // const codeToSave: any = this.codes[code];
         // const codeToSave: any = {
         //     'authorizationCode': code.authorizationCode,
@@ -197,11 +210,36 @@ export class OAuthProvider {
         //     'client': client.id,
         //     'user': user.username
         // });
-        return code;
+        return codeobject;
     }
-    getAuthorizationCode(code) {
+    sleep(ms) {
+        return new Promise(resolve => {
+            setTimeout(resolve, ms)
+        })
+    }
+
+    public async getAuthorizationCode(code) {
         this._logger.info("[OAuth] getAuthorizationCode " + code);
         let user: TokenUser = this.codes[code];
+        if (user == null) {
+            let users = await Config.db.query<Base>({ _type: "code", "code": code }, null, 10, 0, null, "oauthtokens", Crypt.rootToken());
+            user = users.length ? users[0] as any : null;
+            if (user == null) {
+                await this.sleep(1000);
+                users = await Config.db.query<Base>({ _type: "code", "code": code }, null, 10, 0, null, "oauthtokens", Crypt.rootToken());
+                user = users.length ? users[0] as any : null;
+            }
+            if (user == null) {
+                await this.sleep(1000);
+                users = await Config.db.query<Base>({ _type: "code", "code": code }, null, 10, 0, null, "oauthtokens", Crypt.rootToken());
+                user = users.length ? users[0] as any : null;
+            }
+            if (user == null) {
+                this._logger.error("[OAuth] getAuthorizationCode, unkown code '" + code + "'");
+                return null;
+            }
+            if (user != null) { this.codes[code] = user; }
+        }
         const client_id: string = this.codes[code].client_id;
         if (user == null) return null;
         this.revokeAuthorizationCode(code);
@@ -236,6 +274,7 @@ export class OAuthProvider {
     revokeAuthorizationCode(code) {
         this._logger.info("[OAuth] revokeAuthorizationCode " + code);
         delete this.codes[code];
+        Config.db.DeleteMany({ _type: "code", "code": code }, null, "oauthtokens", Crypt.rootToken());
         return true;
         // const user: TokenUser = this.codes[code];
         // if (user != null) delete this.codes[code];

OpenFlow/src/public/Payment.html

@@ -420,7 +420,7 @@
     <div ng-show="ctrl.cardmessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.cardmessage}}</div>
     <div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
     <pre ng-show="ctrl.messages!=''" class=" alert alert-primary" role="alert">{{ ctrl.messages }}</pre>
-    <h3 ng-show="ctrl.openflowplans.length > 0">OpenFlow User w/NodeRed with a SLA</h3>
+    <!-- <h3 ng-show="ctrl.openflowplans.length > 0">OpenFlow User w/NodeRed with a SLA</h3>
     <div class="row" ng-hide="ctrl.loading==true">
         <div ng-repeat="model in ctrl.openflowplans">
             <div class="card" style="width: 17rem;height: 332px;">
@@ -437,7 +437,7 @@ <h6 class="card-subtitle mb-2 text-muted">{{model.metadata.subtitle}}</h6>
                 </div>
             </div>
         </div>
-    </div>
+    </div> -->
     <h3 ng-show="ctrl.supportplans.length > 0">Support agreements</h3>
     <div class="row" ng-hide="ctrl.loading==true">
         <div ng-repeat="model in ctrl.supportplans">

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.99",
+  "version": "1.1.103",
   "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.99
+1.1.103

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.99"
+    image: "cloudhack/openflow:1.1.103"
     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.99"
+    image: "cloudhack/openflownodered:1.1.103"
     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.99"
+    image: "cloudhack/openflow:1.1.103"
     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.99"
+    image: "cloudhack/openflownodered:1.1.103"
     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.99"
+    image: "cloudhack/openflow:1.1.103"
     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.99"
+    image: "cloudhack/openflownodered:1.1.103"
     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.99"
+    image: "cloudhack/openflow:1.1.103"
     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.99"
+    image: "cloudhack/openflownodered:1.1.103"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.99",
+  "version": "1.1.103",
   "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": {