@boxyhq/saml-jackson 0.2.3-beta.222 → 0.2.3-beta.226

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxyhq/saml-jackson",
-  "version": "0.2.3-beta.222",
+  "version": "0.2.3-beta.226",
   "license": "Apache 2.0",
   "description": "SAML 2.0 service",
   "main": "dist/index.js",
@@ -17,12 +17,12 @@
   ],
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "start": "cross-env IDP_ENABLED=true node src/jackson.js",
-    "dev": "cross-env IDP_ENABLED=true nodemon src/jackson.js",
-    "mongo": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=mongo DB_URL=mongodb://localhost:27017/jackson DB_ENCRYPTION_KEY=RiVoTxDoLUUoIUOp224abMxK6PGGfFuF nodemon --config nodemon.json src/jackson.ts",
-    "sql": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=sql DB_TYPE=postgres DB_URL=postgres://postgres:postgres@localhost:5432/jackson DB_ENCRYPTION_KEY=RiVoTxDoLUUoIUOp224abMxK6PGGfFuF nodemon src/jackson.js",
-    "pre-loaded": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=mem PRE_LOADED_CONFIG='./_config' nodemon src/jackson.js",
-    "pre-loaded-db": "cross-env JACKSON_API_KEYS=secret PRE_LOADED_CONFIG='./_config' nodemon src/jackson.js",
+    "start": "cross-env IDP_ENABLED=true node dist/jackson.js",
+    "dev": "cross-env IDP_ENABLED=true nodemon --config nodemon.json src/jackson.ts",
+    "mongo": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=mongo DB_URL=mongodb://localhost:27017/jackson nodemon --config nodemon.json src/jackson.ts",
+    "sql": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=sql DB_TYPE=postgres DB_URL=postgres://postgres:postgres@localhost:5432/jackson nodemon --config nodemon.json src/jackson.ts",
+    "pre-loaded": "cross-env JACKSON_API_KEYS=secret DB_ENGINE=mem PRE_LOADED_CONFIG='./_config' nodemon --config nodemon.json src/jackson.ts",
+    "pre-loaded-db": "cross-env JACKSON_API_KEYS=secret PRE_LOADED_CONFIG='./_config' nodemon --config nodemon.json src/jackson.ts",
     "test": "tap --ts --timeout=100 src/**/*.test.ts",
     "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"

package/src/db/mem.ts

@@ -1,6 +1,6 @@
 // This is an in-memory implementation to be used with testing and prototyping only
 
-import { DatabaseDriver, DatabaseOption, Index } from 'saml-jackson';
+import { DatabaseDriver, DatabaseOption, Index, Encrypted } from 'saml-jackson';
 import * as dbutils from './utils';
 
 class Mem implements DatabaseDriver {
@@ -65,7 +65,7 @@ class Mem implements DatabaseDriver {
   async put(
     namespace: string,
     key: string,
-    val: string,
+    val: Encrypted,
     ttl: number = 0,
     ...indexes: any[]
   ): Promise<any> {

package/src/db/mongo.ts

@@ -1,9 +1,9 @@
 import { MongoClient } from 'mongodb';
-import { DatabaseDriver, DatabaseOption, Index } from 'saml-jackson';
+import { DatabaseDriver, DatabaseOption, Encrypted, Index } from 'saml-jackson';
 import * as dbutils from './utils';
 
 type Document = {
-  value: string;
+  value: Encrypted;
   expiresAt: Date;
   indexes: string[];
 };
@@ -64,7 +64,7 @@ class Mongo implements DatabaseDriver {
   async put(
     namespace: string,
     key: string,
-    val: string,
+    val: Encrypted,
     ttl: number = 0,
     ...indexes: any[]
   ): Promise<void> {

package/src/db/redis.ts

@@ -1,5 +1,5 @@
 import * as redis from 'redis';
-import { DatabaseDriver, DatabaseOption, Index } from 'saml-jackson';
+import { DatabaseDriver, DatabaseOption, Encrypted, Index } from 'saml-jackson';
 import * as dbutils from './utils';
 
 class Redis implements DatabaseDriver {
@@ -54,7 +54,7 @@ class Redis implements DatabaseDriver {
   async put(
     namespace: string,
     key: string,
-    val: string,
+    val: Encrypted,
     ttl: number = 0,
     ...indexes: any[]
   ): Promise<void> {

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

@@ -1,8 +1,8 @@
 export class JacksonStore {
   constructor(
     public key: string,
-    public value: any,
-    public iv: any,
-    public tag: any
+    public value: string,
+    public iv?: string,
+    public tag?: string
   ) {}
 }

package/src/db/sql/sql.ts

@@ -2,7 +2,7 @@
 
 require('reflect-metadata');
 
-import { DatabaseDriver, DatabaseOption, Index } from 'saml-jackson';
+import { DatabaseDriver, DatabaseOption, Index, Encrypted } from 'saml-jackson';
 import { Connection, createConnection } from 'typeorm';
 import * as dbutils from '../utils';
 import { JacksonIndex } from './model/JacksonIndex';
@@ -29,8 +29,6 @@ class Sql implements DatabaseDriver {
   async init(): Promise<Sql> {
     while (true) {
       try {
-        // TODO: Fix it
-        // @ts-ignore
         this.connection = await createConnection({
           name: this.options.type + Math.floor(Math.random() * 100000),
           type: this.options.type,
@@ -116,11 +114,10 @@ class Sql implements DatabaseDriver {
       key: dbutils.keyForIndex(namespace, idx),
     });
 
-    const ret: string[] = [];
+    const ret: Encrypted[] = [];
 
     if (res) {
       res.forEach((r) => {
-        // @ts-ignore
         ret.push({
           value: r.store.value,
           iv: r.store.iv,
@@ -135,14 +132,13 @@ class Sql implements DatabaseDriver {
   async put(
     namespace: string,
     key: string,
-    val: string,
+    val: Encrypted,
     ttl: number = 0,
     ...indexes: any[]
   ): Promise<void> {
     await this.connection.transaction(async (transactionalEntityManager) => {
       const dbKey = dbutils.key(namespace, key);
 
-      // @ts-ignore
       const store = new JacksonStore(dbKey, val.value, val.iv, val.tag);
 
       await transactionalEntityManager.save(store);

package/src/test/api.test.ts

@@ -16,8 +16,7 @@ const OPTIONS = {
   samlAudience: 'https://saml.boxyhq.com',
   samlPath: '/sso/oauth/saml',
   db: {
-    engine: 'mongo',
-    url: 'mongodb://localhost:27017/jackson-demo',
+    engine: 'mem',
   } as DatabaseOption,
 };
 

package/src/typings.ts

@@ -118,8 +118,8 @@ declare module 'saml-jackson' {
   }
 
   export interface Encrypted {
-    iv: string;
-    tag: string;
+    iv?: string;
+    tag?: string;
     value: string;
   }