Merge pull request #237 from cozy/fix-auth-old-browsers

Fix auth old browsers
cozy · Dec 4, 2017 · f283160 · f283160
2 parents d8ff8a6 + 6199abb
commit f283160
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/dist/cozy-client.js b/dist/cozy-client.js
@@ -713,6 +713,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	  updateLastSync: settings.updateLastSync
 	};
 
+	var ensureHasReconnectParam = function ensureHasReconnectParam(_url) {
+	  var url = new URL(_url);
+	  if (url.searchParams && !url.searchParams.has('reconnect')) {
+	    url.searchParams.append('reconnect', 1);
+	  } else if (!url.search || url.search.indexOf('reconnect') === -1) {
+	    // Some old navigators do not have the searchParams API
+	    // and it is not polyfilled by babel-polyfill
+	    url.search = url.search + '&reconnect=1';
+	  }
+	  return url.toString();
+	};
+
 	var Client = function () {
 	  function Client(options) {
 	    _classCallCheck(this, Client);
@@ -811,9 +823,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 	        if (_this._oauth) {
 	          if (forceTokenRefresh && _this._clientParams.redirectURI) {
-	            var url = new URL(_this._clientParams.redirectURI);
-	            if (!url.searchParams.has('reconnect')) url.searchParams.append('reconnect', 1);
-	            _this._clientParams.redirectURI = url.toString();
+	            _this._clientParams.redirectURI = ensureHasReconnectParam(_this._clientParams.redirectURI);
 	          }
 	          return auth.oauthFlow(_this, _this._storage, _this._clientParams, _this._onRegistered, forceTokenRefresh);
 	        }

diff --git a/dist/cozy-client.js.map b/dist/cozy-client.js.map
diff --git a/src/index.js b/src/index.js
@@ -133,6 +133,18 @@ const settingsProto = {
   updateLastSync: settings.updateLastSync
 }
 
+const ensureHasReconnectParam = _url => {
+  const url = new URL(_url)
+  if (url.searchParams && !url.searchParams.has('reconnect')) {
+    url.searchParams.append('reconnect', 1)
+  } else if (!url.search || url.search.indexOf('reconnect') === -1) {
+    // Some old navigators do not have the searchParams API
+    // and it is not polyfilled by babel-polyfill
+    url.search = url.search + '&reconnect=1'
+  }
+  return url.toString()
+}
+
 class Client {
   constructor (options) {
     this.data = {}
@@ -220,9 +232,7 @@ class Client {
       }
       if (this._oauth) {
         if (forceTokenRefresh && this._clientParams.redirectURI) {
-          const url = new URL(this._clientParams.redirectURI)
-          if (!url.searchParams.has('reconnect')) url.searchParams.append('reconnect', 1)
-          this._clientParams.redirectURI = url.toString()
+          this._clientParams.redirectURI = ensureHasReconnectParam(this._clientParams.redirectURI)
         }
         return auth.oauthFlow(
           this,