From bba4685269b0dc675c644a4732f08034a95a88ef Mon Sep 17 00:00:00 2001 From: Mike Bannister Date: Thu, 2 Aug 2012 02:11:13 -0400 Subject: [PATCH] changed oauthVersion to version --- packages/accounts-facebook/facebook_client.js | 2 +- packages/accounts-facebook/facebook_server.js | 2 +- packages/accounts-google/google_client.js | 2 +- packages/accounts-google/google_server.js | 2 +- packages/accounts-oauth-helper/oauth_client.js | 2 +- packages/accounts-oauth-helper/oauth_server.js | 8 ++++---- packages/accounts-oauth1-helper/oauth1_server.js | 2 +- packages/accounts-oauth1-helper/oauth1_tests.js | 2 +- packages/accounts-oauth2-helper/oauth2_server.js | 2 +- packages/accounts-oauth2-helper/oauth2_tests.js | 2 +- packages/accounts-twitter/twitter_client.js | 2 +- packages/accounts-twitter/twitter_server.js | 2 +- packages/accounts-weibo/weibo_client.js | 2 +- packages/accounts-weibo/weibo_server.js | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/accounts-facebook/facebook_client.js b/packages/accounts-facebook/facebook_client.js index 9edbcfb9b9..420717d5e8 100644 --- a/packages/accounts-facebook/facebook_client.js +++ b/packages/accounts-facebook/facebook_client.js @@ -17,7 +17,7 @@ '&redirect_uri=' + Meteor.accounts.facebook._appUrl + '/_oauth/facebook?close' + '&display=' + display + '&scope=' + scope + '&state=' + state; - Meteor.accounts.oauth.initiateLogin(state, loginUrl, { oauthVersion: 2 }); + Meteor.accounts.oauth.initiateLogin(state, loginUrl, { version: 2 }); }; })(); diff --git a/packages/accounts-facebook/facebook_server.js b/packages/accounts-facebook/facebook_server.js index 4ced8c6e2c..b625595a44 100644 --- a/packages/accounts-facebook/facebook_server.js +++ b/packages/accounts-facebook/facebook_server.js @@ -4,7 +4,7 @@ Meteor.accounts.facebook._secret = secret; }; - Meteor.accounts.oauth.registerService('facebook', {oauthVersion: 2}, function(query) { + Meteor.accounts.oauth.registerService('facebook', {version: 2}, function(query) { if (query.error) { // The user didn't authorize access return null; diff --git a/packages/accounts-google/google_client.js b/packages/accounts-google/google_client.js index 1c4b03c846..8bab1862ff 100644 --- a/packages/accounts-google/google_client.js +++ b/packages/accounts-google/google_client.js @@ -25,7 +25,7 @@ '&redirect_uri=' + Meteor.accounts.google._appUrl + '/_oauth/google?close' + '&state=' + state; - Meteor.accounts.oauth.initiateLogin(state, loginUrl, { oauthVersion: 2 }); + Meteor.accounts.oauth.initiateLogin(state, loginUrl, { version: 2 }); }; }) (); diff --git a/packages/accounts-google/google_server.js b/packages/accounts-google/google_server.js index 74115f6d62..94037959c2 100644 --- a/packages/accounts-google/google_server.js +++ b/packages/accounts-google/google_server.js @@ -4,7 +4,7 @@ Meteor.accounts.google._secret = secret; }; - Meteor.accounts.oauth.registerService('google', {oauthVersion: 2}, function(query) { + Meteor.accounts.oauth.registerService('google', {version: 2}, function(query) { if (query.error) { // The user didn't authorize access return null; diff --git a/packages/accounts-oauth-helper/oauth_client.js b/packages/accounts-oauth-helper/oauth_client.js index 658a5e8d96..f2e1ce9654 100644 --- a/packages/accounts-oauth-helper/oauth_client.js +++ b/packages/accounts-oauth-helper/oauth_client.js @@ -22,7 +22,7 @@ // nothing should happen. var tryLoginAfterPopupClosed = function(state, options) { Meteor.apply('login', [ - {oauth: {version: options.oauthVersion, state: state}} + {oauth: {version: options.version, state: state}} ], {wait: true}, function(error, result) { if (error) throw error; diff --git a/packages/accounts-oauth-helper/oauth_server.js b/packages/accounts-oauth-helper/oauth_server.js index f0c9909a16..c91a5af6ea 100644 --- a/packages/accounts-oauth-helper/oauth_server.js +++ b/packages/accounts-oauth-helper/oauth_server.js @@ -13,10 +13,10 @@ // arguments to Meteor.accounts.updateOrCreateUser) // - `null` if the user declined to give permissions Meteor.accounts.oauth.registerService = function (name, options, handleOauthRequest) { - var oauthAccounts = Meteor.accounts['oauth' + options.oauthVersion]; + var oauthAccounts = Meteor.accounts['oauth' + options.version]; if (oauthAccounts._services[name]) - throw new Error("Already registered the " + name + " OAuth" + options.oauthVersion + " service"); + throw new Error("Already registered the " + name + " OAuth" + options.version + " service"); oauthAccounts._services[name] = { handleOauthRequest: handleOauthRequest @@ -24,11 +24,11 @@ }; Meteor.accounts.oauth._setup = function(setupOptions) { - var oauthAccounts = Meteor.accounts['oauth' + setupOptions.oauthVersion]; + var oauthAccounts = Meteor.accounts['oauth' + setupOptions.version]; // Listen to calls to `login` with an oauth option set Meteor.accounts.registerLoginHandler(function (options) { - if (!options.oauth || options.oauth.version !== setupOptions.oauthVersion) + if (!options.oauth || options.oauth.version !== setupOptions.version) return undefined; // don't handle var result = oauthAccounts._loginResultForState[options.oauth.state]; diff --git a/packages/accounts-oauth1-helper/oauth1_server.js b/packages/accounts-oauth1-helper/oauth1_server.js index 4cf6ea0082..71b139632c 100644 --- a/packages/accounts-oauth1-helper/oauth1_server.js +++ b/packages/accounts-oauth1-helper/oauth1_server.js @@ -3,7 +3,7 @@ Meteor.accounts.oauth1._services = {}; - Meteor.accounts.oauth._setup({oauthVersion: 1}); + Meteor.accounts.oauth._setup({version: 1}); // connect middleware Meteor.accounts.oauth1._handleRequest = function (req, res, next) { diff --git a/packages/accounts-oauth1-helper/oauth1_tests.js b/packages/accounts-oauth1-helper/oauth1_tests.js index 1ae9f1bf0f..0a5e5774a7 100644 --- a/packages/accounts-oauth1-helper/oauth1_tests.js +++ b/packages/accounts-oauth1-helper/oauth1_tests.js @@ -7,7 +7,7 @@ Tinytest.add("oauth2 - loginResultForState is stored", function (test) { Meteor.accounts.oauth1._services = {}; // register a fake login service - foobook - Meteor.accounts.oauth.registerService("foobook", {oauthVersion: 1}, function (query) { + Meteor.accounts.oauth.registerService("foobook", {version: 1}, function (query) { return { options: { email: email, diff --git a/packages/accounts-oauth2-helper/oauth2_server.js b/packages/accounts-oauth2-helper/oauth2_server.js index 620c2d0aa9..566ab3f978 100644 --- a/packages/accounts-oauth2-helper/oauth2_server.js +++ b/packages/accounts-oauth2-helper/oauth2_server.js @@ -3,7 +3,7 @@ Meteor.accounts.oauth2._services = {}; - Meteor.accounts.oauth._setup({oauthVersion: 2}); + Meteor.accounts.oauth._setup({version: 2}); // connect middleware Meteor.accounts.oauth2._handleRequest = function (req, res, next) { diff --git a/packages/accounts-oauth2-helper/oauth2_tests.js b/packages/accounts-oauth2-helper/oauth2_tests.js index d6bd124899..b1b290c2c1 100644 --- a/packages/accounts-oauth2-helper/oauth2_tests.js +++ b/packages/accounts-oauth2-helper/oauth2_tests.js @@ -10,7 +10,7 @@ Tinytest.add("oauth2 - loginResultForState is stored", function (test) { Meteor.accounts.oauth2._services = {}; // register a fake login service - foobook - Meteor.accounts.oauth.registerService("foobook", {oauthVersion: 2}, function (query) { + Meteor.accounts.oauth.registerService("foobook", {version: 2}, function (query) { return { options: { email: email, diff --git a/packages/accounts-twitter/twitter_client.js b/packages/accounts-twitter/twitter_client.js index 97209b0228..38a33011e1 100644 --- a/packages/accounts-twitter/twitter_client.js +++ b/packages/accounts-twitter/twitter_client.js @@ -7,7 +7,7 @@ var callbackUrl = Meteor.accounts.twitter._appUrl + '/_oauth/twitter?close&state=' + state; var url = '/_oauth/twitter/request_token?callbackUrl=' + encodeURIComponent(callbackUrl) - Meteor.accounts.oauth.initiateLogin(state, url, { oauthVersion: 1 }); + Meteor.accounts.oauth.initiateLogin(state, url, { version: 1 }); }; })(); diff --git a/packages/accounts-twitter/twitter_server.js b/packages/accounts-twitter/twitter_server.js index 854cad60ef..326ac8d911 100644 --- a/packages/accounts-twitter/twitter_server.js +++ b/packages/accounts-twitter/twitter_server.js @@ -4,7 +4,7 @@ Meteor.accounts.twitter._secret = secret; }; - Meteor.accounts.oauth.registerService('twitter', {oauthVersion: 1}, function(oauth) { + Meteor.accounts.oauth.registerService('twitter', {version: 1}, function(oauth) { var identity = oauth.get('https://api.twitter.com/1/account/verify_credentials.json'); diff --git a/packages/accounts-weibo/weibo_client.js b/packages/accounts-weibo/weibo_client.js index 27f41fd493..7855f9be1c 100644 --- a/packages/accounts-weibo/weibo_client.js +++ b/packages/accounts-weibo/weibo_client.js @@ -12,7 +12,7 @@ '&redirect_uri=' + Meteor.accounts.weibo._appUrl + '/_oauth/weibo?close' + '&state=' + state; - Meteor.accounts.oauth.initiateLogin(state, loginUrl, { oauthVersion: 2 }); + Meteor.accounts.oauth.initiateLogin(state, loginUrl, { version: 2 }); }; }) (); diff --git a/packages/accounts-weibo/weibo_server.js b/packages/accounts-weibo/weibo_server.js index b0d061c802..1a339c1837 100644 --- a/packages/accounts-weibo/weibo_server.js +++ b/packages/accounts-weibo/weibo_server.js @@ -4,7 +4,7 @@ Meteor.accounts.weibo._secret = secret; }; - Meteor.accounts.oauth.registerService('weibo', {oauthVersion: 2}, function(query) { + Meteor.accounts.oauth.registerService('weibo', {version: 2}, function(query) { if (query.error) { // The user didn't authorize access return null;