no longer calls pollPopup() for mobile inappbrowser

sahat · Jun 8, 2015 · 1152f48 · 1152f48
1 parent 8f46f3f
commit 1152f48
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/satellizer.js b/satellizer.js
@@ -486,17 +486,22 @@
 
             var url = defaults.authorizationEndpoint + '?' + oauth2.buildQueryString();
 
-            return popup.open(url, defaults.name, defaults.popupOptions, defaults.redirectUri)
-              .pollPopup()
-              .then(function(oauthData) {
-                if (defaults.responseType === 'token') {
-                  return oauthData;
-                }
-                if (oauthData.state && oauthData.state !== storage.get(stateName)) {
-                  return $q.reject('OAuth 2.0 state parameter mismatch.');
-                }
-                return oauth2.exchangeForToken(oauthData, userData);
-              });
+            var openPopup;
+            if (config.platform === 'mobile') {
+              openPopup = popup.open(url, defaults.name, defaults.popupOptions, defaults.redirectUri)
+            } else {
+              openPopup = popup.open(url, defaults.name, defaults.popupOptions, defaults.redirectUri).pollPopup();
+            }
+
+            return openPopup.then(function(oauthData) {
+              if (defaults.responseType === 'token') {
+                return oauthData;
+              }
+              if (oauthData.state && oauthData.state !== storage.get(stateName)) {
+                return $q.reject('OAuth 2.0 state parameter mismatch.');
+              }
+              return oauth2.exchangeForToken(oauthData, userData);
+            });
 
           };
 
@@ -630,6 +635,7 @@
             popup.popupWindow.focus();
           }
 
+
           if (config.platform === 'mobile') {
             return popup.eventListener(redirectUri);
           }