feat(monorepo): move to monorepo structure, see #373

node-saml · Jan 28, 2020 · 84f9601 · 84f9601
1 parent 1869d27
commit 84f9601
Show file tree

Hide file tree

Showing 31 changed files with 4,555 additions and 367 deletions.
diff --git a/lerna.json b/lerna.json
@@ -0,0 +1,8 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "1.1.0",
+  "npmClient": "yarn",
+  "useWorkspaces": true
+}
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "type": "git",
     "url": "https://github.com/bergie/passport-saml.git"
   },
-  "main": "./lib/passport-saml",
+  "main": "packages/passport/lib/passport-saml",
   "dependencies": {
     "debug": "^3.1.0",
     "passport-strategy": "*",
@@ -40,19 +40,21 @@
     "body-parser": "^1.17.1",
     "eslint": "^6.5.1",
     "express": "^4.16.2",
+    "lerna": "^3.16.4",
     "mocha": "^6.0.2",
     "passport": "0.4.x",
     "request": "^2.83.0",
     "should": "*",
     "sinon": "^7.2.7"
   },
+  "private": "true",
   "engines": {
     "node": ">= 8"
   },
   "scripts": {
-    "test": "npm run lint && mocha",
-    "lint": "./node_modules/.bin/eslint lib",
-    "lint:fix": "./node_modules/.bin/eslint --fix lib"
+    "test": "yarn workspace passport-saml test",
+    "lint": "yarn workspace passport-saml npx eslint lib",
+    "lint:fix": "yarn workspace passport-saml eslint --fix lib"
   },
   "eslintConfig": {
     "env": {
@@ -71,5 +73,10 @@
         "always"
       ]
     }
+  },
+  "workspaces": {
+    "packages": [
+      "packages/*"
+    ]
   }
 }
diff --git a/lib/passport-saml/index.js → packages/passport/lib/passport-saml/index.js b/lib/passport-saml/index.js → packages/passport/lib/passport-saml/index.js
diff --git a/lib/passport-saml/inmemory-cache-provider.js → .../passport-saml/inmemory-cache-provider.js b/lib/passport-saml/inmemory-cache-provider.js → .../passport-saml/inmemory-cache-provider.js
diff --git a/lib/passport-saml/saml.js → packages/passport/lib/passport-saml/saml.js b/lib/passport-saml/saml.js → packages/passport/lib/passport-saml/saml.js
diff --git a/lib/passport-saml/strategy.js → ...es/passport/lib/passport-saml/strategy.js b/lib/passport-saml/strategy.js → ...es/passport/lib/passport-saml/strategy.js
diff --git a/multiSamlStrategy.js → packages/passport/multiSamlStrategy.js b/multiSamlStrategy.js → packages/passport/multiSamlStrategy.js
diff --git a/packages/passport/package.json b/packages/passport/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "passport-saml",
+  "version": "1.1.0",
+  "license": "MIT",
+  "keywords": [
+    "saml",
+    "adfs",
+    "sso",
+    "shibboleth"
+  ],
+  "description": "SAML 2.0 authentication strategy for Passport",
+  "author": {
+    "name": "Henri Bergius",
+    "email": "henri.bergius@iki.fi",
+    "url": "http://bergie.iki.fi"
+  },
+  "contributors": [
+    "Michael Bosworth",
+    "Herbert Vojčík",
+    "Peter Loer",
+    "Mark Stosberg",
+    "Chris Barth"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bergie/passport-saml.git"
+  },
+  "main": "./lib/passport-saml",
+  "dependencies": {
+    "debug": "^3.1.0",
+    "passport-strategy": "*",
+    "q": "^1.5.0",
+    "xml-crypto": "^1.1.4",
+    "xml-encryption": "^0.11.0",
+    "xml2js": "0.4.x",
+    "xmlbuilder": "^11.0.0",
+    "xmldom": "0.1.x"
+  },
+  "devDependencies": {
+    "body-parser": "^1.17.1",
+    "express": "^4.16.2",
+    "jshint": "^2.10.1",
+    "mocha": "^6.0.2",
+    "passport": "0.4.x",
+    "request": "^2.83.0",
+    "should": "*",
+    "sinon": "^7.2.7"
+  },
+  "engines": {
+    "node": ">= 6"
+  },
+  "scripts": {
+    "test": "mocha",
+    "jshint": "./node_modules/.bin/jshint lib"
+  }
+}
diff --git a/test/mocha.opts → packages/passport/test/mocha.opts b/test/mocha.opts → packages/passport/test/mocha.opts
diff --git a/test/multiSamlStrategy.js → packages/passport/test/multiSamlStrategy.js b/test/multiSamlStrategy.js → packages/passport/test/multiSamlStrategy.js
@@ -2,7 +2,7 @@
 
 var sinon = require('sinon');
 var should = require( 'should' );
-var SamlStrategy = require( '../lib/passport-saml/index.js' ).Strategy;
+var SamlStrategy = require( '../lib/passport-saml' ).Strategy;
 var MultiSamlStrategy = require( '../multiSamlStrategy' );
 
 function verify () {}

diff --git a/test/samlTests.js → packages/passport/test/samlTests.js b/test/samlTests.js → packages/passport/test/samlTests.js
diff --git a/test/static/acme_tools_com.cert → .../passport/test/static/acme_tools_com.cert b/test/static/acme_tools_com.cert → .../passport/test/static/acme_tools_com.cert
diff --git a/test/static/acme_tools_com.key → ...s/passport/test/static/acme_tools_com.key b/test/static/acme_tools_com.key → ...s/passport/test/static/acme_tools_com.key
diff --git a/test/static/acme_tools_com.xml → ...s/passport/test/static/acme_tools_com.xml b/test/static/acme_tools_com.xml → ...s/passport/test/static/acme_tools_com.xml
diff --git a/test/static/cert.pem → packages/passport/test/static/cert.pem b/test/static/cert.pem → packages/passport/test/static/cert.pem
diff --git a/.../static/expected metadata without key.xml → .../static/expected metadata without key.xml b/.../static/expected metadata without key.xml → .../static/expected metadata without key.xml
diff --git a/test/static/expected metadata.xml → ...assport/test/static/expected metadata.xml b/test/static/expected metadata.xml → ...assport/test/static/expected metadata.xml
diff --git a/test/static/expectedMetadataWithBothKeys.xml → ...t/static/expectedMetadataWithBothKeys.xml b/test/static/expectedMetadataWithBothKeys.xml → ...t/static/expectedMetadataWithBothKeys.xml
diff --git a/test/static/idp_slo_redirect.json → ...assport/test/static/idp_slo_redirect.json b/test/static/idp_slo_redirect.json → ...assport/test/static/idp_slo_redirect.json
diff --git a/test/static/key.pem → packages/passport/test/static/key.pem b/test/static/key.pem → packages/passport/test/static/key.pem
diff --git a/...tic/logout_request_with_bad_signature.xml → ...tic/logout_request_with_bad_signature.xml b/...tic/logout_request_with_bad_signature.xml → ...tic/logout_request_with_bad_signature.xml
diff --git a/...ic/logout_request_with_good_signature.xml → ...ic/logout_request_with_good_signature.xml b/...ic/logout_request_with_good_signature.xml → ...ic/logout_request_with_good_signature.xml
diff --git a/...tic/logout_request_with_session_index.xml → ...tic/logout_request_with_session_index.xml b/...tic/logout_request_with_session_index.xml → ...tic/logout_request_with_session_index.xml
diff --git a/...ic/response-with-uncomplete-attribute.xml → ...ic/response-with-uncomplete-attribute.xml b/...ic/response-with-uncomplete-attribute.xml → ...ic/response-with-uncomplete-attribute.xml
diff --git a/test/static/sp_slo_redirect.json → ...passport/test/static/sp_slo_redirect.json b/test/static/sp_slo_redirect.json → ...passport/test/static/sp_slo_redirect.json
diff --git a/test/static/sp_slo_redirect_failure.json → .../test/static/sp_slo_redirect_failure.json b/test/static/sp_slo_redirect_failure.json → .../test/static/sp_slo_redirect_failure.json
diff --git a/test/static/testshib encrypted response.xml → ...st/static/testshib encrypted response.xml b/test/static/testshib encrypted response.xml → ...st/static/testshib encrypted response.xml
diff --git a/test/static/testshib encryption cert.pem → .../test/static/testshib encryption cert.pem b/test/static/testshib encryption cert.pem → .../test/static/testshib encryption cert.pem
diff --git a/test/static/testshib encryption pvk.pem → ...t/test/static/testshib encryption pvk.pem b/test/static/testshib encryption pvk.pem → ...t/test/static/testshib encryption pvk.pem
diff --git a/test/tests.js → packages/passport/test/tests.js b/test/tests.js → packages/passport/test/tests.js
@@ -2,13 +2,13 @@
 var express      = require( 'express' );
 var bodyParser   = require( 'body-parser' );
 var passport     = require( 'passport' );
-var SamlStrategy = require( '../lib/passport-saml/index.js' ).Strategy;
+var SamlStrategy = require( '../lib/passport-saml' ).Strategy;
 var request      = require( 'request' );
 var should       = require( 'should' );
 var zlib         = require( 'zlib' );
 var querystring  = require( 'querystring' );
 var parseString  = require( 'xml2js' ).parseString;
-var SAML         = require( '../lib/passport-saml/index.js' ).SAML;
+var SAML         = require( '../lib/passport-saml' ).SAML;
 var fs           = require( 'fs' );
 var sinon        = require('sinon');