@boxyhq/saml-jackson 0.1.5-beta.138 → 0.1.5-beta.142

package/README.md

@@ -166,12 +166,12 @@ curl --location --request POST 'http://localhost:6000/api/v1/saml/config' \
 
 The response returns a JSON with `client_id` and `client_secret` that can be stored against your tenant and product for a more secure OAuth 2.0 flow. If you do not want to store the `client_id` and `client_secret` you can alternatively use `client_id=tenant=<tenantID>&product=<productID>` and any arbitrary value for `client_secret` when setting up the OAuth 2.0 flow. Additionally a `provider` attribute is also returned which indicates the domain of your Identity Provider.
 
-#### 2.1 SAML GET config API
+#### 2.1 SAML get config API
 
-This endpoint can be used to return metadata about an existing SAML config. This can be used to check and display the details to your customers. You can use either `clientID` and `clientSecret` combination or `tenant` and `product` combination.
+This endpoint can be used to return metadata about an existing SAML config. This can be used to check and display the details to your customers. You can use either `clientID` or `tenant` and `product` combination.
 
 ```
-curl --location --request GET 'http://localhost:6000/api/v1/saml/config' \
+curl --location --request POST 'http://localhost:6000/api/v1/saml/config/get' \
 --header 'Authorization: Api-Key <Jackson API Key>' \
 --header 'Content-Type: application/x-www-form-urlencoded' \
 --data-urlencode 'tenant=boxyhq.com' \
@@ -179,11 +179,10 @@ curl --location --request GET 'http://localhost:6000/api/v1/saml/config' \
 ```
 
 ```
-curl --location --request GET 'http://localhost:6000/api/v1/saml/config' \
+curl --location --request POST 'http://localhost:6000/api/v1/saml/config/get' \
 --header 'Authorization: Api-Key <Jackson API Key>' \
 --header 'Content-Type: application/x-www-form-urlencoded' \
---data-urlencode 'clientID=<Client ID>' \
---data-urlencode 'clientSecret=<Client Secret>'
+--data-urlencode 'clientID=<Client ID>'
 ```
 
 The response returns a JSON with `provider` indicating the domain of your Identity Provider. If an empty JSON payload is returned then we do not have any configuration stored for the attributes you requested.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.1.5-beta.138",
+  "version": "0.1.5-beta.142",
   "license": "Apache 2.0",
   "description": "SAML 2.0 service",
   "main": "src/index.js",
@@ -19,9 +19,11 @@
     "dev": "cross-env IDP_ENABLED=true nodemon src/jackson.js",
     "mongo": "cross-env DB_ENGINE=mongo DB_URL=mongodb://localhost:27017/jackson nodemon src/jackson.js",
     "pre-loaded": "cross-env DB_ENGINE=mem PRE_LOADED_CONFIG='./_config' nodemon src/jackson.js",
+    "pre-loaded-db": "cross-env PRE_LOADED_CONFIG='./_config' nodemon src/jackson.js",
     "test": "tap --timeout=100 src/**/*.test.js",
     "dev-dbs": "docker-compose -f ./_dev/docker-compose.yml up -d",
-    "dev-dbs-destroy": "docker-compose -f ./_dev/docker-compose.yml down --volumes --remove-orphans"
+    "dev-dbs-destroy": "docker-compose -f ./_dev/docker-compose.yml down --volumes --remove-orphans",
+    "prepare": "husky install"
   },
   "tap": {
     "coverage-map": "map.js",
@@ -36,7 +38,7 @@
     "@peculiar/x509": "1.6.0",
     "cors": "2.8.5",
     "express": "4.17.1",
-    "mongodb": "4.2.0",
+    "mongodb": "4.2.1",
     "mysql2": "2.3.3",
     "pg": "8.7.1",
     "rambda": "6.9.0",
@@ -51,8 +53,15 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "eslint": "8.3.0",
+    "eslint": "8.4.0",
+    "husky": "7.0.4",
+    "lint-staged": "12.1.2",
     "nodemon": "2.0.15",
-    "tap": "15.1.2"
+    "prettier": "2.5.1",
+    "tap": "15.1.5"
+  },
+  "lint-staged": {
+    "*.js": "eslint --cache --fix",
+    "*.{js,css,md}": "prettier --write"
   }
 }

package/src/controller/api.js

@@ -83,9 +83,9 @@ const config = async (body) => {
 };
 
 const getConfig = async (body) => {
-  const { clientID, clientSecret, tenant, product } = body;
+  const { clientID, tenant, product } = body;
 
-  if (clientID && clientSecret) {
+  if (clientID) {
     const samlConfig = await configStore.get(clientID);
     if (!samlConfig) {
       return {};

package/src/db/db.test.js

@@ -224,7 +224,7 @@ t.test('dbs', ({ end }) => {
       }
 
       await new Promise((resolve) =>
-        setTimeout(resolve, ((dbEngine === 'mem' ? 5 : 0) + ttl + 0.5) * 1000)
+        setTimeout(resolve, (2*ttl + 0.5) * 1000)
       );
 
       const ret1 = await ttlStore.get(record1.id);

package/src/db/sql/entity/JacksonStore.js

@@ -27,10 +27,6 @@ module.exports = (type) => {
       value: {
         type: valueType(type),
       },
-      expiresAt: {
-        type: 'bigint',
-        nullable: true,
-      },
     },
   });
 };

package/src/db/sql/entity/JacksonTTL.js

@@ -0,0 +1,23 @@
+const EntitySchema = require('typeorm').EntitySchema;
+const JacksonTTL = require('../model/JacksonTTL.js');
+
+module.exports = new EntitySchema({
+  name: 'JacksonTTL',
+  target: JacksonTTL,
+  columns: {
+    key: {
+      primary: true,
+      type: 'varchar',
+      length: 1500,
+    },
+    expiresAt: {
+      type: 'bigint',
+    },
+  },
+  indices: [
+    {
+      name: '_jackson_ttl_expires_at',
+      columns: ['expiresAt'],
+    },
+  ],
+});

package/src/db/sql/model/JacksonStore.js

@@ -1,8 +1,7 @@
 /*export */ class JacksonStore {
-  constructor(key, value, expiresAt) {
+  constructor(key, value) {
     this.key = key;
     this.value = value;
-    this.expiresAt = expiresAt;
   }
 }
 

package/src/db/sql/model/JacksonTTL.js

@@ -0,0 +1,8 @@
+/*export */ class JacksonTTL {
+  constructor(key, expiresAt) {
+    this.key = key;
+    this.expiresAt = expiresAt;
+  }
+}
+
+module.exports = JacksonTTL;

package/src/db/sql/sql.js

@@ -2,6 +2,7 @@ require('reflect-metadata');
 const typeorm = require('typeorm');
 const JacksonStore = require('./model/JacksonStore.js');
 const JacksonIndex = require('./model/JacksonIndex.js');
+const JacksonTTL = require('./model/JacksonTTL.js');
 
 const dbutils = require('../utils.js');
 
@@ -20,6 +21,7 @@ class Sql {
             entities: [
               require('./entity/JacksonStore.js')(options.type),
               require('./entity/JacksonIndex.js'),
+              require('./entity/JacksonTTL.js'),
             ],
           });
 
@@ -33,22 +35,29 @@ class Sql {
 
       this.storeRepository = this.connection.getRepository(JacksonStore);
       this.indexRepository = this.connection.getRepository(JacksonIndex);
+      this.ttlRepository = this.connection.getRepository(JacksonTTL);
 
       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,
-            });
+            const ids = await this.ttlRepository
+              .createQueryBuilder('jackson_ttl')
+              .limit(options.limit)
+              .where('jackson_ttl.expiresAt <= :expiresAt', { expiresAt: now })
+              .getMany();
 
             if (ids.length <= 0) {
               break;
             }
 
+            const delIds = ids.map((id) => {
+              return id.key;
+            });
+
             await this.storeRepository.remove(ids);
+            await this.ttlRepository.delete(delIds);
           }
 
           this.timerId = setTimeout(this.ttlCleanup, options.ttl * 1000);
@@ -99,13 +108,15 @@ class Sql {
 
   async put(namespace, key, val, ttl = 0, ...indexes) {
     await this.connection.transaction(async (transactionalEntityManager) => {
-      const store = new JacksonStore(
-        dbutils.key(namespace, key),
-        JSON.stringify(val),
-        ttl > 0 ? Date.now() + ttl * 1000 : null
-      );
+      const dbKey = dbutils.key(namespace, key);
+      const store = new JacksonStore(dbKey, JSON.stringify(val));
       await transactionalEntityManager.save(store);
 
+      if (ttl) {
+        const ttlRec = new JacksonTTL(dbKey, Date.now() + ttl * 1000);
+        await transactionalEntityManager.save(ttlRec);
+      }
+
       // no ttl support for secondary indexes
       for (const idx of indexes || []) {
         const key = dbutils.keyForIndex(namespace, idx);

package/src/jackson.js

@@ -87,7 +87,7 @@ internalApp.post(apiPath + '/config', async (req, res) => {
   }
 });
 
-internalApp.get(apiPath + '/config', async (req, res) => {
+internalApp.post(apiPath + '/config/get', async (req, res) => {
   try {
     const apiKey = extractAuthToken(req);
     if (!validateApiKey(apiKey)) {