8000 Merge branch 'develop' · oauth-io/sdk-node@8cf5d6a · GitHub
[go: up one dir, main page]
Skip to content

Commit 8cf5d6a

Browse files
william26william26
committed
Merge branch 'develop'
2 parents ff629f4 + e300cdd commit 8cf5d6a

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

‎coffee/lib/authentication.coffee

Lines changed: 12 additions & 2 deletions
< 10000 /tr>
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ module.exports = (cache, requestio) ->
1313
secret: cache.secret_key
1414
}
1515
}, (e, r, body) ->
16-
response = JSON.parse body
16+
if e
17+
defer.reject e
18+
return
19+
20+
try
21+
response = JSON.parse body
22+
catch e
23+
defer.reject new Error 'OAuth.io response could not be parsed'
24+
return
1725

1826
if (not response.state?)
1927
defer.reject new Error 'State is missing from response'
@@ -32,9 +40,11 @@ module.exports = (cache, requestio) ->
3240
return requestio.make_request(response, 'PUT', url, options)
3341
response.del = (url, options) ->
3442
return requestio.make_request(response, 'DELETE', url, options)
43+
response.me = (options) ->
44+
return requestio.make_me_request(response, options)
3545
if (req?.session?)
3646
req.session.oauth = req.session.oauth || {}
3747
req.session.oauth[response.provider] = response
3848
defer.resolve response
3949
return defer.promise
40-
}
50+
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "oauthio",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"description": "OAuth that just works ! This is the Node.js SDK for OAuth.io.",
55
"main": "index.js",
66
"scripts": {

‎tests/unit/spec/request.spec.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,9 @@ describe('OAuth requests', function() {
218218
}))
219219
.get('/auth/facebook/me')
220220
.reply(200, {
221-
'firstname': 'Archibald'
221+
data: {
222+
'firstname': 'Archibald'
223+
}
222224
});
223225

224226
values.OAuth.create(values.express_app.req, 'facebook').me()
@@ -244,8 +246,10 @@ describe('OAuth requests', function() {
244246
}))
245247
.get(url)
246248
.reply(200, {
247-
'firstname': 'Archibald',
248-
'lastname': 'De la Testitude',
249+
data: {
250+
'firstname': 'Archibald',
251+
'lastname': 'De la Testitude'
252+
}
249253
});
250254

251255
values.OAuth.create(values.express_app.req, 'facebook').me(['firstname', 'lastname'])

0 commit comments

Comments
 (0)
0