Use domain URL for client settings instead of CDN

Author: Steve Hobbs

src/__tests__/core/index.test.js

@@ -29,6 +29,7 @@ describe('setup', () => {
     mockInit = jest.fn();
     jest.resetModules();
   });
+
   it('default redirectUrl should not include location.hash', () => {
     setURL('https://test.com/path/#not-this-part');
     const options = {};
@@ -38,6 +39,7 @@ describe('setup', () => {
     const model = mock.calls[0][1].toJS();
     expect(model.auth.redirectUrl).toBe('https://test.com/path/');
   });
+
   it('default redirectUrl should work when `window.location.origin` is not available', () => {
     setURL('https://test.com/path/#not-this-part', { noOrigin: true });
     const options = {};
@@ -47,19 +49,106 @@ describe('setup', () => {
     const model = mock.calls[0][1].toJS();
     expect(model.auth.redirectUrl).toBe('https://test.com/path/');
   });
+
   it('should work with redirect:false and responseType:id_token', () => {
     const options = {
       auth: {
         redirect: false,
         responseType: 'id_token'
       }
     };
+
     setup('id', 'clientID', 'domain', options, 'hookRunner', 'emitEventFn', 'handleEventFn');
     const { mock } = mockInit;
     expect(mock.calls.length).toBe(1);
     const model = mock.calls[0][1].toJS();
     expect(model).toMatchSnapshot();
   });
+
+  it('default clientBaseUrl should use the specified domain', () => {
+    const { mock } = mockInit;
+
+    setup(
+      'id',
+      'clientID',
+      'my-tenant.us.auth0.com',
+      {},
+      'hookRunner',
+      'emitEventFn',
+      'handleEventFn'
+    );
+
+    expect(mock.calls.length).toBe(1);
+
+    const model = mock.calls[0][1].toJS();
+    expect(model.clientBaseUrl).toBe('https://my-tenant.us.auth0.com');
+  });
+
+  it('clientBaseUrl should use clientBaseUrl if given', () => {
+    const { mock } = mockInit;
+
+    setup(
+      'id',
+      'clientID',
+      'my-tenant.us.auth0.com',
+      {
+        clientBaseUrl: 'https://client-base-url.example.com',
+        configurationBaseUrl: 'https://config-base-url.example.com',
+        assetsUrl: 'https://assets-url.example.com'
+      },
+      'hookRunner',
+      'emitEventFn',
+      'handleEventFn'
+    );
+
+    expect(mock.calls.length).toBe(1);
+
+    const model = mock.calls[0][1].toJS();
+    expect(model.clientBaseUrl).toBe('https://client-base-url.example.com');
+  });
+
+  it('clientBaseUrl should use configurationBaseUrl if given', () => {
+    const { mock } = mockInit;
+
+    setup(
+      'id',
+      'clientID',
+      'my-tenant.us.auth0.com',
+      {
+        configurationBaseUrl: 'https://config-base-url.example.com',
+        assetsUrl: 'https://assets-url.example.com'
+      },
+      'hookRunner',
+      'emitEventFn',
+      'handleEventFn'
+    );
+
+    expect(mock.calls.length).toBe(1);
+
+    const model = mock.calls[0][1].toJS();
+    expect(model.clientBaseUrl).toBe('https://config-base-url.example.com');
+  });
+
+  it('clientBaseUrl should use assetsUrl if given', () => {
+    const { mock } = mockInit;
+
+    setup(
+      'id',
+      'clientID',
+      'my-tenant.us.auth0.com',
+      {
+        assetsUrl: 'https://assets-url.example.com'
+      },
+      'hookRunner',
+      'emitEventFn',
+      'handleEventFn'
+    );
+
+    expect(mock.calls.length).toBe(1);
+
+    const model = mock.calls[0][1].toJS();
+    expect(model.clientBaseUrl).toBe('https://assets-url.example.com');
+  });
 });
 
 describe('setResolvedConnection', () => {

src/core/index.js

@@ -355,18 +355,7 @@ function extractClientBaseUrlOption(opts, domain) {
     return opts.assetsUrl;
   }
 
-  const domainUrl = 'https://' + domain;
-  const hostname = getLocationFromUrl(domainUrl).hostname;
-  const DOT_AUTH0_DOT_COM = '.auth0.com';
-  const AUTH0_US_CDN_URL = 'https://cdn.auth0.com';
-  if (endsWith(hostname, DOT_AUTH0_DOT_COM)) {
-    const parts = hostname.split('.');
-    return parts.length > 3
-      ? 'https://cdn.' + parts[parts.length - 3] + DOT_AUTH0_DOT_COM
-      : AUTH0_US_CDN_URL;
-  } else {
-    return domainUrl;
-  }
+  return `https://${domain}`;
 }
 
 export function extractTenantBaseUrlOption(opts, domain) {

support/index.html

@@ -122,8 +122,8 @@ <h1 class="navbar-brand">
       });
     </script>
     <script>
-      var clientId = 'BWDP9XS89CJq1w6Nzq7iFOHsTh6ChS2b';
-      var domain = 'brucke.auth0.com';
+      var clientId = 'ZmFdFjVeCiluK09Uq5XH08T0ckeqhH5A';
+      var domain = 'auth.elkdanger.co.uk';
       var defaultOptions = {
         mustAcceptTerms: true,
         initialScreen: 'login',