diff --git a/package-lock.json b/package-lock.json index c75cb96c..94f3092b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cspace-ui", - "version": "9.0.0-dev.2", + "version": "9.0.0-dev.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cspace-ui", - "version": "9.0.0-dev.2", + "version": "9.0.0-dev.3", "license": "ECL-2.0", "dependencies": { "classnames": "^2.2.5", diff --git a/package.json b/package.json index 6b24e747..cc9bebe5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cspace-ui", - "version": "9.0.0-dev.2", + "version": "9.0.0-dev.3", "description": "CollectionSpace user interface for browsers", "author": "Ray Lee ", "license": "ECL-2.0", diff --git a/src/actions/cspace.js b/src/actions/cspace.js index c3c3363f..01e33613 100644 --- a/src/actions/cspace.js +++ b/src/actions/cspace.js @@ -33,6 +33,9 @@ export const setSession = (newSession) => { return { type: CSPACE_CONFIGURED, payload: getSession().config(), + meta: { + username: getSession().username(), + }, }; }; diff --git a/src/actions/login.js b/src/actions/login.js index 576fff31..01cf0a80 100644 --- a/src/actions/login.js +++ b/src/actions/login.js @@ -213,14 +213,15 @@ export const login = (config, authCode, authCodeRequestData = {}) => (dispatch, }; /** - * Log in using a fulfilled authorization code request. + * Receive an authorization code from the OAuth server. This will have been sent in a redirect from + * the server, in response to an authorization code request. * * @param {*} config * @param {*} authCodeRequestId * @param {*} authCode * @returns */ -export const loginWithAuthCodeRequest = ( +export const receiveAuthCode = ( config, authCodeRequestId, authCode, diff --git a/src/components/pages/AuthorizedPage.jsx b/src/components/pages/AuthorizedPage.jsx index 17be4dc7..cefdcd33 100644 --- a/src/components/pages/AuthorizedPage.jsx +++ b/src/components/pages/AuthorizedPage.jsx @@ -19,7 +19,7 @@ const propTypes = { location: PropTypes.shape({ search: PropTypes.string, }).isRequired, - loginWithAuthCodeRequest: PropTypes.func.isRequired, + receiveAuthCode: PropTypes.func.isRequired, username: PropTypes.string, }; @@ -167,7 +167,7 @@ export default function AuthorizedPage(props, context = {}) { isPending, isSuccess, location, - loginWithAuthCodeRequest, + receiveAuthCode, username, } = props; @@ -180,7 +180,7 @@ export default function AuthorizedPage(props, context = {}) { const authCodeRequestId = params.get('state'); const authCode = params.get('code'); - loginWithAuthCodeRequest(config, authCodeRequestId, authCode); + receiveAuthCode(config, authCodeRequestId, authCode); }, []); useEffect(() => { diff --git a/src/containers/pages/AuthorizedPageContainer.js b/src/containers/pages/AuthorizedPageContainer.js index fcdd1c08..6163e1e9 100644 --- a/src/containers/pages/AuthorizedPageContainer.js +++ b/src/containers/pages/AuthorizedPageContainer.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; import AuthorizedPage from '../../components/pages/AuthorizedPage'; -import { loginWithAuthCodeRequest } from '../../actions/login'; +import { receiveAuthCode } from '../../actions/login'; import { getLoginUsername, @@ -19,7 +19,7 @@ const mapStateToProps = (state) => ({ }); const mapDispatchToProps = { - loginWithAuthCodeRequest, + receiveAuthCode, }; export default connect( diff --git a/src/reducers/user.js b/src/reducers/user.js index a8cb8b7c..333050ea 100644 --- a/src/reducers/user.js +++ b/src/reducers/user.js @@ -63,7 +63,7 @@ export default (state = Immutable.Map(), action) => { case AUTH_RENEW_FULFILLED: return handleAccountPermsReadFulfilled(state, action); case CSPACE_CONFIGURED: - return state.set('username', action.payload.username); + return state.set('username', action.meta.username); case LOGIN_FULFILLED: return state.set('username', action.meta.username); case LOGOUT_FULFILLED: diff --git a/test/specs/reducers/user.spec.js b/test/specs/reducers/user.spec.js index 0067f30d..67ec9459 100644 --- a/test/specs/reducers/user.spec.js +++ b/test/specs/reducers/user.spec.js @@ -35,7 +35,8 @@ describe('user reducer', () => { const state = reducer(undefined, { type: CSPACE_CONFIGURED, - payload: { + payload: {}, + meta: { username, }, });