use tenant, okapiUrl from store in LoginCtrl.js

folio-org · Feb 5, 2025 · 5ce3d7a · 5ce3d7a
1 parent 2c94840
commit 5ce3d7a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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,15 +53,15 @@ 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
       });
   }
 
   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([])),