Add user auth

.gitignore

@@ -6,4 +6,5 @@
 __pycache__/
 
 # Ignore secrets
-.streamlit/secrets.toml
+.streamlit/secrets.toml
+.streamlit/gravity-user-db.json

app.py

@@ -1,4 +1,5 @@
 import streamlit as st
+from streamlit_gsheets import GSheetsConnection
 import hmac
 
 # Standard imports
@@ -50,36 +51,47 @@ def check_password():
 
     def password_entered():
         """Checks whether a password entered by the user is correct."""
-        if st.session_state["username"] in st.secrets[
-            "passwords"
-        ] and hmac.compare_digest(
-            st.session_state["password"],
-            st.secrets.passwords[st.session_state["username"]],
-        ):
-            st.session_state["password_correct"] = True
-
-            # Retrieve user name
-            if st.session_state["username"] in st.secrets["users"]:
-                st.session_state["name"] = st.secrets["users"][st.session_state["username"]]
-            else:
-                st.session_state["name"] = st.session_state["username"]
-
-            # Check if the username is an admin
-            if st.session_state["username"] in st.secrets["admins"]['admins']:
-                st.session_state["role"] = "admin"
-            else:
-                st.session_state["role"] = "user"
+        
+        # Create a connection object to Google Sheets
+        conn = st.connection("gsheets", type=GSheetsConnection)
+
+        # Read the user database
+        user_db = conn.read()
+        user_db.dropna(axis=0, how="all", inplace=True)
+        user_db.dropna(axis=1, how="all", inplace=True)
+
+        # Check if the username is in the database
+        if st.session_state["username"] in user_db.username.values:
+
+            st.session_state["username_correct"] = True
+
+            # Check if the password is correct
+            if hmac.compare_digest(
+                st.session_state["password"],
+                user_db.loc[user_db.username == st.session_state["username"], "password"].values[0],
+            ):
+                
+                st.session_state["password_correct"] = True
+                
+                # Check if the username is an admin
+                if st.session_state["username"] in user_db[user_db.role == "admin"].username.values:
+                    st.session_state["role"] = "admin"
+                else:
+                    st.session_state["role"] = "user"
+
+                # Retrieve and store user name and team
+                st.session_state["name"] = user_db.loc[user_db.username == st.session_state["username"], "name"].values[0]
+                st.session_state["team"] = user_db.loc[user_db.username == st.session_state["username"], "team"].values[0]
+
+                # Don't store the username or password
+                del st.session_state["password"]
+                # del st.session_state["username"]
 
-            # Check if username is in a team
-            if st.session_state["username"] in st.secrets["teams"]:
-                st.session_state["team"] = st.secrets["teams"][st.session_state["username"]]
             else:
-                st.session_state["team"] = None
+                st.session_state["password_correct"] = False
 
-            # Don't store the username or password
-            del st.session_state["password"]
-            # del st.session_state["username"]
         else:
+            st.session_state["username_correct"] = False
             st.session_state["password_correct"] = False
 
     # Return True if the username + password is validated
@@ -89,16 +101,16 @@ def check_password():
     # Show inputs for username + password
     login_form()
     if "password_correct" in st.session_state:
-        st.error("😕 User not known or password incorrect.")
+
+        if not st.session_state["username_correct"]:
+            st.error("User not found.")
+        elif not st.session_state["password_correct"]:
+            st.error("The password you entered is incorrect.")
+        else:
+            st.error("An unexpected error occurred.")
+
     return False
 
-# # Selectbox to choose role
-# st.selectbox(
-#     "Select your role:",
-#     [None, "user", "admin", "super-admin"],
-#     key="_role",
-#     on_change=set_role,
-# )
 menu() # Render the dynamic menu!
 
 if not check_password():

menu.py

@@ -7,7 +7,9 @@ def authenticated_menu():
     # Show a navigation menu for authenticated users
     # st.sidebar.page_link("app.py", label="Switch Accounts", icon="🔒")
     st.sidebar.page_link("pages/user.py", label="Profile", icon="👤")
-    st.sidebar.page_link("pages/validate.py", label="Input", icon="✅")
+    st.sidebar.page_link("pages/input.py", label="Input", icon="💡")
+    st.sidebar.page_link("pages/validate.py", label="Validate", icon="✅")
+    st.sidebar.page_link("pages/explore.py", label="Explore", icon="🔍")
     if st.session_state.role in ["admin"]:
         st.sidebar.page_link("pages/admin.py", label="Manage Users", icon="🔧")
 

pages/explore.py

@@ -0,0 +1,15 @@
+import streamlit as st
+from menu import menu_with_redirect
+
+# Path manipulation
+from pathlib import Path
+import sys
+
+# Custom and other imports
+import project_config
+from utils import add_logo
+
+# Redirect to app.py if not logged in, otherwise show the navigation menu
+menu_with_redirect()
+
+st.title("Explore")

pages/input.py

@@ -0,0 +1,15 @@
+import streamlit as st
+from menu import menu_with_redirect
+
+# Path manipulation
+from pathlib import Path
+import sys
+
+# Custom and other imports
+import project_config
+from utils import add_logo
+
+# Redirect to app.py if not logged in, otherwise show the navigation menu
+menu_with_redirect()
+
+st.title("Input")

requirements.txt

@@ -5,4 +5,5 @@ matplotlib
 seaborn
 pathlib
 torch
-altair<5
+altair<5
+st-gsheets-connection