Updated npm packages. Tested w Meteor 1.4

This commit is contained in:
Steffo Weber 2017-04-12 11:37:21 +02:00
parent c6cde9c701
commit 2dccfc7f3a
5 changed files with 279 additions and 122 deletions

View file

@ -1,102 +1,235 @@
{ {
"dependencies": { "dependencies": {
"async": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/async/-/async-2.3.0.tgz",
"from": "async@2.3.0"
},
"body-parser": {
"version": "1.17.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz",
"from": "body-parser@1.17.1"
},
"bytes": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz",
"from": "bytes@2.4.0"
},
"connect": { "connect": {
"version": "2.7.10", "version": "3.6.0",
"dependencies": { "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz",
"qs": { "from": "connect@3.6.0"
"version": "0.6.5" },
}, "content-type": {
"formidable": { "version": "1.0.2",
"version": "1.0.14" "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
}, "from": "content-type@>=1.0.2 <1.1.0"
"cookie-signature": { },
"version": "1.0.1" "debug": {
}, "version": "2.6.1",
"buffer-crc32": { "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz",
"version": "0.2.1" "from": "debug@2.6.1"
}, },
"cookie": { "depd": {
"version": "0.0.5" "version": "1.1.0",
}, "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
"send": { "from": "depd@>=1.1.0 <1.2.0"
"version": "0.1.0", },
"dependencies": { "ee-first": {
"mime": { "version": "1.1.1",
"version": "1.2.6" "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
}, "from": "ee-first@1.1.1"
"range-parser": { },
"version": "0.0.4" "ejs": {
} "version": "2.5.6",
} "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.6.tgz",
}, "from": "ejs@2.5.6"
"bytes": { },
"version": "0.2.0" "encodeurl": {
}, "version": "1.0.1",
"fresh": { "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
"version": "0.1.0" "from": "encodeurl@>=1.0.1 <1.1.0"
}, },
"pause": { "escape-html": {
"version": "0.0.1" "version": "1.0.3",
}, "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
"debug": { "from": "escape-html@>=1.0.3 <1.1.0"
"version": "2.2.0", },
"dependencies": { "finalhandler": {
"ms": { "version": "1.0.0",
"version": "0.7.1" "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz",
} "from": "finalhandler@1.0.0"
} },
} "http-errors": {
} "version": "1.6.1",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
"from": "http-errors@>=1.6.1 <1.7.0"
},
"iconv-lite": {
"version": "0.4.15",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
"from": "iconv-lite@0.4.15"
},
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"from": "inherits@2.0.3"
},
"lodash": {
"version": "4.17.4",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
"from": "lodash@4.17.4"
},
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"from": "media-typer@0.3.0"
},
"mime-db": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
"from": "mime-db@>=1.27.0 <1.28.0"
},
"mime-types": {
"version": "2.1.15",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
"from": "mime-types@>=2.1.15 <2.2.0"
},
"ms": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"from": "ms@0.7.2"
},
"node-forge": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz",
"from": "node-forge@0.7.1"
},
"on-finished": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
"from": "on-finished@>=2.3.0 <2.4.0"
},
"parseurl": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
"from": "parseurl@>=1.3.1 <1.4.0"
},
"qs": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
"from": "qs@6.4.0"
}, },
"querystring": { "querystring": {
"version": "0.2.0" "version": "0.2.0",
"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
"from": "querystring@0.2.0"
},
"raw-body": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz",
"from": "raw-body@>=2.2.0 <2.3.0"
},
"sax": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz",
"from": "sax@1.2.2"
},
"setprototypeof": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
"from": "setprototypeof@1.0.3"
},
"statuses": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
"from": "statuses@>=1.3.1 <2.0.0"
},
"type-is": {
"version": "1.6.15",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
"from": "type-is@>=1.6.14 <1.7.0"
},
"unpipe": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
"from": "unpipe@1.0.0"
},
"utils-merge": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
"from": "utils-merge@1.0.0"
}, },
"xml-crypto": { "xml-crypto": {
"version": "0.6.0", "version": "0.9.0",
"resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.9.0.tgz",
"from": "xml-crypto@0.9.0",
"dependencies": { "dependencies": {
"xmldom": { "xmldom": {
"version": "0.1.19" "version": "0.1.19",
}, "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz",
"xpath.js": { "from": "xmldom@0.1.19"
"version": "1.0.6"
} }
} }
}, },
"xml-encryption": { "xml-encryption": {
"version": "0.7.2", "version": "0.10.0",
"resolved": "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.10.0.tgz",
"from": "xml-encryption@0.10.0",
"dependencies": { "dependencies": {
"ejs": {
"version": "0.8.8"
},
"async": { "async": {
"version": "0.2.10" "version": "0.2.10",
"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
"from": "async@>=0.2.7 <0.3.0"
}, },
"xpath": { "ejs": {
"version": "0.0.5" "version": "0.8.8",
"resolved": "https://registry.npmjs.org/ejs/-/ejs-0.8.8.tgz",
"from": "ejs@>=0.8.3 <0.9.0"
}, },
"node-forge": { "node-forge": {
"version": "0.2.24" "version": "0.6.38",
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.38.tgz",
"from": "node-forge@0.6.38"
},
"xpath": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.5.tgz",
"from": "xpath@0.0.5"
} }
} }
}, },
"xml2js": { "xml2js": {
"version": "0.2.0", "version": "0.4.17",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
"from": "xml2js@0.4.17",
"dependencies": { "dependencies": {
"sax": { "xmlbuilder": {
"version": "1.1.1" "version": "4.2.1",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
"from": "xmlbuilder@>=4.1.0 <5.0.0"
} }
} }
}, },
"xmlbuilder": { "xmlbuilder": {
"version": "2.6.4", "version": "8.2.2",
"dependencies": { "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
"lodash": { "from": "xmlbuilder@8.2.2"
"version": "3.10.0"
}
}
}, },
"xmldom": { "xmldom": {
"version": "0.1.19" "version": "0.1.27",
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
"from": "xmldom@0.1.27"
},
"xpath": {
"version": "0.0.24",
"resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.24.tgz",
"from": "xpath@0.0.24"
},
"xpath.js": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz",
"from": "xpath.js@1.0.7"
} }
} }
} }

View file

@ -1,41 +1,54 @@
accounts-base@1.2.0 accounts-base@1.2.16
base64@1.0.3 allow-deny@1.0.5
binary-heap@1.0.3 babel-compiler@6.18.1
blaze@2.1.2 babel-runtime@1.0.1
blaze-tools@1.0.3 base64@1.0.10
boilerplate-generator@1.0.3 binary-heap@1.0.10
callback-hook@1.0.3 blaze@2.3.2
check@1.0.5 blaze-tools@1.0.9
ddp@1.1.0 boilerplate-generator@1.0.11
deps@1.0.7 callback-hook@1.0.10
ejson@1.0.6 check@1.2.5
geojson-utils@1.0.3 ddp@1.2.5
html-tools@1.0.4 ddp-client@1.3.4
htmljs@1.0.4 ddp-common@1.2.8
http@1.1.0 ddp-rate-limiter@1.0.7
id-map@1.0.3 ddp-server@1.3.14
jquery@1.11.3_2 deps@1.0.12
json@1.0.3 diff-sequence@1.0.7
localstorage@1.0.3 ecmascript@0.7.2
logging@1.0.7 ecmascript-runtime@0.3.15
meteor@1.1.6 ejson@1.0.13
minifiers@1.1.5 geojson-utils@1.0.10
minimongo@1.0.8 html-tools@1.0.10
mongo@1.1.0 htmljs@1.0.11
observe-sequence@1.0.6 http@1.2.12
ordered-dict@1.0.3 id-map@1.0.9
random@1.0.3 jquery@1.11.10
reactive-var@1.0.5 localstorage@1.0.12
retry@1.0.3 logging@1.1.17
routepolicy@1.0.5 meteor@1.6.1
service-configuration@1.0.4 minimongo@1.0.21
spacebars@1.0.6 modules@0.8.1
spacebars-compiler@1.0.6 modules-runtime@0.7.10
steffo:meteor-accounts-saml@0.0.1 mongo@1.1.16
templating@1.1.1 mongo-id@1.0.6
tracker@1.0.7 npm-mongo@2.2.24
ui@1.0.6 observe-sequence@1.0.16
underscore@1.0.3 ordered-dict@1.0.9
url@1.0.4 promise@0.8.8
webapp@1.2.0 random@1.0.10
webapp-hashing@1.0.3 rate-limit@1.0.8
reactive-var@1.0.11
retry@1.0.9
routepolicy@1.0.12
service-configuration@1.0.11
spacebars@1.0.12
spacebars-compiler@1.0.12
steffo:meteor-accounts-saml@0.0.2
tracker@1.1.2
ui@1.0.11
underscore@1.0.10
url@1.1.0
webapp@1.3.15
webapp-hashing@1.0.9

View file

@ -1,25 +1,33 @@
Package.describe({ Package.describe({
name:"steffo:meteor-accounts-saml", name:"steffo:meteor-accounts-saml",
summary: "SAML Login (SP) for Meteor. Works with OpenAM, OpenIDP and provides Single Logout.", summary: "SAML Login (SP) for Meteor. Works with OpenAM, OpenIDP and provides Single Logout.",
version: "0.0.1", version: "0.0.2",
git: "https://github.com/steffow/meteor-accounts-saml.git" git: "https://github.com/steffow/meteor-accounts-saml.git"
}); });
Package.on_use(function (api) { Package.on_use(function (api) {
api.versionsFrom('1.1.0.2'); api.versionsFrom('1.1.0.2');
api.use(['routepolicy','webapp','underscore', 'service-configuration'], 'server'); api.use(['routepolicy','webapp','underscore', 'service-configuration'], 'server');
api.use(['http','accounts-base'], ['client', 'server']); api.use(['http','accounts-base','random'], ['client', 'server']);
api.add_files(['saml_server.js','saml_utils.js'], 'server'); api.add_files(['saml_server.js','saml_utils.js'], 'server');
api.add_files('saml_client.js', 'client'); api.add_files('saml_client.js', 'client');
}); });
Npm.depends({ Npm.depends({
"xml2js": "0.2.0", "xml2js": "0.4.17",
"xml-crypto": "0.6.0", "body-parser": "1.17.1",
"xmldom": "0.1.19", "sax": "1.2.2",
"connect": "2.7.10", "xmlbuilder": "8.2.2",
"xmlbuilder": "2.6.4", "ejs": "2.5.6",
"async": "2.3.0",
"lodash":"4.17.4",
"xpath": "0.0.24",
"node-forge": "0.7.1",
"xpath.js": "1.0.7",
"xmldom": "0.1.27",
"connect": "3.6.0",
"querystring": "0.2.0", "querystring": "0.2.0",
"xml-encryption": "0.7.2" "xml-encryption": "0.10.0",
"xml-crypto": "0.9.0"
}); });

View file

@ -1,3 +1,5 @@
//import { Random } from 'meteor/random';
if (!Accounts.saml) { if (!Accounts.saml) {
Accounts.saml = {}; Accounts.saml = {};
} }

View file

@ -3,7 +3,8 @@ if (!Accounts.saml) {
} }
var Fiber = Npm.require('fibers'); var Fiber = Npm.require('fibers');
var connect = Npm.require('connect'); //var connect = Npm.require('connect');
var bodyParser = Npm.require('body-parser')
RoutePolicy.declare('/_saml/', 'network'); RoutePolicy.declare('/_saml/', 'network');
Meteor.methods({ Meteor.methods({
@ -132,7 +133,7 @@ Accounts.saml.retrieveCredential = function (credentialToken) {
// Listen to incoming SAML http requests // Listen to incoming SAML http requests
WebApp.connectHandlers.use(connect.bodyParser()).use(function (req, res, next) { WebApp.connectHandlers.use(bodyParser.urlencoded({ extended: true })).use(function (req, res, next) {
// Need to create a Fiber since we're using synchronous http calls and nothing // Need to create a Fiber since we're using synchronous http calls and nothing
// else is wrapping this in a fiber automatically // else is wrapping this in a fiber automatically
Fiber(function () { Fiber(function () {