Merge branch 'develop'

Author: william26

coffee/lib/authentication.coffee

@@ -13,7 +13,15 @@ module.exports = (cache, requestio) ->
 					secret: cache.secret_key
 				}
 			}, (e, r, body) ->
-				response = JSON.parse body
+				if e
+					defer.reject e
+					return
+
+				try
+					response = JSON.parse body
+				catch e
+					defer.reject new Error 'OAuth.io response could not be parsed'
+					return
 
 				if (not response.state?)
 					defer.reject new Error 'State is missing from response'
@@ -32,9 +40,11 @@ module.exports = (cache, requestio) ->
 					return requestio.make_request(response, 'PUT', url, options)
 				response.del = (url, options) ->
 					return requestio.make_request(response, 'DELETE', url, options)
+				response.me = (options) ->
+					return requestio.make_me_request(response, options)
 				if (req?.session?)
 					req.session.oauth = req.session.oauth || {}
 					req.session.oauth[response.provider] = response
 				defer.resolve response
 			return defer.promise
-	}
+	}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauthio",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OAuth that just works ! This is the Node.js SDK for OAuth.io.",
   "main": "index.js",
   "scripts": {

tests/unit/spec/request.spec.js

@@ -218,7 +218,9 @@ describe('OAuth requests', function() {
 			}))
 			.get('/auth/facebook/me')
 			.reply(200, {
-				'firstname': 'Archibald'
+				data: {
+					'firstname': 'Archibald'
+				}
 			});
 
 		values.OAuth.create(values.express_app.req, 'facebook').me()
@@ -244,8 +246,10 @@ describe('OAuth requests', function() {
 			}))
 			.get(url)
 			.reply(200, {
-				'firstname': 'Archibald',
-				'lastname': 'De la Testitude',
+				data: {
+					'firstname': 'Archibald',
+					'lastname': 'De la Testitude'
+				}
 			});
 
 		values.OAuth.create(values.express_app.req, 'facebook').me(['firstname', 'lastname'])