autohost - npm Package Compare versions

Comparing version 0.3.0-12 to 0.3.0-13

CHANGELOG.md

 ## 0.3.0
 Primary motivation here is to begin work on a version of autohost that will work well with a hypermedia library ( [hyped](https://github.com/leankit-labs/hyped) ). This is a breaking change because of several structural and naming changes to how resources get modeled.
 
+### prerelease 13
+Bug fixes. Bug fixes everywhere:
+ * Middleware wasn't correctly supporting 'eager' route definition
+ * Shifted Passport creation closer to actual usage
+ * Put missing demo dependencies into package file
+
 ### prerelease 12
@@ -5,0 +11,0 @@ * Do not set defaults on AutoHost's request instance

package.json

 {
   "name": "autohost",
-  "version": "0.3.0-12",
+  "version": "0.3.0-13",
   "description": "Resource driven, transport agnostic host",
@@ -30,2 +30,3 @@ "main": "src/index.js",
     "autohost-riak-auth": "~0.1.0",
+    "connect-redis": "^2.1.0",
     "gulp": "^3.8.6",
@@ -38,2 +39,3 @@ "gulp-mocha": "^0.5.2",
     "processhost": "^0.1.13",
+    "redis": "^0.12.1",
     "should": "^4.0.4",
@@ -56,6 +58,8 @@ "socket.io-client": "^1.0.6"
   "author": "Alex Robson",
-  "contributors": [ {
-    "name": "Josh Bush",
-    "url": "http://digitalbush.com"
-  } ],
+  "contributors": [
+    {
+      "name": "Josh Bush",
+      "url": "http://digitalbush.com"
+    }
+  ],
   "license": "MIT License - http://opensource.org/licenses/MIT",
@@ -62,0 +66,0 @@ "bugs": {

spec/http.adapter.spec.js

@@ -11,3 +11,4 @@ var should = require( 'should' );  //jshint ignore:line
 var passport = require( '../src/http/passport.js' )( config, authProvider, metrics );
-var middleware = require( '../src/http/middleware.js' )( config, metrics );
+var middleware = require( '../src/http/middleware.js' )( metrics );
+middleware.configure( config );
 var http = require( '../src/http/http.js' )( requestor, middleware, metrics );
@@ -14,0 +15,0 @@ var httpAdapter = require( '../src/http/adapter.js' )( config, authProvider, http, requestor, metrics );

spec/http.spec.js

@@ -33,3 +33,4 @@ var should = require( 'should' ); //jshint ignore:line
 		passport = require( '../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../src/http/http.js' )( requestor, middleware, metrics );
@@ -208,3 +209,4 @@
 		};
-		middleware = require( '../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../src/http/http.js' )(requestor, middleware, metrics );
@@ -211,0 +213,0 @@ http.middleware( '/thing', function( req, res, next ) {

spec/prefixed.http.spec.js

@@ -31,3 +31,4 @@ var should = require( 'should' ); //jshint ignore:line
 		passport = require( '../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../src/http/http.js' )( requestor, middleware, metrics );
@@ -34,0 +35,0 @@

spec/socketio/invalid-auth.spec.js

@@ -22,3 +22,4 @@ var should = require( 'should' ); //jshint ignore: line
 		passport = require( '../../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../../src/http/http.js' )( requestor, middleware, metrics );
@@ -25,0 +26,0 @@ socket = require( '../../src/websocket/socket.js' )( config, http, middleware );

spec/socketio/noauth.spec.js

@@ -21,3 +21,4 @@ var should = require( 'should' );
 	before( function( done ) {
-		middleware = require( '../../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../../src/http/http.js' )( requestor, middleware, metrics );
@@ -24,0 +25,0 @@ socket = require( '../../src/websocket/socket.js' )( config, http );

spec/socketio/skipped-auth.spec.js

@@ -23,3 +23,4 @@ var should = require( 'should' );
 		passport = require( '../../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../../src/http/http.js' )( requestor, middleware, metrics );
@@ -26,0 +27,0 @@ socket = require( '../../src/websocket/socket.js' )( config, http );

spec/websocket/authenticated.spec.js

@@ -22,3 +22,4 @@ var should = require( 'should' ); //jshint ignore:line
 		passport = require( '../../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../../src/http/http.js' )( requestor, middleware, metrics );
@@ -25,0 +26,0 @@ socket = require( '../../src/websocket/socket.js' )( config, http, middleware );

spec/websocket/invalid-auth.spec.js

@@ -21,3 +21,4 @@ var should = require( 'should' ); //jshint ignore:line
 		passport = require( '../../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../../src/http/http.js' )( requestor, middleware, metrics );
@@ -24,0 +25,0 @@ socket = require( '../../src/websocket/socket.js' )( config, http, middleware );

spec/websocket/noauth.spec.js

@@ -20,3 +20,4 @@ var should = require( 'should' ); //jshint ignore:line
 	before( function( done ) {
-		middleware = require( '../../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../../src/http/http.js' )( requestor, middleware, metrics );
@@ -23,0 +24,0 @@ socket = require( '../../src/websocket/socket.js' )( config, http );

spec/ws.adapter.spec.js

@@ -37,3 +37,4 @@ var should = require( 'should' ); //jshint ignore:line
 		passport = require( '../src/http/passport.js' )( config, authProvider, metrics );
-		middleware = require( '../src/http/middleware.js' )( config, metrics );
+		middleware = require( '../src/http/middleware.js' )( metrics );
+		middleware.configure( config );
 		http = require( '../src/http/http.js' )( requestor, middleware, metrics );
@@ -40,0 +41,0 @@ socket = require( '../src/websocket/socket.js' )( config, http, middleware );

src/api.js

@@ -203,6 +203,6 @@ // TODO: this module needs a lot of clean up :(
 					.then( function() {
-						startAdapters();
+						startAdapters( auth );
 					} );
 			} else {
-				startAdapters();
+				startAdapters( auth );
 			}
@@ -219,5 +219,5 @@ return meta || {};
 
-function startAdapters() { //jshint ignore:line
+function startAdapters( auth ) { //jshint ignore:line
 	_.each( adapters, function( adapter ) {
-		adapter.start();
+		adapter.start( config, auth );
 	} );
@@ -224,0 +224,0 @@ }

src/http/adapter.js

@@ -5,2 +5,3 @@ var path = require( 'path' );
 var debug = require( 'debug' )( 'autohost:http-adapter' );
+var passportFn = require( './passport.js' );
 var HttpEnvelope;
@@ -11,4 +12,6 @@ var http;
 var authStrategy;
+var passport;
 
 var wrapper = {
+	name: 'http',
 	action: wireupAction,
@@ -72,3 +75,3 @@ resource: wireupResource,
 function start() {
-	http.start( config, authStrategy );
+	http.start( config, passport );
 }
@@ -126,2 +129,3 @@
 	authStrategy = auth;
+	passport = passportFn( cfg, auth, meter );
 	http = httpLib;
@@ -128,0 +132,0 @@ metrics = meter;

src/http/middleware.js

@@ -7,2 +7,3 @@ var bodyParser = require( 'body-parser' );
 		attach: applyMiddelware,
+		configure: configure,
 		useCookies: applyCookieMiddleware,
@@ -60,2 +61,14 @@ useSession: applySessionMiddleware
 
+function configure( cfg ) {
+	config = cfg;
+	cfg.sessionStore = cfg.sessionStore || new sessionLib.MemoryStore();
+	session = sessionLib( { 
+		name: config.sessionId || 'ah.sid',
+		secret: config.sessionSecret || 'authostthing',
+		saveUninitialized: true,
+		resave: true,
+		store: cfg.sessionStore
+	} );
+}
+
 function requestMetrics( req, res, next ) { // jshint ignore: line
@@ -72,14 +85,5 @@ req.context = {};
 
-module.exports = function( cfg, meter ) {
-	config = cfg;
+module.exports = function( meter ) {
 	metrics = meter;
 	cookieParser = cookies();
-	cfg.sessionStore = cfg.sessionStore || new sessionLib.MemoryStore();
-	session = sessionLib( { 
-		name: config.sessionId || 'ah.sid',
-		secret: config.sessionSecret || 'authostthing',
-		saveUninitialized: true,
-		resave: true,
-		store: cfg.sessionStore
-	} );
 	return wrapper;
@@ -86,0 +90,0 @@ };

src/index.js

@@ -5,3 +5,2 @@ var path = require( 'path' );
 var when = require( 'when' );
-var passportFn = require( './http/passport.js' );
 var httpFn = require( './http/http.js' );
@@ -11,8 +10,9 @@ var httpAdapterFn = require( './http/adapter.js' );
 var socketAdapterFn = require( './websocket/adapter.js' );
-var middlewareLib = require( '../src/http/middleware.js' );
+var middlewareLib = require( './http/middleware.js' );
 var postal = require( 'postal' );
 var eventChannel = postal.channel( 'events' );
 var internalFount = require( 'fount' );
-var passport, httpAdapter, socketAdapter, middleware;
+var httpAdapter, socketAdapter;
 var initialized, api;
+var middleware = middlewareLib( metrics );
 var wrapper = {
@@ -42,3 +42,3 @@ actions: undefined,
 		wrapper.stop = api.stop;
-		middleware = middlewareLib( cfg, metrics );
+		middleware.configure( cfg );
 		if( when.isPromiseLike( authProvider ) ) {
@@ -65,6 +65,2 @@ return authProvider
 
-	if( authProvider ) {
-		passport = passportFn( config, authProvider, metrics );
-	}
-
 	httpAdapter = httpAdapterFn( config, authProvider, wrapper.http, request, metrics );
@@ -71,0 +67,0 @@ api.addAdapter( httpAdapter );

src/websocket/adapter.js

@@ -1,10 +0,10 @@
-var config,
-	authStrategy,
-	socket,
-	metrics,
-	SocketEnvelope;
-
+var config;
+var authStrategy;
+var socket;
+var metrics;
+var SocketEnvelope;
 var _ = require( 'lodash' );
 var debug = require( 'debug' )( 'autohost:websocket-adapter' );
 var wrapper = {
+	name: 'http',
 	action: wireupAction,
@@ -11,0 +11,0 @@ resource: wireupResource,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

3556

increased by0.45%

Worsened metrics

Total package byte prevSize

161269

decreased by-1.29%

Dev dependency count

13

increased by18.18%

No dependency changes