From 6141c032eeba1bbabc2f5ef27efab36321dcc9d1 Mon Sep 17 00:00:00 2001 From: Mike Bannister Date: Thu, 2 Aug 2012 01:12:20 -0400 Subject: [PATCH] remove oauth 1 and 2 client file altogether --- packages/accounts-facebook/facebook_client.js | 2 +- packages/accounts-google/google_client.js | 2 +- packages/accounts-oauth-helper/oauth_client.js | 8 ++++---- packages/accounts-oauth1-helper/oauth1_client.js | 10 ---------- packages/accounts-oauth1-helper/package.js | 1 - packages/accounts-oauth2-helper/oauth2_client.js | 10 ---------- packages/accounts-oauth2-helper/package.js | 1 - packages/accounts-twitter/twitter_client.js | 2 +- packages/accounts-weibo/weibo_client.js | 2 +- 9 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 packages/accounts-oauth1-helper/oauth1_client.js delete mode 100644 packages/accounts-oauth2-helper/oauth2_client.js diff --git a/packages/accounts-facebook/facebook_client.js b/packages/accounts-facebook/facebook_client.js index fabbf60bb9..9edbcfb9b9 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.oauth2.initiateLogin(state, loginUrl); + Meteor.accounts.oauth.initiateLogin(state, loginUrl, { oauthVersion: 2 }); }; })(); diff --git a/packages/accounts-google/google_client.js b/packages/accounts-google/google_client.js index 10fb1f9d7b..1c4b03c846 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.oauth2.initiateLogin(state, loginUrl); + Meteor.accounts.oauth.initiateLogin(state, loginUrl, { oauthVersion: 2 }); }; }) (); diff --git a/packages/accounts-oauth-helper/oauth_client.js b/packages/accounts-oauth-helper/oauth_client.js index 5948f73a7f..658a5e8d96 100644 --- a/packages/accounts-oauth-helper/oauth_client.js +++ b/packages/accounts-oauth-helper/oauth_client.js @@ -3,7 +3,7 @@ // // @param state {String} The OAuth state generated by the client // @param url {String} url to page - Meteor.accounts.oauth.initiateLogin = function(state, url, oauthVersion) { + Meteor.accounts.oauth.initiateLogin = function(state, url, options) { // XXX these dimensions worked well for facebook and google, but // it's sort of weird to have these here. Maybe an optional // argument instead? @@ -12,7 +12,7 @@ var checkPopupOpen = setInterval(function() { if (popup.closed) { clearInterval(checkPopupOpen); - tryLoginAfterPopupClosed(state, oauthVersion); + tryLoginAfterPopupClosed(state, options); } }, 100); }; @@ -20,9 +20,9 @@ // Send an OAuth login method to the server. If the user authorized // access in the popup this should log the user in, otherwise // nothing should happen. - var tryLoginAfterPopupClosed = function(state, oauthVersion) { + var tryLoginAfterPopupClosed = function(state, options) { Meteor.apply('login', [ - {oauth: {oauthVersion: oauthVersion, state: state}} + {oauth: {version: options.oauthVersion, state: state}} ], {wait: true}, function(error, result) { if (error) throw error; diff --git a/packages/accounts-oauth1-helper/oauth1_client.js b/packages/accounts-oauth1-helper/oauth1_client.js deleted file mode 100644 index f72deb3779..0000000000 --- a/packages/accounts-oauth1-helper/oauth1_client.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - // Open a popup window pointing to a OAuth1 handshake page - // - // @param state {String} The OAuth1 state generated by the client - // @param url {String} url to page - Meteor.accounts.oauth1.initiateLogin = function(state, url) { - // Include the oauth version as the last parameter - Meteor.accounts.oauth.initiateLogin(state, url, 1); - }; -})(); \ No newline at end of file diff --git a/packages/accounts-oauth1-helper/package.js b/packages/accounts-oauth1-helper/package.js index d6934c525e..b97da37fb2 100644 --- a/packages/accounts-oauth1-helper/package.js +++ b/packages/accounts-oauth1-helper/package.js @@ -9,7 +9,6 @@ Package.on_use(function (api) { api.add_files('oauth1_common.js', ['client', 'server']); api.add_files('oauth1_server.js', 'server'); - api.add_files('oauth1_client.js', 'client'); }); Package.on_test(function (api) { diff --git a/packages/accounts-oauth2-helper/oauth2_client.js b/packages/accounts-oauth2-helper/oauth2_client.js deleted file mode 100644 index 2b0c01ee07..0000000000 --- a/packages/accounts-oauth2-helper/oauth2_client.js +++ /dev/null @@ -1,10 +0,0 @@ -(function () { - // Open a popup window pointing to a OAuth handshake page - // - // @param state {String} The OAuth state generated by the client - // @param url {String} url to page - Meteor.accounts.oauth2.initiateLogin = function(state, url) { - // Include the oauth version as the last parameter - Meteor.accounts.oauth.initiateLogin(state, url, 2); - }; -})(); diff --git a/packages/accounts-oauth2-helper/package.js b/packages/accounts-oauth2-helper/package.js index 59f8ccfb83..09f09dded6 100644 --- a/packages/accounts-oauth2-helper/package.js +++ b/packages/accounts-oauth2-helper/package.js @@ -9,7 +9,6 @@ Package.on_use(function (api) { api.add_files('oauth2_common.js', ['client', 'server']); api.add_files('oauth2_server.js', 'server'); - api.add_files('oauth2_client.js', 'client'); }); Package.on_test(function (api) { diff --git a/packages/accounts-twitter/twitter_client.js b/packages/accounts-twitter/twitter_client.js index 40d36b1482..97209b0228 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.oauth1.initiateLogin(state, url); + Meteor.accounts.oauth.initiateLogin(state, url, { oauthVersion: 1 }); }; })(); diff --git a/packages/accounts-weibo/weibo_client.js b/packages/accounts-weibo/weibo_client.js index 040246c705..27f41fd493 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.oauth2.initiateLogin(state, loginUrl); + Meteor.accounts.oauth.initiateLogin(state, loginUrl, { oauthVersion: 2 }); }; }) ();