do prober db clean up of tokens

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -1174,6 +1174,7 @@ export class DatabaseConnection {
             _query = { $and: [{ _id: { "$in": ids } }, baseq] };
         } else if (!NoderedUtil.IsNullUndefinded(query)) {
             if (query !== null && query !== undefined) {
+                console.log(JSON.parse(JSON.stringify(query)));
                 let json: any = query;
                 if (typeof json !== 'string' && !(json instanceof String)) {
                     json = JSON.stringify(json, (key, value) => {

OpenFlow/src/OAuthProvider.ts

@@ -251,8 +251,7 @@ export class OAuthProvider {
         if (user == null) return null;
         this.revokeAuthorizationCode(code);
         const redirect_uri = (user as any).redirect_uri;
-        const expiresAt = new Date();
-        expiresAt.setMonth(expiresAt.getMonth() + 1);
+        const expiresAt = new Date((new Date).getTime() + (1000 * Config.oauth_access_token_lifetime));
         var tuser = TokenUser.From(user);
         let client = this.getClientById(client_id);
         if (NoderedUtil.IsNullUndefinded(client)) return null;
@@ -282,16 +281,19 @@ export class OAuthProvider {
         if (typeof code !== "string") { code = code.code; }
         this._logger.info("[OAuth] revokeAuthorizationCode " + code);
         delete this.codes[code];
-        const refreshTokenExpiresAt = new Date((new Date).getTime() + (1000 * Config.oauth_refresh_token_lifetime)).toISOString();
-        const accessTokenExpiresAt = new Date((new Date).getTime() + (1000 * Config.oauth_access_token_lifetime)).toISOString();
+        const refreshTokenExpiresAt = new Date((new Date).getTime() - (1000 * Config.oauth_refresh_token_lifetime)).toISOString();
+        const accessTokenExpiresAt = new Date((new Date).getTime() - (1000 * Config.oauth_access_token_lifetime)).toISOString();
+        const codeExpiresAt = new Date((new Date).getTime() - (1000 * 120)).toISOString();
         await Config.db.DeleteMany({
             "$or":
                 [
-                    { _type: "code", "code": code },
-                    { _type: "token", "refreshTokenExpiresAt": refreshTokenExpiresAt },
-                    { _type: "token", "accessTokenExpiresAt": accessTokenExpiresAt }
+                    { "_type": "code", "_created": { "$lte": codeExpiresAt } },
+                    { "_type": "token", "refreshTokenExpiresAt": { "$lte": refreshTokenExpiresAt } },
+                    { "_type": "token", "accessTokenExpiresAt": { "$lte": accessTokenExpiresAt } }
                 ]
         }, null, "oauthtokens", Crypt.rootToken());
+        // await Config.db.DeleteMany({ "_type": "code", "code": code }, null, "oauthtokens", Crypt.rootToken());
+        await Config.db.DeleteMany({ "_type": "code", "_created": { "$lte": codeExpiresAt } }, null, "oauthtokens", Crypt.rootToken());
         return true;
         // const user: TokenUser = this.codes[code];
         // if (user != null) delete this.codes[code];

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.105",
+  "version": "1.1.106",
   "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.105
+1.1.106

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

package.json

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