Add option to expose full txn across immediate boundary.

lib/middleware/authorization.js

@@ -215,8 +215,10 @@ module.exports = function(server, options, validate, immediate, complete) {
           immediate(req.oauth2.client, req.oauth2.user, req.oauth2.req.scope, req.oauth2.req.type, immediated);
         } else if (arity == 4) {
           immediate(req.oauth2.client, req.oauth2.user, req.oauth2.req.scope, immediated);
-        } else { // arity == 3
+        } else if (arity == 3) {
           immediate(req.oauth2.client, req.oauth2.user, immediated);
+        } else { // arity == 2
+          immediate(req.oauth2, immediated);
         }
       }
 

lib/middleware/resume.js

@@ -98,8 +98,10 @@ module.exports = function(server, options, immediate, complete) {
         immediate(req.oauth2.client, req.oauth2.user, req.oauth2.req.scope, req.oauth2.req.type, immediated);
       } else if (arity == 4) {
         immediate(req.oauth2.client, req.oauth2.user, req.oauth2.req.scope, immediated);
-      } else { // arity == 3
+      } else if (arity == 3) {
         immediate(req.oauth2.client, req.oauth2.user, immediated);
+      } else { // arity == 2
+        immediate(req.oauth2, immediated);
       }
     } catch (ex) {
       return next(ex);

test/middleware/authorization.immediate.test.js

@@ -477,6 +477,64 @@ describe('authorization', function() {
         expect(request.session['authorize']).to.be.undefined;
       });
     });
+
+    describe('based on complete transaction', function() {
+      var immediate, request, response, err;
+
+      before(function() {
+        immediate = function(txn, done) {
+          if (txn.client.id !== '1234') { return done(new Error('incorrect client argument')); }
+          if (txn.user.id !== 'u123') { return done(new Error('incorrect user argument')); }
+          if (txn.req.scope !== 'profile') { return done(new Error('incorrect scope argument')); }
+          if (txn.req.type !== 'code') { return done(new Error('incorrect type argument')); }
+          if (txn.req.audience !== 'https://api.example.com/') { return done(new Error('incorrect areq argument')); }
+          if (txn.locals.ip !== '123.45.67.890') { return done(new Error('incorrect locals argument')); }
+
+          return done(null, true, { scope: 'read' }, { beep: 'boop' });
+        };
+      });
+
+      before(function(done) {
+        chai.connect.use('express', authorization(server, validate, immediate))
+          .req(function(req) {
+            request = req;
+            req.query = { response_type: 'code', client_id: '1234', redirect_uri: 'http://example.com/auth/callback', scope: 'profile', audience: 'https://api.example.com/' };
+            req.session = {};
+            req.user = { id: 'u123' };
+            req.locals = { ip: '123.45.67.890' };
+          })
+          .end(function(res) {
+            response = res;
+            done();
+          })
+          .dispatch();
+      });
+
+      it('should not error', function() {
+        expect(err).to.be.undefined;
+      });
+
+      it('should respond', function() {
+        expect(response.getHeader('Location')).to.equal('http://example.com/auth/callback');
+      });
+
+      it('should add transaction', function() {
+        expect(request.oauth2).to.be.an('object');
+        expect(request.oauth2.res).to.be.an('object');
+        expect(request.oauth2.res.allow).to.equal(true);
+        expect(request.oauth2.res.scope).to.equal('read');
+        expect(request.oauth2.info).to.be.undefined;
+        expect(request.oauth2.locals).to.be.an('object');
+        expect(Object.keys(request.oauth2.locals)).to.have.length(2);
+        expect(request.oauth2.locals.ip).to.equal('123.45.67.890');
+        expect(request.oauth2.locals.beep).to.equal('boop');
+      });
+
+      it('should not store transaction in session', function() {
+        expect(Object.keys(request.session).length).to.equal(0);
+        expect(request.session['authorize']).to.be.undefined;
+      });
+    });
 
     describe('encountering an error', function() {
       var immediate, request, err;

test/middleware/resume.test.js

@@ -724,6 +724,76 @@ describe('resume', function() {
         expect(request.session['authorize']['abc123']).to.be.undefined;
       });
     });
+
+    describe('based on complete transaction', function() {
+      var immediate, request, response, err;
+
+      before(function() {
+        immediate = function(txn, done) {
+          if (txn.client.id !== '1234') { return done(new Error('incorrect client argument')); }
+          if (txn.user.id !== 'u123') { return done(new Error('incorrect user argument')); }
+          if (txn.req.scope !== 'email') { return done(new Error('incorrect scope argument')); }
+          if (txn.req.type !== 'code') { return done(new Error('incorrect type argument')); }
+          if (txn.req.audience !== 'https://api.example.com/') { return done(new Error('incorrect areq argument')); }
+          if (txn.locals.service.name !== 'Contacts') { return done(new Error('incorrect locals argument')) };
+
+          return done(null, true, { scope: 'profile email' }, { ip: '127.0.0.1' });
+        };
+      });
+
+      before(function(done) {
+        chai.connect.use('express', resume(server, immediate))
+          .req(function(req) {
+            request = req;
+            req.body = { code: '832076', _xsrf: '3ndukf8s'};
+            req.session = {};
+            req.session['authorize'] = {};
+            req.session['authorize']['abc123'] = { protocol: 'oauth2' };
+            req.user = { id: 'u123', username: 'bob' };
+            req.oauth2 = {};
+            req.oauth2.transactionID = 'abc123';
+            req.oauth2.client = { id: '1234', name: 'Example' };
+            req.oauth2.redirectURI = 'http://example.com/auth/callback';
+            req.oauth2.req = { type: 'code', scope: 'email', audience: 'https://api.example.com/' };
+            req.oauth2.locals = { service: { name: 'Contacts' } };
+          })
+          .end(function(res) {
+            response = res;
+            done();
+          })
+          .dispatch();
+      });
+
+      it('should not error', function() {
+        expect(err).to.be.undefined;
+      });
+
+      it('should set user on transaction', function() {
+        expect(request.oauth2.user).to.be.an('object');
+        expect(request.oauth2.user.id).to.equal('u123');
+        expect(request.oauth2.user.username).to.equal('bob');
+      });
+
+      it('should set response on transaction', function() {
+        expect(request.oauth2.res).to.be.an('object');
+        expect(request.oauth2.res.allow).to.be.true;
+        expect(request.oauth2.res.scope).to.equal('profile email');
+        expect(request.oauth2.info).to.be.undefined;
+        expect(request.oauth2.locals).to.be.an('object');
+        expect(Object.keys(request.oauth2.locals)).to.have.length(2);
+        expect(request.oauth2.locals.service.name).to.equal('Contacts');
+        expect(request.oauth2.locals.ip).to.equal('127.0.0.1');
+      });
+
+      it('should respond', function() {
+        expect(response.statusCode).to.equal(302);
+        expect(response.getHeader('Location')).to.equal('http://example.com/auth/callback');
+      });
+
+      it('should remove transaction from session', function() {
+        expect(request.session['authorize']['abc123']).to.be.undefined;
+      });
+    });
 
     describe('encountering an error', function() {
       var immediate, request, response, err;