Fix incorrect url of login modal when authorization expires.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspace-ui",
-  "version": "9.0.0-dev.4",
+  "version": "9.0.0-dev.5",
   "description": "CollectionSpace user interface for browsers",
   "author": "Ray Lee <ray.lee@lyrasis.org>",
   "license": "ECL-2.0",

src/actions/login.js

@@ -30,7 +30,6 @@ import {
 } from '../constants/actionCodes';
 
 export const LOGIN_WINDOW_NAME = 'cspace-login';
-export const AUTHORIZE_PAGE_URL = '/authorize';
 
 const renewAuth = (config, authCode, authCodeRequestData = {}) => (dispatch) => {
   const {
@@ -266,7 +265,7 @@ export const receiveAuthCode = (
   return dispatch(login(config, authCode, authCodeRequestData));
 };
 
-export const openLoginWindow = () => {
+export const openLoginWindow = (url) => {
   const popupWidth = 550;
   const popupHeight = 800;
 
@@ -277,7 +276,7 @@ export const openLoginWindow = () => {
   const top = (screenHeight - popupHeight) / 2;
 
   const popup = window.open(
-    AUTHORIZE_PAGE_URL,
+    url,
     LOGIN_WINDOW_NAME,
     `width=${popupWidth},height=${popupHeight},left=${left},top=${top}`,
   );

src/components/login/LoginLink.jsx

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, FormattedMessage } from 'react-intl';
 import { Link } from 'react-router-dom';
-import { AUTHORIZE_PAGE_URL } from '../../actions/login';
 import styles from '../../../styles/cspace-ui/LoginLink.css';
 
 const propTypes = {
@@ -13,6 +12,12 @@ const defaultProps = {
   openLoginWindow: null,
 };
 
+const contextTypes = {
+  config: PropTypes.shape({
+    recordTypes: PropTypes.object,
+  }),
+};
+
 const messages = defineMessages({
   label: {
     id: 'loginLink.label',
@@ -26,29 +31,40 @@ const messages = defineMessages({
   },
 });
 
-export default function LoginLink(props) {
+export default function LoginLink(props, context) {
   const {
     openLoginWindow,
   } = props;
 
+  const authorizePath = '/authorize';
+
   let handleClick;
 
   if (openLoginWindow) {
+    const {
+      config,
+    } = context;
+
+    const {
+      basename,
+    } = config;
+
     handleClick = (event) => {
       event.preventDefault();
 
-      openLoginWindow();
+      openLoginWindow(`${basename}${authorizePath}`);
     };
   }
 
   const message = openLoginWindow ? messages.openLabel : messages.label;
 
   return (
-    <Link className={styles.common} to={AUTHORIZE_PAGE_URL} onClick={handleClick}>
+    <Link className={styles.common} to={authorizePath} onClick={handleClick}>
       <FormattedMessage {...message} />
     </Link>
   );
 }
 
 LoginLink.propTypes = propTypes;
 LoginLink.defaultProps = defaultProps;
+LoginLink.contextTypes = contextTypes;