Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Surface error message to emitted events. #60

Merged
merged 2 commits into from Jan 30, 2014
Merged

Surface error message to emitted events. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eaddfe
It's great to actually see errors.
Jan 30, 2014
c400632
Add error message to events for all oauth1 services
Jan 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/services/bitbucket.js
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ Bitbucket.prototype.onRequest = function(req, res) {
}

else oa.getOAuthRequestToken(function(error, oauth_token, oauth_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

secrets[oauth_token] = oauth_token_secret
setTimeout(function(){ delete secrets[oauth_token] }, 60000)
Expand All @@ -72,15 +72,15 @@ Bitbucket.prototype.onRequest = function(req, res) {
})

function onToken(error, oauth_access_token, oauth_access_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

oa.getProtectedResource(
self.userUrl,
"GET",
oauth_access_token,
oauth_access_token_secret,
function (error, data, response) {
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)
var feed = JSON.parse(data);
var authData = {
token: oauth_access_token,
Expand All @@ -97,7 +97,7 @@ Bitbucket.prototype.onRequest = function(req, res) {
oauth_access_token,
oauth_access_token_secret,
function (error, data, response) {
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)
authData.data.emails = JSON.parse(data);
self.emit("auth", req, res, authData)
}
Expand Down
4 changes: 2 additions & 2 deletions lib/services/dropbox.js
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ Dropbox.prototype.onRequest = function(req, res) {
}

else oa.getOAuthRequestToken(function(error, oauth_token, oauth_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

secrets[oauth_token] = oauth_token_secret
setTimeout(function(){ delete secrets[oauth_token] }, 60000)
Expand All @@ -71,7 +71,7 @@ Dropbox.prototype.onRequest = function(req, res) {
})

function onToken(error, oauth_access_token, oauth_access_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

if(self.info) {
oa.getProtectedResource(
Expand Down
4 changes: 2 additions & 2 deletions lib/services/fitbit.js
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ Fitbit.prototype.onRequest = function(req, res) {
}

else oa.getOAuthRequestToken(function(error, oauth_token, oauth_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

secrets[oauth_token] = oauth_token_secret
setTimeout(function(){ delete secrets[oauth_token] }, 60000)
Expand All @@ -60,7 +60,7 @@ Fitbit.prototype.onRequest = function(req, res) {
})

function onToken(error, oauth_access_token, oauth_access_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

self.emit("auth", req, res, {
token: oauth_access_token,
Expand Down
4 changes: 2 additions & 2 deletions lib/services/linkedin.js
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ LinkedIn.prototype.onRequest = function(req, res) {
}

else oa.getOAuthRequestToken(function(error, oauth_token, oauth_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

secrets[oauth_token] = oauth_token_secret
setTimeout(function(){ delete secrets[oauth_token] }, 60000)
Expand All @@ -66,7 +66,7 @@ LinkedIn.prototype.onRequest = function(req, res) {


function onToken(error, oauth_access_token, oauth_access_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

oa.getProtectedResource(
self.dataUrl,
Expand Down
4 changes: 2 additions & 2 deletions lib/services/twitter.js
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ Twitter.prototype.onRequest = function(req, res) {
}

else oa.getOAuthRequestToken(function(error, oauth_token, oauth_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

secrets[oauth_token] = oauth_token_secret
setTimeout(function(){ delete secrets[oauth_token] }, 60000)
Expand All @@ -62,7 +62,7 @@ Twitter.prototype.onRequest = function(req, res) {
})

function onToken(error, oauth_access_token, oauth_access_token_secret, results){
if (error) return self.emit("error", req, res, uri.query)
if (error) return self.emit("error", req, res, uri.query, error)

self.emit("auth", req, res, {
token: oauth_access_token,
Expand Down