Separated login and login_info routes

mxcubeweb/core/components/user/usermanager.py

@@ -181,8 +181,6 @@ def login(self, login_id: str, password: str):
             msg = "User %s signed in" % user.username
             logging.getLogger("MX3.HWR").info(msg)
 
-            return login_res["status"]
-
     # Abstract method to be implemented by concrete implementation
     def _signout(self):
         pass
@@ -212,6 +210,7 @@ def signout(self):
 
         self.app.server.user_datastore.deactivate_user(user)
         flask_security.logout_user()
+
         self.emit_observers_changed()
 
     def is_authenticated(self):
@@ -227,22 +226,6 @@ def force_signout_user(self, username):
             self.app.server.emit("forceSignout", room=socketio_sid, namespace="/hwr")
 
     def login_info(self):
-        res = {
-            "synchrotronName": HWR.beamline.session.synchrotron_name,
-            "beamlineName": HWR.beamline.session.beamline_name,
-            "loggedIn": False,
-            "loginType": HWR.beamline.lims.loginType.title(),
-            "proposalList": [],
-            "user": {
-                "username": "",
-                "email": "",
-                "isstaff": False,
-                "nickname": "",
-                "inControl": False,
-                "ip": "",
-            },
-        }
-
         if not current_user.is_anonymous:
             login_info = convert_to_dict(json.loads(current_user.limsdata))
 
@@ -275,8 +258,10 @@ def login_info(self):
             )
 
             res["selectedProposalID"] = HWR.beamline.session.proposal_id
+        else:
+            raise Exception("Not logged in")
 
-        return current_user, res
+        return res
 
     def update_user(self, user):
         self.app.server.user_datastore.put(user)

mxcubeweb/routes/login.py

@@ -5,16 +5,14 @@
     request,
     jsonify,
     make_response,
-    redirect,
-    session,
 )
 from mxcubeweb.core.util import networkutils
 from flask_login import current_user
 
 
 def deny_access(msg):
     resp = jsonify({"msg": msg})
-    resp.code = 409
+    resp.code = 401
     return resp
 
 
@@ -45,7 +43,7 @@ def login():
         password = params.get("password", "")
 
         try:
-            res = jsonify(app.usermanager.login(login_id, password))
+            app.usermanager.login(login_id, password)
         except Exception as ex:
             msg = "[LOGIN] User %s could not login (%s)" % (
                 login_id,
@@ -54,8 +52,8 @@ def login():
             logging.getLogger("MX3.HWR").exception("")
             logging.getLogger("MX3.HWR").info(msg)
             res = deny_access("Could not authenticate")
-
-        session.permanent = True
+        else:
+            res = make_response(jsonify(""), 200)
 
         return res
 
@@ -66,8 +64,7 @@ def signout():
         Signout from MXCuBE Web and reset the session
         """
         app.usermanager.signout()
-
-        return redirect("/login", code=302)
+        return make_response(jsonify(""), 200)
 
     @bp.route("/login_info", methods=["GET"])
     def login_info():
@@ -88,16 +85,14 @@ def login_info():
 
         Status code set to:
         200: On success
-        409: Error, could not log in
+        401: Error, could not log in
         """
-        user, res = app.usermanager.login_info()
 
-        # Redirect the user to login page if for some reason logged out
-        # i.e. server restart
-        if not user:
-            response = redirect("/login", code=302)
-        else:
+        try:
+            res = app.usermanager.login_info()
             response = jsonify(res)
+        except Exception:
+            response = make_response(jsonify(""), 401)
 
         return response
 

ui/package.json

@@ -58,7 +58,7 @@
     "react-redux": "7.2.6",
     "react-router": "^6.2.1",
     "react-router-bootstrap": "^0.26.1",
-    "react-router-dom": "^6.2.2",
+    "react-router-dom": "^6.19.0",
     "react-slick": "^0.29.0",
     "react-sticky": "^6.0.3",
     "redux": "4.1.2",

ui/src/actions/general.js

@@ -82,9 +82,12 @@ function notify(error) {
   console.error('REQUEST FAILED', error); // eslint-disable-line no-console
 }
 
-export function getInitialState(userInControl) {
-  return (dispatch) => {
+export function getInitialState() {
+  return (dispatch, getState) => {
     const state = {};
+    const { login } = getState();
+
+    dispatch(applicationFetched(false));
 
     const sampleVideoInfo = fetch('mxcube/api/v0.1/sampleview/camera', {
       method: 'GET',
@@ -232,7 +235,7 @@ export function getInitialState(userInControl) {
     });
 
     /* don't unselect shapes when in observer mode */
-    if (userInControl) {
+    if (login.user.userInControl) {
       prom = prom.then(() => {
         dispatch(unselectShapes({ shapes: state.shapes }));
       });

ui/src/actions/login.js

@@ -1,5 +1,5 @@
 /* eslint-disable promise/catch-or-return */
-/* eslint-disable promise/no-nesting */
+
 /* eslint-disable promise/prefer-await-to-then */
 
 import fetch from 'isomorphic-fetch';
@@ -67,50 +67,39 @@ export function startSession(userInControl) {
 }
 
 export function getLoginInfo() {
-  return (dispatch) =>
-    fetchLoginInfo().then(
-      (loginInfo) => {
-        dispatch(setLoginInfo(loginInfo));
-        return loginInfo;
-      },
-      () => {
-        dispatch(showErrorPanel(true));
-        dispatch(setLoading(false));
-      },
-    );
+  return async (dispatch) => {
+    try {
+      const loginInfo = await fetchLoginInfo();
+      dispatch(setLoginInfo(loginInfo));
+    } catch (error) {
+      dispatch(
+        setLoginInfo({
+          beamlineName: '',
+          synchrotronName: '',
+          loginType: '',
+          user: '',
+          proposalList: [],
+          selectedProposal: '',
+          selectedProposalID: '',
+          loggedIn: false,
+          rootPath: '',
+        }),
+      );
+      dispatch(setLoading(false));
+      throw error;
+    }
+  };
 }
 
 export function logIn(proposal, password, navigate) {
-  // eslint-disable-next-line sonarjs/cognitive-complexity
   return (dispatch) => {
-    const previousUser = localStorage.getItem('currentUser');
-    if (serverIO.hwrSocket !== null && serverIO.hwrSocket.connected) {
-      console.log(serverIO.hwrSocket.connected); // eslint-disable-line no-console
-    } else {
-      serverIO.connect();
-    }
-
-    sendLogIn(proposal, password, previousUser).then(
+    sendLogIn(proposal, password).then(
       (res) => {
-        if (res.code === 'ok') {
+        if (res === '') {
           dispatch(showErrorPanel(false));
-          dispatch(getLoginInfo())
-            .then((response) => response)
-            .then((resp) => {
-              if (resp.loginType === 'User') {
-                if (resp.user.inControl) {
-                  dispatch(showProposalsForm());
-                } else {
-                  navigate('/');
-                }
-              } else {
-                dispatch(selectProposal(proposal));
-                navigate('/');
-              }
-            });
+          navigate('/');
         } else {
-          const { msg } = res;
-          dispatch(showErrorPanel(true, msg));
+          dispatch(showErrorPanel(true, res));
           dispatch(setLoading(false));
         }
       },
@@ -125,23 +114,18 @@ export function logIn(proposal, password, navigate) {
 export function forcedSignout() {
   return (dispatch) => {
     serverIO.disconnect();
-    localStorage.setItem('currentUser', '');
-
     dispatch({ type: 'SIGNOUT' });
   };
 }
 
 export function signOut(navigate) {
   return (dispatch) => {
     serverIO.disconnect();
-    localStorage.setItem('currentUser', '');
-
     return sendSignOut().then(() => {
       dispatch({ type: 'SIGNOUT' });
-      dispatch(getLoginInfo());
 
       if (navigate) {
-        navigate('/login');
+        navigate('/');
       }
     });
   };

ui/src/api/login.js

@@ -11,7 +11,12 @@ export function sendSignOut() {
 }
 
 export function fetchLoginInfo() {
-  return endpoint.get('/login_info').json();
+  return endpoint
+    .get('/login_info') // eslint-disable-next-line promise/prefer-await-to-callbacks
+    .unauthorized((err) => {
+      throw err;
+    })
+    .json();
 }
 
 export function sendFeedback(sender, content) {