Merge pull request #740 from auth0/fix-configuration-url

Fix how the tenant and client info url is build to avoid format issues

package.json

@@ -87,7 +87,8 @@
     "react": "^15.0.0 || ^16.0.0",
     "react-addons-css-transition-group": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0",
-    "trim": "0.0.1"
+    "trim": "0.0.1",
+    "url-join": "^1.1.0"
   },
   "cdn-component": {
     "name": "lock",

src/core/client/settings.js

@@ -1,11 +1,12 @@
+import urljoin from 'url-join';
 import { load } from '../../utils/cdn_utils';
 import * as l from '../index';
 import { initClient } from './index';
 
 export function fetchClientSettings(clientID, clientBaseUrl, cb) {
   load({
     method: "setClient",
-    url: `${clientBaseUrl}/client/${clientID}.js?t${+new Date()}`,
+    url: urljoin(clientBaseUrl, 'client', `${clientID}.js?t${+new Date()}`),
     check: o => o && o.id === clientID,
     cb: cb
   });

src/core/index.js

@@ -1,3 +1,4 @@
+import urljoin from 'url-join';
 import Immutable, { List, Map, Set } from 'immutable';
 import { isSmallScreen } from '../utils/media_utils';
 import { endsWith } from '../utils/string_utils';
@@ -262,7 +263,7 @@ function extractClientBaseUrlOption(opts, domain) {
   }
 }
 
-function extractTenantBaseUrlOption(opts, domain) {
+export function extractTenantBaseUrlOption(opts, domain) {
   if (opts.configurationBaseUrl && typeof opts.configurationBaseUrl === "string") {
     return opts.configurationBaseUrl;
   }
@@ -288,7 +289,7 @@ function extractTenantBaseUrlOption(opts, domain) {
     domain = domainUrl;
   }
 
-  return `${domain}/tenants/v1/${tenant_name}.js`;
+  return urljoin(domain, 'tenants', 'v1', `${tenant_name}.js`);
 }
 
 function extractLanguageBaseUrlOption(opts, domain) {

test/tenantinfo.test.js

@@ -0,0 +1,60 @@
+"use strict";
+import { stub } from 'sinon';
+
+import expect from 'expect.js';
+
+import {extractTenantBaseUrlOption} from '../src/core/index';
+
+describe("extractTenantBaseUrlOption", () => {
+
+  it('should return the configurationBaseUrl', () => {
+
+    var url = extractTenantBaseUrlOption({
+      configurationBaseUrl: 'https://test.com'
+    }, 'me.auth0.com');
+
+    expect(url).to.be('https://test.com')
+
+  });
+
+  it('should return the assetsUrl', () => {
+
+    var url = extractTenantBaseUrlOption({
+      assetsUrl: 'https://test.com'
+    }, 'me.auth0.com');
+
+    expect(url).to.be('https://test.com')
+
+  });
+
+  it('should return the cdn url', () => {
+
+    var url = extractTenantBaseUrlOption({
+
+    }, 'me.auth0.com');
+
+    expect(url).to.be('https://cdn.auth0.com/tenants/v1/me.js')
+
+  });
+
+  it('should return the regionalized cdn url', () => {
+
+    var url = extractTenantBaseUrlOption({
+
+    }, 'me.eu.auth0.com');
+
+    expect(url).to.be('https://cdn.eu.auth0.com/tenants/v1/me.js')
+
+  });
+
+  it('should return the instance url', () => {
+
+    var url = extractTenantBaseUrlOption({
+
+    }, 'auth.random.com');
+
+    expect(url).to.be('https://auth.random.com/tenants/v1/auth.js')
+
+  });
+
+});