@boxyhq/saml-jackson 0.2.0-beta.151 → 0.2.1-beta.155

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.2.0-beta.151",
+  "version": "0.2.1-beta.155",
   "license": "Apache 2.0",
   "description": "SAML 2.0 service",
   "main": "src/index.js",

package/src/controller/api.js

@@ -10,7 +10,7 @@ let configStore;
 const extractHostName = (url) => {
   try {
     const pUrl = new URL(url);
-    if(pUrl.hostname.startsWith('www.')) {
+    if (pUrl.hostname.startsWith('www.')) {
       return pUrl.hostname.substring(4);
     }
     return pUrl.hostname;
@@ -56,7 +56,7 @@ const config = async (body) => {
     {
       idpMetadata,
       defaultRedirectUrl,
-      redirectUrl: JSON.parse(redirectUrl),
+      redirectUrl: JSON.parse(redirectUrl), // redirectUrl is a stringified array
       tenant,
       product,
       clientID,

package/src/controller/oauth.js

@@ -258,14 +258,16 @@ const token = async (body) => {
 
   if (client_id && client_secret) {
     // check if we have an encoded client_id
-    const sp = getEncodedClientId(client_id);
-    if (!sp) {
-      // OAuth flow
-      if (
-        client_id !== codeVal.clientID ||
-        client_secret !== codeVal.clientSecret
-      ) {
-        throw new JacksonError('Invalid client_id or client_secret', 401);
+    if (client_id !== 'dummy' && client_secret !== 'dummy') {
+      const sp = getEncodedClientId(client_id);
+      if (!sp) {
+        // OAuth flow
+        if (
+          client_id !== codeVal.clientID ||
+          client_secret !== codeVal.clientSecret
+        ) {
+          throw new JacksonError('Invalid client_id or client_secret', 401);
+        }
       }
     }
   } else if (code_verifier) {

package/src/db/db.js

@@ -23,7 +23,13 @@ class DB {
       throw new Error('secondary indexes not allow on a store with ttl');
     }
 
-    return await this.db.put(namespace, key, val, ttl, ...indexes);
+    return await this.db.put(
+      namespace,
+      key,
+      JSON.stringify(val),
+      ttl,
+      ...indexes
+    );
   }
 
   async delete(namespace, key) {

package/src/db/mem.js

@@ -54,7 +54,7 @@ class Mem {
   async put(namespace, key, val, ttl = 0, ...indexes) {
     const k = dbutils.key(namespace, key);
 
-    this.store[k] = JSON.stringify(val);
+    this.store[k] = val;
 
     if (ttl) {
       this.ttlStore[k] = {

package/src/db/mongo.js

@@ -48,7 +48,7 @@ class Mongo {
 
   async put(namespace, key, val, ttl = 0, ...indexes) {
     const doc = {
-      value: JSON.stringify(val),
+      value: val,
     };
 
     if (ttl) {

package/src/db/redis.js

@@ -46,7 +46,7 @@ class Redis {
     let tx = this.client.multi();
     const k = dbutils.key(namespace, key);
 
-    tx = tx.set(k, JSON.stringify(val));
+    tx = tx.set(k, val);
 
     if (ttl) {
       tx = tx.expire(k, ttl);

package/src/db/sql/sql.js

@@ -1,3 +1,5 @@
+/*eslint no-constant-condition: ["error", { "checkLoops": false }]*/
+
 require('reflect-metadata');
 const typeorm = require('typeorm');
 const JacksonStore = require('./model/JacksonStore.js');
@@ -79,7 +81,7 @@ class Sql {
       key: dbutils.key(namespace, key),
     });
 
-    if (res) {
+    if (res && res.value) {
       return JSON.parse(res.value);
     }
 
@@ -99,17 +101,13 @@ class Sql {
       });
     }
 
-    if (res && res.store) {
-      return JSON.parse(res.store.value);
-    }
-
     return ret;
   }
 
   async put(namespace, key, val, ttl = 0, ...indexes) {
     await this.connection.transaction(async (transactionalEntityManager) => {
       const dbKey = dbutils.key(namespace, key);
-      const store = new JacksonStore(dbKey, JSON.stringify(val));
+      const store = new JacksonStore(dbKey, val);
       await transactionalEntityManager.save(store);
 
       if (ttl) {