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

@@ -1,23 +1,10 @@
 import logging
 
-from flask import (
-    Blueprint,
-    request,
-    jsonify,
-    make_response,
-    redirect,
-    session,
-)
+from flask import Blueprint, request, jsonify, make_response, session
 from mxcubeweb.core.util import networkutils
 from flask_login import current_user
 
 
-def deny_access(msg):
-    resp = jsonify({"msg": msg})
-    resp.code = 409
-    return resp
-
-
 def init_route(app, server, url_prefix):
     bp = Blueprint("login", __name__, url_prefix=url_prefix)
 
@@ -45,15 +32,17 @@ 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,
                 str(ex),
             )
             logging.getLogger("MX3.HWR").exception("")
             logging.getLogger("MX3.HWR").info(msg)
-            res = deny_access("Could not authenticate")
+            res = make_response(jsonify({"msg": "Could not authenticate"}), 200)
+        else:
+            res = make_response(jsonify({"msg": ""}), 200)
 
         session.permanent = True
 
@@ -66,8 +55,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 +76,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
 

test/test_authn.py

@@ -77,8 +77,6 @@ def client(make_client):
 def test_authn_signin_good_credentials(client):
     resp = client.post(URL_SIGNIN, json=CREDENTIALS_0)
     assert resp.status_code == 200
-    assert resp.json["code"] == "ok"
-    assert resp.json["msg"] == "Successful login"
 
 
 def test_authn_signin_wrong_credentials(client):
@@ -90,11 +88,9 @@ def test_authn_signin_wrong_credentials(client):
 
 def test_authn_signout(client):
     resp = client.post(URL_SIGNIN, json=CREDENTIALS_0)
-    assert resp.json["code"] == "ok"
 
     resp = client.get(URL_SIGNOUT)
-    assert resp.status_code == 302
-    assert resp.headers["Location"] == "/login"
+    assert resp.status_code == 200
 
 
 def test_authn_info(client, login_type):
@@ -104,8 +100,7 @@ def test_authn_info(client, login_type):
     and true after successful authentication.
     """
     resp = client.get(URL_INFO)
-    assert resp.status_code == 200
-    assert resp.json["loggedIn"] == False
+    assert resp.status_code == 401
 
     client.post(URL_SIGNIN, json=CREDENTIALS_0)
 
@@ -127,13 +122,14 @@ def test_authn_same_proposal(make_client):
 
     client_0 = make_client()
     resp = client_0.post(URL_SIGNIN, json=CREDENTIALS_0)
-    assert resp.json["code"] == "ok"
+
+    assert resp.status_code == 200
     resp = client_0.get(URL_INFO)
     assert resp.json["user"]["inControl"] == True
 
     client_1 = make_client()
     resp = client_1.post(URL_SIGNIN, json=CREDENTIALS_0)
-    assert resp.json["code"] == "ok"
+    assert resp.status_code == 200
     resp = client_1.get(URL_INFO)
     assert resp.json["user"]["inControl"] == False
 
@@ -146,12 +142,11 @@ def test_authn_different_proposals(make_client):
     If a user signs in for a different proposal than an already signed in user,
     this user should not be allowed to sign in.
     """
-
     client_0 = make_client()
     resp = client_0.post(URL_SIGNIN, json=CREDENTIALS_0)
-    assert resp.json["code"] == "ok"
+    assert resp.status_code == 200
     resp = client_0.get(URL_INFO)
-    assert resp.json["user"]["inControl"] == True
+    assert resp.status_code == 200
 
     client_1 = make_client()
     resp = client_1.post(URL_SIGNIN, json=CREDENTIALS_1)
@@ -181,19 +176,17 @@ def test_authn_session_timeout(client):
 
     # Check that the session still has not expired
     resp = client.get(URL_INFO)
+    assert resp.status_code == 200
     assert resp.json["loggedIn"] == True, "Session did not refresh"
 
     # Let the session expire completely
     time.sleep(SESSION_LIFETIME * 1.5)
 
     # Check that the session has expired
     resp = client.get(URL_INFO)
-    assert resp.json["loggedIn"] == False, "Session did not expire"
+    assert resp.status_code == 401, "Session did not expire"
 
     # Check that it is possible to sign in again
     client.post(URL_SIGNIN, json=CREDENTIALS_0)
     resp = client.get(URL_INFO)
     assert resp.json["loggedIn"] == True, "We can not login again"
-
-
-# EOF

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 }));
       });