@boxyhq/saml-jackson 0.1.3-beta.82 → 0.1.3-beta.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.1.3-beta.82",
+  "version": "0.1.3-beta.87",
   "license": "Apache 2.0",
   "description": "SAML 2.0 service",
   "main": "src/index.js",

package/src/controller/oauth.js

@@ -28,10 +28,16 @@ const extractBearerToken = (req) => {
 function getEncodedClientId(client_id) {
   try {
     const sp = new URLSearchParams(client_id);
-    return {
-      tenant: sp.get('tenant'),
-      product: sp.get('product'),
-    };
+    const tenant = sp.get('tenant');
+    const product = sp.get('product');
+    if (tenant && product) {
+      return {
+        tenant: sp.get('tenant'),
+        product: sp.get('product'),
+      };
+    }
+
+    return null;
   } catch (err) {
     return null;
   }

package/src/db/db.test.js

@@ -20,7 +20,7 @@ const record2 = {
 const dbs = [
   {
     engine: 'mem',
-    ttlCleanup: 1,
+    ttl: 1,
   },
   {
     engine: 'redis',
@@ -30,6 +30,8 @@ const dbs = [
     engine: 'sql',
     url: 'postgresql://postgres:postgres@localhost:5432/postgres',
     type: 'postgres',
+    ttl: 1,
+    limit: 1,
   },
   {
     engine: 'mongo',
@@ -39,11 +41,15 @@ const dbs = [
     engine: 'sql',
     url: 'mysql://root:mysql@localhost:3307/mysql',
     type: 'mysql',
+    ttl: 1,
+    limit: 1,
   },
   {
     engine: 'sql',
     url: 'mariadb://root@localhost:3306/mysql',
     type: 'mariadb',
+    ttl: 1,
+    limit: 1,
   },
 ];
 
@@ -212,7 +218,7 @@ t.test('dbs', ({ end }) => {
 
     t.test('ttl expiry: ' + dbEngine, async (t) => {
       // mongo runs ttl task every 60 seconds
-      if (dbEngine.startsWith('sql') || dbEngine.startsWith('mongo')) {
+      if (dbEngine.startsWith('mongo')) {
         t.end();
         return;
       }

package/src/db/mem.js

@@ -9,20 +9,25 @@ class Mem {
       this.cleanup = {}; // map of indexes for cleanup when store key is deleted
       this.ttlStore = {}; // map of key to ttl
 
-      this.ttlCleanup = async () => {
-        const now = Date.now();
-        for (const k in this.ttlStore) {
-          if (this.ttlStore[k].expiresAt < now) {
-            await this.delete(this.ttlStore[k].namespace, this.ttlStore[k].key);
+      if (options.ttl) {
+        this.ttlCleanup = async () => {
+          const now = Date.now();
+          for (const k in this.ttlStore) {
+            if (this.ttlStore[k].expiresAt < now) {
+              await this.delete(
+                this.ttlStore[k].namespace,
+                this.ttlStore[k].key
+              );
+            }
           }
-        }
 
-        this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
-      };
+          this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
+        };
 
-      this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
+        this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
+      }
 
-      return this; // Return the newly-created instance
+      return this;
     })();
   }
 

package/src/db/sql/sql.js

@@ -23,7 +23,32 @@ class Sql {
       this.storeRepository = this.connection.getRepository(JacksonStore);
       this.indexRepository = this.connection.getRepository(JacksonIndex);
 
-      return this; // Return the newly-created instance
+      if (options.ttl && options.limit) {
+        this.ttlCleanup = async () => {
+          const now = Date.now();
+
+          while (true) {
+            const ids = await this.storeRepository.find({
+              expiresAt: typeorm.MoreThan(now),
+              take: options.limit,
+            });
+
+            if (ids.length <= 0) {
+              break;
+            }
+
+            await this.storeRepository.remove(ids);
+          }
+
+          this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
+        };
+
+        this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
+      } else {
+        console.log('Warning: ttl cleanup not enabled, set both "ttl" and "limit" options to enable it!')
+      }
+
+      return this;
     })();
   }
 

package/src/index.js

@@ -22,6 +22,7 @@ const defaultOpts = (opts) => {
     newOpts.db.url || 'postgres://postgres:postgres@localhost:5432/jackson';
   newOpts.db.type = newOpts.db.type || 'postgres'; // Only needed if DB_ENGINE is sql. Supported values: postgres, cockroachdb, mysql, mariadb
   newOpts.db.ttl = (newOpts.db.ttl || 300) * 1; // TTL for the code, session and token stores (in seconds)
+  newOpts.db.limit = (newOpts.db.limit || 1000) * 1; // Limit ttl cleanup to this many items at a time
 
   return newOpts;
 };