diff --git a/packages/facebook-oauth/facebook_client.js b/packages/facebook-oauth/facebook_client.js index 5aa2da16b7..33604948f6 100644 --- a/packages/facebook-oauth/facebook_client.js +++ b/packages/facebook-oauth/facebook_client.js @@ -31,7 +31,7 @@ Facebook.requestCredential = function (options, credentialRequestCompleteCallbac var loginStyle = OAuth._loginStyle('facebook', config, options); var loginUrl = - 'https://www.facebook.com/v2.9/dialog/oauth?client_id=' + config.appId + + 'https://www.facebook.com/v2.12/dialog/oauth?client_id=' + config.appId + '&redirect_uri=' + OAuth._redirectUri('facebook', config) + '&display=' + display + '&scope=' + scope + '&state=' + OAuth._stateParam(loginStyle, credentialToken, options && options.redirectUrl); diff --git a/packages/facebook-oauth/facebook_server.js b/packages/facebook-oauth/facebook_server.js index f124676deb..2ac71238b5 100644 --- a/packages/facebook-oauth/facebook_server.js +++ b/packages/facebook-oauth/facebook_server.js @@ -53,7 +53,7 @@ var getTokenResponse = function (query) { try { // Request an access token responseContent = HTTP.get( - "https://graph.facebook.com/v2.8/oauth/access_token", { + "https://graph.facebook.com/v2.12/oauth/access_token", { params: { client_id: config.appId, redirect_uri: OAuth._redirectUri('facebook', config), @@ -90,7 +90,7 @@ var getIdentity = function (accessToken, fields) { hmac.update(accessToken); try { - return HTTP.get("https://graph.facebook.com/v2.8/me", { + return HTTP.get("https://graph.facebook.com/v2.12/me", { params: { access_token: accessToken, appsecret_proof: hmac.digest('hex'), diff --git a/packages/facebook-oauth/package.js b/packages/facebook-oauth/package.js index f34b080c91..aea8b40bcf 100644 --- a/packages/facebook-oauth/package.js +++ b/packages/facebook-oauth/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Facebook OAuth flow", - version: "1.4.0" + version: "1.4.1" }); Package.onUse(function(api) { diff --git a/packages/http/httpcall_client.js b/packages/http/httpcall_client.js index 788c331d4a..aa1d225602 100644 --- a/packages/http/httpcall_client.js +++ b/packages/http/httpcall_client.js @@ -66,7 +66,7 @@ HTTP.call = function(method, url, options, callback) { if (options.auth) { var colonLoc = options.auth.indexOf(':'); if (colonLoc < 0) - throw new Error('auth option should be of the form "username:password"'); + throw new Error('Option auth should be of the form "username:password"'); username = options.auth.substring(0, colonLoc); password = options.auth.substring(colonLoc+1); } @@ -136,10 +136,10 @@ HTTP.call = function(method, url, options, callback) { Meteor.clearTimeout(timer); if (timed_out) { - callback(new Error("timeout")); + callback(new Error("Connection timeout")); } else if (! xhr.status) { // no HTTP response - callback(new Error("network")); + callback(new Error("Connection lost")); } else { var response = {}; diff --git a/packages/http/package.js b/packages/http/package.js index 0f437102fa..2591ed087b 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.4.0' + version: '1.4.1' }); Npm.depends({