ch 3, ex 1 - fixed issue with nosql (oauthinaction#14)

artursudnik · Oct 7, 2019 · 02962ab · 02962ab
1 parent 2a1f934
commit 02962ab
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/exercises/ch-3-ex-1/package.json b/exercises/ch-3-ex-1/package.json
@@ -1,14 +1,14 @@
 {
-  "dependencies": {
-    "express": "^4.13.1",
-	"sync-request": "^2.0.1",
-	"body-parser": "^1.13.2",
-	"underscore": "^1.8.3",
-	"underscore.string": "^3.1.1",
-	"consolidate": "^0.13.1",
-	"qs": "^4.0.0",
-	"randomstring": "^1.0.7",
-	"nosql": "^3.0.3",
-	"cors": "^2.7.1"
-  }
+		"dependencies": {
+				"express": "^4.13.1",
+				"sync-request": "^2.0.1",
+				"body-parser": "^1.13.2",
+				"underscore": "^1.8.3",
+				"underscore.string": "^3.1.1",
+				"consolidate": "^0.13.1",
+				"qs": "^4.0.0",
+				"randomstring": "^1.0.7",
+				"nosql": "^6.1.0",
+				"cors": "^2.7.1"
+		}
 }
diff --git a/exercises/ch-3-ex-1/protectedResource.js b/exercises/ch-3-ex-1/protectedResource.js
@@ -35,19 +35,19 @@ 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, response) {
+			console.log(response);
+			if (response) {
+				console.log("We found a matching token: %s", inToken);
+			} else {
+				console.log('No matching token was found.');
+			};
+			req.access_token = response;
+			next();
+			return;
+		})
 	});
 };