Fix defaultUrl sending hash content (#1132)

Author: luisrudge

src/__tests__/core/index.test.js

@@ -1,16 +1,44 @@
 import Immutable from 'immutable';
 import { dataFns } from '../../utils/data_utils';
+import { clientID, domain } from '../../core/index';
+import { initI18n } from '../../i18n';
+import { setURL } from '../testUtils';
 
 const setResolvedConnection = (...params) => require('core/index').setResolvedConnection(...params);
+const setup = (...params) => require('core/index').setup(...params);
 
 const mockLock = 'm';
 let mockSet;
+let mockInit;
+
+jest.mock('i18n', () => ({
+  initI18n: jest.fn()
+}));
+
 jest.mock('utils/data_utils', () => ({
   dataFns: () => ({
-    set: mockSet
+    get: jest.fn(),
+    set: mockSet,
+    init: mockInit
   })
 }));
 
+describe('setup', () => {
+  beforeEach(() => {
+    mockInit = jest.fn();
+    jest.resetModules();
+  });
+  it('default redirectUrl should not include location.hash', () => {
+    setURL('https://test.com/path/#not-this-part');
+    const options = {};
+    setup('id', 'clientID', 'domain', options, 'hookRunner', 'emitEventFn');
+    const { mock } = mockInit;
+    expect(mock.calls.length).toBe(1);
+    const model = mock.calls[0][1].toJS();
+    expect(model.auth.redirectUrl).toBe('https://test.com/path/');
+  });
+});
+
 describe('setResolvedConnection', () => {
   beforeEach(() => {
     mockSet = jest.fn();

src/__tests__/testUtils.js

@@ -26,3 +26,25 @@ export const mockComponent = (type, domElement = 'div') => props =>
 
 export const extractPropsFromWrapper = (wrapper, index = 0) =>
   removeDataFromProps(wrapper.find('div').at(index).props());
+
+//set urls with jest: https://github.com/facebook/jest/issues/890#issuecomment-298594389
+export const setURL = url => {
+  const parser = document.createElement('a');
+  parser.href = url;
+  [
+    'href',
+    'protocol',
+    'host',
+    'hostname',
+    'origin',
+    'port',
+    'pathname',
+    'search',
+    'hash'
+  ].forEach(prop => {
+    Object.defineProperty(window.location, prop, {
+      value: parser[prop],
+      writable: true
+    });
+  });
+};

src/core/index.js

@@ -266,7 +266,7 @@ function extractAuthOptions(options) {
   // if responseType was not set and there is a redirectUrl, it defaults to code. Otherwise token.
   responseType = typeof responseType === 'string' ? responseType : redirectUrl ? 'code' : 'token';
   // now we set the default because we already did the validation
-  redirectUrl = redirectUrl || window.location.href;
+  redirectUrl = redirectUrl || `${window.location.origin}${window.location.pathname}`;
 
   sso = typeof sso === 'boolean' ? sso : true;