Support demo users

app/queries/connection.py

@@ -2,9 +2,10 @@ from os import getenv
 
 import streamlit as st
 from sqlalchemy.sql import text
-from streamlit.connections import BaseConnection
+from streamlit.connections import SQLConnection
 
-def connection() -> BaseConnection:
+
+def connection() -> SQLConnection:
     _connection = st.connection("sql", url=getenv('DATABASE_URL'), ttl=0, autocommit=True)
     with _connection.session as configured_session:
         configured_session.execute(text('PRAGMA foreign_keys=ON'))

app/queries/crud.py

@@ -139,6 +139,7 @@ def set_theme(theme:str):
             logger.error(e)
             session.rollback()
 
+
 def get_theme() -> str:
     user_id = int(st.session_state.user_id)
     try:

app/queries/user.py

@@ -1,6 +1,7 @@
 import logging
 
 import streamlit as st
+from pandas import DataFrame
 from sqlalchemy.sql import text
 from streamlit.user_info import UserInfoProxy
 
@@ -11,11 +12,9 @@ logger = logging.getLogger(__name__)
 def find_user_by_oidc_id(oidc_user_id):
    return connection().query('SELECT * FROM users WHERE oidc_user_id = :id', params={'id': oidc_user_id})
 
-
 def find_user_by_email(email):
     return connection().query('SELECT * FROM users WHERE email = :email', params={'email': email})
 
-
 def find_default_user():
     return find_user_by_email('default')
 
@@ -30,40 +29,12 @@ def update_default_user(email, name, oidc_user_id):
             raise e
 
 
-def create_user(email, name, oidc_user_id):
+def create_user(email, name, oidc_user_id) -> DataFrame:
     with connection().session as session:
         try:
             logger.info("Creating new user %s", email)
-            query = text('INSERT INTO users (email, name, oidc_user_id) VALUES (:email, :name, :user_id)')
-            session.execute(query, {'email': email, 'name': name, 'user_id': oidc_user_id})
-            return connection().query('SELECT * FROM users WHERE oidc_user_id = :id', params={'id': oidc_user_id})
+            query = text('INSERT INTO users (email, name, oidc_user_id) VALUES (:email, :name, :user_id) RETURNING *')
+            return DataFrame(session.execute(query, {'email': email, 'name': name, 'user_id': oidc_user_id}))
         except Exception as e:
             session.rollback()
             raise e
-
-
-def set_user_in_session(user: UserInfoProxy):
-
-    email = user.email if hasattr(user, "email") else None
-    user_id = user.sub if hasattr(user, "sub") else None
-    name = user.name if hasattr(user, "name") else None
-
-    user_entity = find_user_by_oidc_id(user_id) if user_id else st.dataframe()
-    if user_entity.empty:
-        user_entity = find_user_by_email(email) if email else st.dataframe()
-    if user_entity.empty:
-        user_entity = find_default_user()
-        if user_entity.empty and email and name and user_id:
-            user_entity = create_user(email, name, user_id)
-        elif name:
-            update_default_user(email, name, user_id)
-            user_entity = find_user_by_oidc_id(user_id)
-
-    if not user_entity.empty:
-        st.session_state.user_id = user_entity["id"][0]
-        st.session_state.user_name = user_entity["name"][0]
-        st.session_state.user_email = user_entity["email"][0]
-        st.session_state.user_external_id = user_entity["oidc_user_id"][0]
-        st.session_state.current_theme = user_entity["theme"][0]
-    else:
-        logger.warn("No active user found!")