refactor(urlResolve): return already parsed URLs unchanged

gkalpak · gkalpak · commit da3d96c0ea57 · 2018-04-05T10:11:30.000+03:00
Closes angular#14890
diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js
@@ -39,7 +39,8 @@ var originUrl = urlResolve(window.location.href);
  *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
  *
  * @kind function
- * @param {string} url The URL to be parsed.
+ * @param {string|object} url The URL to be parsed. If `url` is not a string, it will be returned
+ *     unchanged.
  * @description Normalizes and parses a URL.
  * @returns {object} Returns the normalized URL as a dictionary.
  *
@@ -56,6 +57,8 @@ var originUrl = urlResolve(window.location.href);
  *
  */
 function urlResolve(url) {
+  if (!isString(url)) return url;
+
   var href = url;
 
   // Support: IE 9-11 only
@@ -118,7 +121,7 @@ function urlIsAllowedOriginFactory(whitelistedOriginUrls) {
    * @returns {boolean} - Whether the specified URL is of an allowed origin.
    */
   return function urlIsAllowedOrigin(requestUrl) {
-    var parsedUrl = isString(requestUrl) ? urlResolve(requestUrl) : requestUrl;
+    var parsedUrl = urlResolve(requestUrl);
     return parsedAllowedOriginUrls.some(urlsAreSameOrigin.bind(null, parsedUrl));
   };
 }
@@ -134,8 +137,8 @@ function urlIsAllowedOriginFactory(whitelistedOriginUrls) {
  * @returns {boolean} - True if both URLs have the same origin, and false otherwise.
  */
 function urlsAreSameOrigin(url1, url2) {
-  url1 = isString(url1) ? urlResolve(url1) : url1;
-  url2 = isString(url2) ? urlResolve(url2) : url2;
+  url1 = urlResolve(url1);
+  url2 = urlResolve(url2);
 
   return (url1.protocol === url2.protocol &&
           url1.host === url2.host);
diff --git a/test/ng/urlUtilsSpec.js b/test/ng/urlUtilsSpec.js
@@ -2,6 +2,15 @@
 
 describe('urlUtils', function() {
   describe('urlResolve', function() {
+    it('should returned already parsed URLs unchanged', function() {
+      var urlObj = urlResolve('/foo?bar=baz#qux');
+      expect(urlResolve(urlObj)).toBe(urlObj);
+      expect(urlResolve(true)).toBe(true);
+      expect(urlResolve(null)).toBeNull();
+      expect(urlResolve(undefined)).toBeUndefined();
+    });
+
+
     it('should normalize a relative url', function() {
       expect(urlResolve('foo').href).toMatch(/^https?:\/\/[^/]+\/foo$/);
     });
