Connect existing user email form and display user name when logged in

src/login.py

@@ -53,10 +53,42 @@ def check_email(email: str) -> bool:
 
 def new_user_form():
     """Form to collect new user information and submit"""
-    with st.form("New User Registration"):
-        st.text_input("Email Address", key="new_user_email")
-        st.text_input("Name", key="new_user_name")
-        st.form_submit_button("Submit", on_click=new_user_submitted)
+    if st.button("Existing User get Login link"):
+        existing_user_new_token()
+    else:
+        """Form to collect new user information and submit"""
+        with st.form("New User Registration"):
+            st.header("New User Registration")
+            st.write("After submitting, a url to login will be emailed to you.")
+            st.text_input("Email Address", key="new_user_email")
+            st.text_input("Name", key="new_user_name")
+            st.form_submit_button("Submit", on_click=new_user_submitted)
+
+
+def existing_user_new_token():
+    with st.form("Existing User New URL"):
+        st.header("Existing User Login Link Request")
+        st.write("After submitting, a url to login will be emailed to you if a user with the email exists.")
+        st.text_input("Email Address", key="reset_token_user_email")
+        st.form_submit_button("Submit", on_click=generate_new_token_request)
+
+
+def generate_new_token_request():
+    if not check_email(email := st.session_state["reset_token_user_email"]):
+        st.warning("Sorry email is invalid.  Please try a valid email address.")
+        return
+
+    conn.update(
+        worksheet="token-requests",
+        data=pd.DataFrame(
+            {
+                "email": email,
+            },
+            index=[0],
+        ),
+    )
+    st.info("Request submitted.  Please check your email for a login url with a few minutes.")
+    del st.session_state["reset_token_user_email"]
 
 
 def create_new_user_request(email: str, name: str):
@@ -88,19 +120,18 @@ def new_user_submitted():
         )
         return
     create_new_user_request(email, name)
+    del st.session_state["new_user_email"]
+    del st.session_state["new_user_name"]
 
 
 def check_password():
     # if not logged in offer new user registration
-    if logged_in_user := st.session_state.get("logged_in_user"):
-        st.write(f"Logged in as: {logged_in_user}")
+    if st.session_state.get("logged_in_user"):
+        _, name = get_logged_in_user_name_email()
+        st.write(f"Logged in as: {name}")
         return True
     else:
         new_user_form()
-
-    # Return True if the token is validated.
-    if st.session_state.get("password_correct", False):
-        return True
     return False
 
 
@@ -134,7 +165,6 @@ def login_by_token(token: str):
     for row in df.itertuples():
         if hmac.compare_digest(row.token, token):
             user_id = int(row.id)
-            st.session_state["password_correct"] = True
             st.session_state["logged_in_user"] = user_id
             return True
     return False
@@ -147,3 +177,20 @@ def email_exists(email: str):
         ttl=1,
     )
     return bool(email in df.email.tolist())
+
+
+def get_logged_in_user_name_email() -> tuple[str | None, str | None]:
+    if not (user_id := st.session_state.get("logged_in_user")):
+        # if not logged
+        return (None, None)
+
+    df = conn.read(
+        worksheet="users",
+        usecols=[0, 1, 2],
+        ttl=1,
+    )
+
+    user_info_series = df[df["id"] == user_id].squeeze()
+    email = user_info_series["email"]
+    name = user_info_series["name"]
+    return email, name