Remove redirectUri option and test cordovaRedirectUri

Author: galfert

src/remotestorage.js

@@ -175,10 +175,8 @@ RemoteStorage.prototype = {
    * Initiate the OAuth authorization flow.
    *
    * @param {object} options
-   * @param {string} [options.authURL] - URL to the authorization endpoint
+   * @param {string} [options.authURL] - URL of the authorization endpoint
    * @param {string} [options.scope] - access scope
-   * @param {string} [options.redirectUri] - client URL that should be redirected
-   *                                         to after authorization
    * @param {string} [options.clientId] - client identifier (defaults to the
    *                                      origin of the redirectUri)
    */
@@ -188,9 +186,7 @@ RemoteStorage.prototype = {
       options.scope = this.access.scopeParameter;
     }
 
-    if (typeof options.redirectUri === 'undefined') {
-      options.redirectUri = globalContext.cordova ? config.cordovaRedirectUri : String(Authorize.getLocation());
-    }
+    options.redirectUri = globalContext.cordova ? config.cordovaRedirectUri : String(Authorize.getLocation());
 
     if (typeof options.clientId === 'undefined') {
       options.clientId = options.redirectUri.match(/^(https?:\/\/[^/]+)/)[0];

test/unit/authorize-suite.js

@@ -97,6 +97,7 @@ define([ 'require', './src/authorize', './src/config'], function(require, Author
 
           Authorize.openWindow = function(url, uri) {
             test.assertAnd(uri, redirectUri);
+            delete global.cordova;
             test.done();
           };
 

test/unit/remotestorage-suite.js

@@ -655,7 +655,7 @@ define(['require', 'tv4', './src/eventhandling'], function (require, tv4, eventH
       },
 
       {
-        desc: "#authorize uses the given redirectUri",
+        desc: "#authorize uses the cordovaRedirectUri when in Cordova",
         run: function (env, test) {
           global.document = {
             location: {
@@ -664,14 +664,21 @@ define(['require', 'tv4', './src/eventhandling'], function (require, tv4, eventH
             }
           };
 
-          const authURL = 'https://provider.com/oauth';
-          env.rs.access.claim('contacts', 'r');
+          global.cordova = { foo: 'bar' }; // Pretend we run in Cordova
 
-          env.rs.authorize({ authURL, redirectUri: 'http://my.custom-redirect.url' });
+          global.Authorize.openWindow = function(url, redirectUri) {
+            test.assertAnd(url, 'https://provider.com/oauth?redirect_uri=https%3A%2F%2Fmy.custom-redirect.url&scope=contacts%3Ar&client_id=https%3A%2F%2Fmy.custom-redirect.url&response_type=token');
+            test.assertAnd(redirectUri, 'https://my.custom-redirect.url');
+            delete global.cordova;
+            delete global.document;
+            test.done();
+          };
 
-          test.assert(document.location.href, 'https://provider.com/oauth?redirect_uri=http%3A%2F%2Fmy.custom-redirect.url&scope=contacts%3Ar&client_id=http%3A%2F%2Fmy.custom-redirect.url&response_type=token');
+          const authURL = 'https://provider.com/oauth';
 
-          delete global.document;
+          env.rs.access.claim('contacts', 'r');
+          env.rs.setCordovaRedirectUri('https://my.custom-redirect.url');
+          env.rs.authorize({ authURL });
         }
       },