From 5ce3d7a5df88a370259bde72c1d1eaf43d872459 Mon Sep 17 00:00:00 2001 From: aidynoJ Date: Wed, 5 Feb 2025 16:06:54 +0500 Subject: [PATCH] use tenant, okapiUrl from store in LoginCtrl.js --- src/components/Login/LoginCtrl.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/Login/LoginCtrl.js b/src/components/Login/LoginCtrl.js index 1da37566..246c1f16 100644 --- a/src/components/Login/LoginCtrl.js +++ b/src/components/Login/LoginCtrl.js @@ -18,6 +18,8 @@ class LoginCtrl extends Component { static propTypes = { authFailure: PropTypes.arrayOf(PropTypes.object), ssoEnabled: PropTypes.bool, + okapiUrl: PropTypes.string.isRequired, + tenant: PropTypes.string.isRequired, autoLogin: PropTypes.shape({ username: PropTypes.string.isRequired, password: PropTypes.string.isRequired, @@ -35,9 +37,6 @@ class LoginCtrl extends Component { constructor(props) { super(props); - // store is already available on login page with okapi data - this.okapiUrl = this.constructor.contextType.store.getState().okapi.url; - this.tenant = this.constructor.contextType.store.getState().okapi.tenant; if (props.autoLogin && props.autoLogin.username) { this.handleSubmit(props.autoLogin); } @@ -54,7 +53,7 @@ class LoginCtrl extends Component { } handleSubmit = (data) => { - return requestLogin(this.okapiUrl, this.context.store, this.tenant, data) + return requestLogin(this.props.okapiUrl, this.context.store, this.tenant, data) .then(this.handleSuccessfulLogin) .catch(e => { console.error(e); // eslint-disable-line no-console @@ -62,7 +61,7 @@ class LoginCtrl extends Component { } handleSSOLogin = () => { - requestSSOLogin(this.okapiUrl, this.tenant); + requestSSOLogin(this.props.okapiUrl, this.props.tenant); } render() { @@ -82,6 +81,8 @@ class LoginCtrl extends Component { const mapStateToProps = state => ({ authFailure: state.okapi.authFailure, ssoEnabled: state.okapi.ssoEnabled, + okapiUrl: state.okapi.url, + tenant: state.okapi.tenant, }); const mapDispatchToProps = dispatch => ({ clearAuthErrors: () => dispatch(setAuthError([])),