Return full user object to save* functions

Author: Thom Seddon

lib/grant.js

@@ -235,7 +235,7 @@ function useRefreshTokenGrant (done) {
       });
     }
 
-    self.user = { id: refreshToken.user_id };
+    self.user = refreshToken.user || { id: refreshToken.user_id };
     done();
   });
 };
@@ -324,8 +324,8 @@ function saveAccessToken (done) {
   var data = {
     access_token: accessToken,
     client_id: this.client.client_id,
-    user_id: this.user.id,
-    expires: expires
+    expires: expires,
+    user: this.user
   };
 
   this.model.saveAccessToken(data, function (err) {
@@ -376,8 +376,8 @@ function saveRefreshToken (done) {
   var data = {
     refresh_token: refreshToken,
     client_id: this.client.client_id,
-    user_id: this.user.id,
-    expires: expires
+    expires: expires,
+    user: this.user
   };
 
   this.model.saveAccessToken(data, function (err) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-oauth2-server",
   "description": "Complete, compliant and well tested module for implementing an OAuth2 Server/Provider with express in node.js",
-  "version": "2.0.0-beta",
+  "version": "2.0.0-beta2",
   "keywords": [
     "oauth",
     "oauth2"

test/grant.js

@@ -652,7 +652,7 @@ describe('Grant', function() {
             data.access_token.should.be.a('string');
             data.access_token.should.have.length(40);
             data.client_id.should.equal('thom');
-            data.user_id.should.equal(1);
+            data.user.id.should.equal(1);
             (+data.expires).should.be.within(10, (+new Date()) + 3600000);
             callback();
           }