Merge pull request oauthinaction#44 from oauthinaction/deprecation-updates

Deprecation updates

Author: jricher

.gitignore

@@ -4,3 +4,4 @@ example/native-client/plugins/
 exercises/ch-7-ex-0/platforms/
 exercises/ch-7-ex-0/plugins/
 .DS_Store
+package-lock.json

class/authorizationServer.js

@@ -101,7 +101,7 @@ var getScopesFromForm = function(body) {
 };
 
 var decodeClientCredentials = function(auth) {
-	var clientCredentials = new Buffer(auth.slice('basic '.length), 'base64').toString().split(':');
+	var clientCredentials = Buffer.from(auth.slice('basic '.length), 'base64').toString().split(':');
 	var clientId = querystring.unescape(clientCredentials[0]);
 	var clientSecret = querystring.unescape(clientCredentials[1]);	
 	return { id: clientId, secret: clientSecret };

class/client.js

@@ -89,7 +89,7 @@ var buildUrl = function(base, options, hash) {
 };
 
 var encodeClientCredentials = function(clientId, clientSecret) {
-	return new Buffer(querystring.escape(clientId) + ':' + querystring.escape(clientSecret)).toString('base64');
+	return Buffer.from(querystring.escape(clientId) + ':' + querystring.escape(clientSecret)).toString('base64');
 };
 
 var server = app.listen(9000, 'localhost', function () {

class/complete/authorizationServer.js

@@ -254,7 +254,7 @@ app.post("/token", function(req, res){
 				//var encodedPayload = base64url.encode(JSON.stringify(payload));
 
 				//var access_token = encodedHeader + '.' + encodedPayload + '.';
-				//var access_token = jose.jws.JWS.sign('HS256', stringHeader, stringPayload, new Buffer(sharedTokenSecret).toString('hex'));
+				//var access_token = jose.jws.JWS.sign('HS256', stringHeader, stringPayload, Buffer.from(sharedTokenSecret).toString('hex'));
 
 				var privateKey = jose.KEYUTIL.getKey(rsaKey);
 				var access_token = jose.jws.JWS.sign(rsaKey.alg, stringHeader, stringPayload, privateKey);
@@ -340,7 +340,7 @@ var getScopesFromForm = function(body) {
 };
 
 var decodeClientCredentials = function(auth) {
-	var clientCredentials = new Buffer(auth.slice('basic '.length), 'base64').toString().split(':');
+	var clientCredentials = Buffer.from(auth.slice('basic '.length), 'base64').toString().split(':');
 	var clientId = querystring.unescape(clientCredentials[0]);
 	var clientSecret = querystring.unescape(clientCredentials[1]);	
 	return { id: clientId, secret: clientSecret };

class/complete/client.js

@@ -256,7 +256,7 @@ var buildUrl = function(base, options, hash) {
 };
 
 var encodeClientCredentials = function(clientId, clientSecret) {
-	return new Buffer(querystring.escape(clientId) + ':' + querystring.escape(clientSecret)).toString('base64');
+	return Buffer.from(querystring.escape(clientId) + ':' + querystring.escape(clientSecret)).toString('base64');
 };
 
 var server = app.listen(9000, 'localhost', function () {

class/complete/protectedResource.js

@@ -51,19 +51,18 @@ var getAccessToken = function(req, res, next) {
 	}
 
 	console.log('Incoming token: %s', inToken);
-	nosql.one(function(token) {
-		if (token.access_token == inToken) {
-			return token;	
-		}
-	}, function(err, token) {
-		if (token) {
-			console.log("We found a matching token: %s", inToken);
-		} else {
-			console.log('No matching token was found.');
-		}
-		req.access_token = token;
-		next();
-		return;
+	nosql.one().make(function(builder) {
+	  builder.where('access_token', inToken);
+	  builder.callback(function(err, token) {
+	    if (token) {
+	      console.log("We found a matching token: %s", inToken);
+	    } else {
+	      console.log('No matching token was found.');
+	    };
+	    req.access_token = token;
+	    next();
+	    return;
+	  })
 	});
 
 };

class/day2-start/authorizationServer.js

@@ -267,7 +267,7 @@ var getScopesFromForm = function(body) {
 };
 
 var decodeClientCredentials = function(auth) {
-	var clientCredentials = new Buffer(auth.slice('basic '.length), 'base64').toString().split(':');
+	var clientCredentials = Buffer.from(auth.slice('basic '.length), 'base64').toString().split(':');
 	var clientId = querystring.unescape(clientCredentials[0]);
 	var clientSecret = querystring.unescape(clientCredentials[1]);	
 	return { id: clientId, secret: clientSecret };

class/day2-start/client.js

@@ -193,7 +193,7 @@ var buildUrl = function(base, options, hash) {
 };
 
 var encodeClientCredentials = function(clientId, clientSecret) {
-	return new Buffer(querystring.escape(clientId) + ':' + querystring.escape(clientSecret)).toString('base64');
+	return Buffer.from(querystring.escape(clientId) + ':' + querystring.escape(clientSecret)).toString('base64');
 };
 
 var server = app.listen(9000, 'localhost', function () {

class/day2-start/protectedResource.js

@@ -51,19 +51,18 @@ var getAccessToken = function(req, res, next) {
 	}
 
 	console.log('Incoming token: %s', inToken);
-	nosql.one(function(token) {
-		if (token.access_token == inToken) {
-			return token;	
-		}
-	}, function(err, token) {
-		if (token) {
-			console.log("We found a matching token: %s", inToken);
-		} else {
-			console.log('No matching token was found.');
-		}
-		req.access_token = token;
-		next();
-		return;
+	nosql.one().make(function(builder) {
+	  builder.where('access_token', inToken);
+	  builder.callback(function(err, token) {
+	    if (token) {
+	      console.log("We found a matching token: %s", inToken);
+	    } else {
+	      console.log('No matching token was found.');
+	    };
+	    req.access_token = token;
+	    next();
+	    return;
+	  })
 	});
 
 };

class/package.json

@@ -7,11 +7,11 @@
 	"underscore": "^1.8.3",
 	"underscore.string": "^3.1.1",
 	"consolidate": "^0.13.1",
-	"qs": "^4.0.0",
+	"qs": "^6.9.3",
 	"randomstring": "^1.0.7",
-	"nosql": "^3.0.3",
-	"base64url": "^1.0.4",
+	"nosql": "^6.1.0",
+	"base64url": "^3.0.1",
 	"cors": "^2.7.1",
-	"jsrsasign": "^5.0.0"
+	"jsrsasign": "^8.0.20"
   }
 }