Skip to content

Work with 0.8.2 meteor auth #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 23, 2014
Merged

Work with 0.8.2 meteor auth #5

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
54a8972
fixed twitter's ability to actually signup and login the user in
faceyspacey May 1, 2014
210cba9
Wait for InAppBrowser before patching the window.
jperl Jun 8, 2014
5943c72
Pickup the token and secret from the InAppBrowser's url hash.
jperl Jun 9, 2014
23503f1
Clear the timer in IAB.close to prevent the window from reopening.
jperl Jun 10, 2014
c312e5d
Add oauth and accounts-oauth package dependencies -- access them dire…
jperl Jun 10, 2014
acae34c
Add support for twitter. Close oauth window if the user cancels the a…
jperl Jun 10, 2014
d930983
Prevent window from being patched twice
jperl Jun 11, 2014
dec3420
Add android workaround back, we do need it.
jperl Jun 11, 2014
3621b22
Wrap inappbrowser check in try catch
jperl Jun 11, 2014
5dcacdd
Improve setInterval hack
jperl Jun 20, 2014
badfb93
Add comments
jperl Jun 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add support for twitter. Close oauth window if the user cancels the a… 
…uthentication.

Remove android show setInterval hack because it breaks the behavior of the InAppBrowser closing when the user presses back.
Since loadstop is called without it it is not necessary.
  • Loading branch information
@jperl
jperl committed Jun 10, 2014
commit acae34c50e6add9bc0629e81ae1bdf517cad86fd
43 changes: 19 additions & 24 deletions patch_window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ window.patchWindow = function () {

// Keep a reference to the in app browser's window.open.
var __open = window.open,
oauthWin,
timer;
oauthWin;

// Create an object to return from a monkeypatched window.open call. Handles
// open/closed state of popup to keep Meteor happy. Allows one to save window
Expand All @@ -30,33 +29,31 @@ window.patchWindow = function () {

oauthWin.addEventListener('loadstop', checkIfOauthIsDone);

// use hidden=yes as a hack for Android, allows popup to yield events with
// each #show call. Lets events run on Meteor app, otherwise all listeners
// will *only* run when tapping done button or oauthWin.close
//
// XXX should be a better way to do this
if (device.platform === 'Android') {
timer = setInterval(oauthWin.show, 200);
} else {
oauthWin.show();
}
oauthWin.show();

// check if uri contains an error or code param, then manually close popup
function checkIfOauthIsDone(event) {
// XXX improve this regex to match twitters as well
if (!event.url || !event.url.match(/error|code=/)) return;
// if this is the oauth prompt url, we are not done
if (url === event.url) return;

if (!event.url || !event.url.match(/close|error|code=/)) return;

if (event.url.indexOf('credentialToken') > -1) {
// Get the credentialToken and credentialSecret from the InAppBrowser's url hash.
var hashes = event.url.slice(event.url.indexOf('#') + 1).split('&');
var credentialToken = hashes[0].split('=')[1];

// Get the credentialToken and credentialSecret from the InAppBrowser's url hash.
var hashes = event.url.slice(event.url.indexOf('#') + 1).split('&');
var credentialToken = hashes[0].split('=')[1];
var credentialSecret = hashes[1].split('=')[1];
if (event.url.indexOf('credentialSecret') > -1) {
var credentialSecret = hashes[1].split('=')[1];
OAuth._handleCredentialSecret(credentialToken, credentialSecret);
}

Accounts.oauth.tryLoginAfterPopupClosed(credentialToken);
}

OAuth._handleCredentialSecret(credentialToken, credentialSecret);
Accounts.oauth.tryLoginAfterPopupClosed(credentialToken);
oauthWin.close();

clearInterval(timer);
oauthWin.removeEventListener('loadstop', checkIfOauthIsDone)
oauthWin.removeEventListener('loadstop', checkIfOauthIsDone);
}

this.closed = false;
Expand All @@ -65,8 +62,6 @@ window.patchWindow = function () {
close: function () {
if (!oauthWin) return;

clearInterval(timer);

oauthWin.close();
this.closed = true;
}
Expand Down