Add optional generateToken method to model

Allows you to override the default token generation mechanism

Author: Thom Seddon

Readme.md

@@ -55,6 +55,8 @@ The module requires a model object through which some aspects or storage, retrie
 The last parameter of all methods is a callback of which the first parameter is always used to indicate an error.
 A model must provide the following methods:
 
+### Required
+
 ### getAccessToken(bearerToken, callback)
 - `bearerToken`	`String`	The bearer token (access token) that has been provided
 - `callback`	`Function` callback(error, accessToken)
@@ -102,13 +104,22 @@ A model must provide the following methods:
 	- `error`	`Mixed`	Truthy to indicate an error
 	- `user`	`Object|Boolean`	The user retrieved from storage or falsey to indicate an invalid user (saved in req.user)
 
+
+### Optional
+
 ### extendedGrant(req, callback)
 - `req`			`Object` The raw request
 - `callback`	`Function` callback(error, supported, user)
 	- `error`	`Mixed`	Truthy to indicate an error
 	- `supported`	`Boolean`	Whether the grant type is supported
 	- `user`	`Object|Boolean`	The user retrieved from storage or falsey to indicate an invalid user (saved in req.user), must at least have an id
 
+### generateToken(type, callback)
+- `type`		`String` Token type, one of 'accessToken' or 'refreshToken'
+- `callback`	`Function` callback(error, token)
+	- `error`	`Mixed`	Truthy to indicate an error
+	- `token`	`String` The access token
+
 ## Extension Grants
 You can support extension/custom grants by implementing the extendedGrant method as outlined above.
 Any requests that begin with http(s):// (as [defined in the spec](http://tools.ietf.org/html/rfc6749#section-4.5)) will be passed to it for you to handle.

lib/token.js

@@ -200,14 +200,14 @@ token.grantAccessToken = function (req, res, next) {
 
 			// Are we issuing refresh tokens?
 			if (oauth.grants.indexOf('refresh_token') >= 0) {
-				token.generateToken(createRefreshToken);
+				token.generateToken.call(oauth, 'refreshToken', createRefreshToken);
 			} else {
 				token.issueToken.call(oauth, req, res, next);
 			}
 		});
 	};
 
-	token.generateToken(createAccessToken);
+	token.generateToken.call(oauth, 'accessToken', createAccessToken);
 };
 
 /**
@@ -236,7 +236,9 @@ token.issueToken = function (req, res, next) {
  * @param  {Function} next Connect next
  * @return {String}        Random 40 char token
  */
-token.generateToken = function (callback) {
+token.generateToken = function (type, callback) {
+	if (this.model.generateToken) return this.model.generateToken(type, callback);
+
 	crypto.randomBytes(256, function (ex, buffer) {
 		if (ex) return callback(new OAuth2Error('server_error'));
 

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": "1.1.1",
+	"version": "1.2.0",
 	"keywords": [
 		"oauth",
 		"oauth2"

test/oauth2server.token.js

@@ -302,6 +302,43 @@ describe('OAuth2Server.token()', function() {
 		});
 	});
 
+	describe('generate access token', function () {
+		it('should allow override via model', function (done) {
+			var app = bootstrap({
+				model: {
+					getClient: function (id, secret, callback) {
+						callback(false, { client_id: id });
+					},
+					grantTypeAllowed: function (id, secret, callback) {
+						callback(false, true);
+					},
+					getUser: function (uname, pword, callback) {
+						callback(false, { id: 1 });
+					},
+					generateToken: function (type, callback) {
+						callback(false, 'thommy');
+					},
+					saveAccessToken: function (accessToken, clientId, userId, expires, callback) {
+						try {
+							accessToken.should.equal('thommy');
+							callback();
+						} catch (e) {
+							return callback(e);
+						}
+					}
+				},
+				grants: ['password']
+			});
+
+			request(app)
+				.post('/oauth/token')
+				.set('Content-Type', 'application/x-www-form-urlencoded')
+				.send(validBody)
+				.expect(/thommy/, 200, done);
+
+		});
+	});
+
 	describe('saving access token', function () {
 		it('should pass valid params to model.saveAccessToken', function (done) {
 			var app = bootstrap({
@@ -463,4 +500,4 @@ describe('OAuth2Server.token()', function() {
 		});
 	});
 
-});
+});