From 9392fbb51dddbbc96c6000e31f94535541eb6bf9 Mon Sep 17 00:00:00 2001 From: Nick Martin Date: Mon, 1 Oct 2012 15:44:14 -0700 Subject: [PATCH] Prepend '_' to internal things in Accounts. find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/makeClientLoggedIn/_makeClientLoggedIn/g' find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/makeClientLoggedOut/_makeClientLoggedOut/g' find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/storeLoginToken/_storeLoginToken/g' find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/storedLoginToken/_storedLoginToken/g' find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/unstoreLoginToken/_unstoreLoginToken/g' find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/storedUserId/_storedUserId/g' find . -name '*.js' -print0 | xargs -0 perl -pi -e 's/un_storeLoginToken/_unstoreLoginToken/g' --- packages/accounts-base/accounts_client.js | 2 +- packages/accounts-base/localstorage_token.js | 28 +++++++++---------- .../accounts-oauth-helper/oauth_client.js | 2 +- .../accounts-password/passwords_client.js | 6 ++-- packages/accounts-password/passwords_tests.js | 4 +-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/accounts-base/accounts_client.js b/packages/accounts-base/accounts_client.js index c894b10f50..a4249876b9 100644 --- a/packages/accounts-base/accounts_client.js +++ b/packages/accounts-base/accounts_client.js @@ -26,7 +26,7 @@ if (error) { callback && callback(error); } else { - Accounts.makeClientLoggedOut(); + Accounts._makeClientLoggedOut(); callback && callback(); } }); diff --git a/packages/accounts-base/localstorage_token.js b/packages/accounts-base/localstorage_token.js index 43391a88de..51ad0ac597 100644 --- a/packages/accounts-base/localstorage_token.js +++ b/packages/accounts-base/localstorage_token.js @@ -3,7 +3,7 @@ var loginTokenKey = "Meteor.loginToken"; var userIdKey = "Meteor.userId"; - Accounts.storeLoginToken = function(userId, token) { + Accounts._storeLoginToken = function(userId, token) { localStorage.setItem(userIdKey, userId); localStorage.setItem(loginTokenKey, token); @@ -12,7 +12,7 @@ Accounts._lastLoginTokenWhenPolled = token; }; - Accounts.unstoreLoginToken = function() { + Accounts._unstoreLoginToken = function() { localStorage.removeItem(userIdKey); localStorage.removeItem(loginTokenKey); @@ -21,27 +21,27 @@ Accounts._lastLoginTokenWhenPolled = null; }; - Accounts.storedLoginToken = function() { + Accounts._storedLoginToken = function() { return localStorage.getItem(loginTokenKey); }; - Accounts.storedUserId = function() { + Accounts._storedUserId = function() { return localStorage.getItem(userIdKey); }; - Accounts.makeClientLoggedOut = function() { - Accounts.unstoreLoginToken(); + Accounts._makeClientLoggedOut = function() { + Accounts._unstoreLoginToken(); Meteor.default_connection.setUserId(null); Meteor.default_connection.onReconnect = null; }; - Accounts.makeClientLoggedIn = function(userId, token) { - Accounts.storeLoginToken(userId, token); + Accounts._makeClientLoggedIn = function(userId, token) { + Accounts._storeLoginToken(userId, token); Meteor.default_connection.setUserId(userId); Meteor.default_connection.onReconnect = function() { Meteor.apply('login', [{resume: token}], {wait: true}, function(error, result) { if (error) { - Accounts.makeClientLoggedOut(); + Accounts._makeClientLoggedOut(); throw error; } else { // nothing to do @@ -62,21 +62,21 @@ Meteor.loginWithToken = function (token, errorCallback) { throw error; } - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); }); }; if (!Accounts._preventAutoLogin) { // Immediately try to log in via local storage, so that any DDP // messages are sent after we have established our user account - var token = Accounts.storedLoginToken(); + var token = Accounts._storedLoginToken(); if (token) { // On startup, optimistically present us as logged in while the // request is in flight. This reduces page flicker on startup. - var userId = Accounts.storedUserId(); + var userId = Accounts._storedUserId(); userId && Meteor.default_connection.setUserId(userId); Meteor.loginWithToken(token, function () { - Accounts.makeClientLoggedOut(); + Accounts._makeClientLoggedOut(); }); } } @@ -88,7 +88,7 @@ Accounts._pollStoredLoginToken = function() { if (Accounts._preventAutoLogin) return; - var currentLoginToken = Accounts.storedLoginToken(); + var currentLoginToken = Accounts._storedLoginToken(); // != instead of !== just to make sure undefined and null are treated the same if (Accounts._lastLoginTokenWhenPolled != currentLoginToken) { diff --git a/packages/accounts-oauth-helper/oauth_client.js b/packages/accounts-oauth-helper/oauth_client.js index 16dfdacbff..e8d96a3fc9 100644 --- a/packages/accounts-oauth-helper/oauth_client.js +++ b/packages/accounts-oauth-helper/oauth_client.js @@ -47,7 +47,7 @@ callback && callback(new Accounts.LoginCancelledError("Popup closed")); } else { - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); callback && callback(); } }); diff --git a/packages/accounts-password/passwords_client.js b/packages/accounts-password/passwords_client.js index ab4f7b09ab..ac89f20085 100644 --- a/packages/accounts-password/passwords_client.js +++ b/packages/accounts-password/passwords_client.js @@ -22,7 +22,7 @@ return; } - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); callback && callback(undefined, {message: 'Success'}); }); }; @@ -68,7 +68,7 @@ return; } - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); callback && callback(); }); }); @@ -158,7 +158,7 @@ callback && callback(error); } - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); callback && callback(); }); }; diff --git a/packages/accounts-password/passwords_tests.js b/packages/accounts-password/passwords_tests.js index 00a2a4055a..6933d0ac40 100644 --- a/packages/accounts-password/passwords_tests.js +++ b/packages/accounts-password/passwords_tests.js @@ -95,7 +95,7 @@ if (Meteor.isClient) (function () { test.isTrue(result.id); test.isTrue(result.token); // emulate the real login behavior, so as not to confuse test. - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); test.equal(Meteor.user().username, username); })); }, @@ -137,7 +137,7 @@ if (Meteor.isClient) (function () { test.isTrue(result.id); test.isTrue(result.token); // emulate the real login behavior, so as not to confuse test. - Accounts.makeClientLoggedIn(result.id, result.token); + Accounts._makeClientLoggedIn(result.id, result.token); test.equal(Meteor.user().username, username2); })); },