Standardize the error message returned when there is a missing client_id or secret

Author: MrSwitch

src/error_credentials.js

@@ -0,0 +1,9 @@
+// error_credentials
+
+module.exports = function(p) {
+	return {
+		error : ((p.client_id || p.id) ? "invalid" : "required") + "_credentials",
+		error_message  : "Could not find the credentials that match the provided client_id '"+(p.client_id || p.id)+"'",
+		state : p.state || ''
+	};
+};

src/oauth1.js

@@ -7,6 +7,7 @@ var param = require('./utils/param');
 var sign = require('./sign');
 var url = require('url');
 var request = require('./utils/request');
+var error_credentials = require('./error_credentials');
 
 // token=>secret lookup
 var _token_secrets = {};
@@ -15,6 +16,12 @@ var _token_secrets = {};
 module.exports = function(p, callback){
 
 
+	// Missing Credentials
+	if (!p.client_secret) {
+		callback(p.redirect_uri, error_credentials(p));
+		return;
+	}
+
 
 	//
 	// Get the Authorization path
@@ -138,21 +145,6 @@ module.exports = function(p, callback){
 	}
 
 
-	//
-	// Find the client secret
-	// Get the client secret
-	//
-	
-
-	if(!client_secret){
-		callback( p.redirect_uri, {
-			error : ( p.client_id ? "invalid" : "required" ) + "_credentials",
-			error_message : "Credentials were not recognised",
-			state : p.state || ''
-		});
-		return;
-	}
-
 	// Sign the request using the application credentials
 	var signed_url = sign( path, opts, client_secret, token_secret || null);
 

src/oauth2.js

@@ -6,15 +6,14 @@
 var request = require('./utils/request');
 var param = require('./utils/param');
 var url = require('url');
+var error_credentials = require('./error_credentials');
 
 module.exports = function(p, callback){
 
-	if(!p.client_secret){
-		return callback({
-			error : ( (p.client_id || p.id) ? "invalid" : "required" ) + "_credentials",
-			error_message  : "Could not find the credentials for signing this request, ensure that the correct client_id is passed",
-			state : p.state || ''
-		});
+	// Missing Credentials
+	if (!p.client_secret) {
+		callback(error_credentials(p));
+		return;
 	}
 
 	// Make the OAuth2 request