Fix admin automatic auth

dashboard/auth.py

@@ -11,9 +11,7 @@
 
 
 def in_admin_session() -> bool:
-    if st.secrets.get("skip_auth", False):
-        return True
-    return is_user_logged() and st.session_state["user"] == os.environ["ADMIN"]
+    return st.session_state.get("is_admin", False)
 
 
 def is_user_logged() -> bool:
@@ -30,7 +28,15 @@ def login(user):
 
 def _load_user_model():
     email = st.session_state.user
-    st.session_state.user_model = Person.find_one(emails=email)
+    user = Person.find(email=email)
+    is_admin = email == os.environ["ADMIN"]
+    st.session_state.user_model = Person(name='ADMIN', emails=[email])
+    if user:
+        st.session_state.user_model = user[0]
+    if is_admin:
+        st.session_state.is_admin = True
+
+    assert user or is_admin, "If the user is not admin it must be registered"
 
 
 def current_user_model() -> Person:
@@ -48,6 +54,8 @@ def current_user_model() -> Person:
 
 def logout():
     del st.session_state["user"]
+    del st.session_state["user_model"]
+    del st.session_state["is_admin"]
     delete_token_in_cookies()
 
 
@@ -58,6 +66,7 @@ def try_login_using_cookies():
         return login(*credentials)
     return None
 
+
 def authenticate():
     if st.secrets.get("skip_auth", False):
         login(os.environ["ADMIN"])

dashboard/import_csv.py

@@ -1,61 +1,68 @@
-import pandas as pd
-from models import JournalPaper, Journal, Person, ConferencePresentation, Book, BookChapter
 import Levenshtein
+import pandas as pd
+from models import (
+    Book,
+    BookChapter,
+    ConferencePresentation,
+    Journal,
+    JournalPaper,
+    Person,
+)
 
 df = pd.read_csv("/src/data/profesores.csv")
 
 people = Person.all()
 
 matches = {
-    'Jose Luis Castañeda Lorenzo' :  'José Luis Castañeda Lorenzo' ,
-    'Ernesto Alejandro Lopez Cadalso' :  'Ernesto Alejandro López Cadalso' ,
-    'Juan Pablo Consuegra Ayala' :  'Juan Pablo Consuegra Ayala' ,
-    'Suilan Estevez Velarde' :  'Suilan Estévez Velarde' ,
-    'Maria Elvira Fernandez Sa' :  'María Elvira Fernández Sa' ,
-    'Alejandro Piad Morffis' :  'Alejandro Piad Morffis' ,
-    'Carmen Teresa Fernandez Montoto' :  'Carmen Fernández' ,
-    'Lucina Garcia Hernandez' :  'Lucina García' ,
-    'Yudivian Almeida Cruz' :  'Yudivián Almeida Cruz' ,
-    'Luciano Garcia Garrido' :  'Luciano García' ,
-    'Alberto Fernandez Oliva' :  'Alberto Fernández ' ,
-    'Joanna Campbell Amos' :  'Joanna Campbell Amos' ,
-    'Juan Enrique Morales Calvo' :  'Juan Enrique Morales Calvo' ,
-    'Aracelys Garcia Armenteros' :  'Aracelys García Armenteros' ,
-    'Eduardo Quesada Orozco' :  'Eduardo Quesada Orozco' ,
-    'Gemayqzel Bouza Allende' :  'Gemayqzel Bouza Allende' ,
-    'Jose Alejandro Mesejo Chiong' :  'Jose A. Mesejo Chiong' ,
-    'Damian Valdes Santiago' :  'Damian Valdés Santiago' ,
-    'Fernando R. Rodriguez Flores' :  'Fernando Rodriguez Flores' ,
-    'Elianys Garcia - Pola Cordoves' :  'Elianys García-Pola Cordobes' ,
-    'Aymee De Los Angeles Marrero Severo' :  'Aymée Marrero Severo' ,
-    'Julian Sarria Gonzalez' :  'Julián Sarría González' ,
-    'Sofia Behar Jequin' :  'Sofía Behar Jequín' ,
-    'Yanet Garcia Serrano' :  'Yanet Garcia Serrano' ,
-    'Vivian Del R. Sistachs Vega' :  'Vivian del Rosario Sistachs Vega' ,
-    'Carlos Narciso Bouza Herrera' :  'Carlos Bouza Herrera' ,
-    'Sira Maria Allende Alonso' :  'Sira Allende Alonso' ,
-    'Miraida Ferras Ferras' :  'Miraida Ferras Ferras' ,
-    'Marta Lourdes Baguer Diaz Romanach' :  'Marta L. Baguer Diaz-Romanach' ,
-    'Angela Mireya Leon Mecias' :  'Ángela Mireya León Mecías' ,
-    'Frank Michel Enrique Hevia' :  'Frank Michel Enrique Hevia' ,
-    'Wilfredo Morales Lezca' :  'Wilfredo Morales Lezca' ,
-    'Marcel Ernesto Sanchez Aguilar' :  'Marcel Ernesto Sánchez Aguilar' ,
-    'Jorge Estrada Hernandez' :  'Jorge Estrada Hernández' ,
-    'Ernesto Luis Estevanell Valladares' :  'Ernesto Luis Estevanell Valladares' ,
-    'Daniel Alejandro Valdes Perez' :  'Daniel Valdés Pérez' ,
-    'Alejandro Roque Piedra' :  'Alejandro Roque Piedra' ,
-    'Jose Fidel Hernandez Advincula' :  'José Fidel Hernández Advíncula' ,
-    'Celia Tamara Gonzalez Gonzalez' :  'Celia T. González González' ,
-    'Juan Carlos Lopez Realpozo' :  'Juan Pablo Consuegra Ayala' ,
-    'Marleny Soler Martinez' :  'Marleny Soler Martínez' ,
-    'Roxana Cabrera Puig' :  'Roxana Cabrera Puig' ,
-    'Reynaldo Rodriguez Ramos' :  'Reinaldo Rodríguez Ramos' ,
-    'Mariano Rodriguez Ricard' :  'Mariano Rodríguez Ricard' ,
-    'Jose Enrique Valdes Castro' :  'Jose Enrique Valdes Castro' ,
-    'Joaquin  Alberto Herrera Macias' :  'Joaquín Alberto Herrera Macías' ,
-    'Lisset Suarez Plasencia' :  'Lisset Suárez Plasencia' ,
-    'Yeneit Delgado Kios' :  'Yeneit Delgado Kios' ,
-    'Ernesto Alejandro Borrego Rodriguez' :  'Ernesto Borrego Rodríguez' ,
+    "Jose Luis Castañeda Lorenzo": "José Luis Castañeda Lorenzo",
+    "Ernesto Alejandro Lopez Cadalso": "Ernesto Alejandro López Cadalso",
+    "Juan Pablo Consuegra Ayala": "Juan Pablo Consuegra Ayala",
+    "Suilan Estevez Velarde": "Suilan Estévez Velarde",
+    "Maria Elvira Fernandez Sa": "María Elvira Fernández Sa",
+    "Alejandro Piad Morffis": "Alejandro Piad Morffis",
+    "Carmen Teresa Fernandez Montoto": "Carmen Fernández",
+    "Lucina Garcia Hernandez": "Lucina García",
+    "Yudivian Almeida Cruz": "Yudivián Almeida Cruz",
+    "Luciano Garcia Garrido": "Luciano García",
+    "Alberto Fernandez Oliva": "Alberto Fernández ",
+    "Joanna Campbell Amos": "Joanna Campbell Amos",
+    "Juan Enrique Morales Calvo": "Juan Enrique Morales Calvo",
+    "Aracelys Garcia Armenteros": "Aracelys García Armenteros",
+    "Eduardo Quesada Orozco": "Eduardo Quesada Orozco",
+    "Gemayqzel Bouza Allende": "Gemayqzel Bouza Allende",
+    "Jose Alejandro Mesejo Chiong": "Jose A. Mesejo Chiong",
+    "Damian Valdes Santiago": "Damian Valdés Santiago",
+    "Fernando R. Rodriguez Flores": "Fernando Rodriguez Flores",
+    "Elianys Garcia - Pola Cordoves": "Elianys García-Pola Cordobes",
+    "Aymee De Los Angeles Marrero Severo": "Aymée Marrero Severo",
+    "Julian Sarria Gonzalez": "Julián Sarría González",
+    "Sofia Behar Jequin": "Sofía Behar Jequín",
+    "Yanet Garcia Serrano": "Yanet Garcia Serrano",
+    "Vivian Del R. Sistachs Vega": "Vivian del Rosario Sistachs Vega",
+    "Carlos Narciso Bouza Herrera": "Carlos Bouza Herrera",
+    "Sira Maria Allende Alonso": "Sira Allende Alonso",
+    "Miraida Ferras Ferras": "Miraida Ferras Ferras",
+    "Marta Lourdes Baguer Diaz Romanach": "Marta L. Baguer Diaz-Romanach",
+    "Angela Mireya Leon Mecias": "Ángela Mireya León Mecías",
+    "Frank Michel Enrique Hevia": "Frank Michel Enrique Hevia",
+    "Wilfredo Morales Lezca": "Wilfredo Morales Lezca",
+    "Marcel Ernesto Sanchez Aguilar": "Marcel Ernesto Sánchez Aguilar",
+    "Jorge Estrada Hernandez": "Jorge Estrada Hernández",
+    "Ernesto Luis Estevanell Valladares": "Ernesto Luis Estevanell Valladares",
+    "Daniel Alejandro Valdes Perez": "Daniel Valdés Pérez",
+    "Alejandro Roque Piedra": "Alejandro Roque Piedra",
+    "Jose Fidel Hernandez Advincula": "José Fidel Hernández Advíncula",
+    "Celia Tamara Gonzalez Gonzalez": "Celia T. González González",
+    "Juan Carlos Lopez Realpozo": "Juan Pablo Consuegra Ayala",
+    "Marleny Soler Martinez": "Marleny Soler Martínez",
+    "Roxana Cabrera Puig": "Roxana Cabrera Puig",
+    "Reynaldo Rodriguez Ramos": "Reinaldo Rodríguez Ramos",
+    "Mariano Rodriguez Ricard": "Mariano Rodríguez Ricard",
+    "Jose Enrique Valdes Castro": "Jose Enrique Valdes Castro",
+    "Joaquin  Alberto Herrera Macias": "Joaquín Alberto Herrera Macías",
+    "Lisset Suarez Plasencia": "Lisset Suárez Plasencia",
+    "Yeneit Delgado Kios": "Yeneit Delgado Kios",
+    "Ernesto Alejandro Borrego Rodriguez": "Ernesto Borrego Rodríguez",
 }
 
 for i, row in df.iterrows():
@@ -68,7 +75,7 @@
     else:
         person = Person(name=name)
 
-    person.institution="Universidad de La Habana"
+    person.institution = "Universidad de La Habana"
     person.faculty = "Matemática y Computación"
     person.department = department
     person.scientific_grade = academic_grade

dashboard/models/__init__.py

@@ -1,10 +1,9 @@
+from models.custom_model import CustomModel
 from models.data_models.award_model import Award
 from models.data_models.book_chapter_model import BookChapter
 from models.data_models.book_model import Book
 from models.data_models.classes_model import Classes
-from models.data_models.conference_presentation_model import (
-    ConferencePresentation,
-)
+from models.data_models.conference_presentation_model import ConferencePresentation
 from models.data_models.journal_model import Journal
 from models.data_models.journal_paper_model import JournalPaper
 from models.data_models.person_model import Person
@@ -13,4 +12,3 @@
 from models.data_models.research_group_model import ResearchGroup
 from models.data_models.subject_model import Subject
 from models.data_models.thesis_model import Thesis
-from models.custom_model import CustomModel

dashboard/models/custom_model.py

@@ -47,7 +47,6 @@ def with_refs(model_class: ModelT) -> ModelT:
     fields = model_class.__fields__
     for field_name, field in fields.items():
         if isclass(field.type_) and issubclass(field.type_, Ref):
-
             # Function that returns a validator for a Ref[T] field
             def _ref_val_wrapper(field):
                 def ref_val(cls, value):
@@ -62,7 +61,6 @@ def ref_val(cls, value):
             )
 
         elif isclass(field.type_) and issubclass(field.type_, RefList):
-
             # Function that returns a validator for a RefList[T] field
             def _reflist_val_wrapper(field):
                 def ref_list_val(cls, value):

dashboard/models/data_models/book_model.py

@@ -1,7 +1,6 @@
-from pydantic import HttpUrl
-
 from models.custom_model import collection_name, with_refs
 from models.data_models.publication_model import Publication
+from pydantic import HttpUrl
 
 
 @with_refs

dashboard/models/data_models/conference_presentation_model.py

@@ -1,7 +1,6 @@
-from pydantic import HttpUrl
-
 from models.custom_model import collection_name, with_refs
 from models.data_models.publication_model import Publication
+from pydantic import HttpUrl
 
 
 @with_refs

dashboard/models/data_models/journal_model.py

@@ -1,8 +1,7 @@
 from typing import List
 
-from pydantic import Field, HttpUrl
-
 from models.custom_model import CustomModel, collection_name
+from pydantic import Field, HttpUrl
 
 
 @collection_name("journals")

dashboard/models/data_models/journal_paper_model.py

@@ -1,9 +1,8 @@
-from pydantic import HttpUrl
-
 from models.custom_model import Ref, collection_name, with_refs
 from models.data_models.journal_model import Journal
 from models.data_models.person_model import Person
 from models.data_models.publication_model import Publication
+from pydantic import HttpUrl
 
 
 @with_refs

dashboard/models/data_models/project_model.py

@@ -2,7 +2,6 @@
 from typing import List
 
 import streamlit as st
-
 from models.custom_model import CustomModel, Ref, RefList, collection_name, with_refs
 from models.data_models.person_model import Person
 

dashboard/models/permission.py

@@ -9,11 +9,7 @@
 WRITE = 2
 ADMIN = 4
 
-PERMISSIONS = {
-    READ: "Lectura",
-    WRITE: "Escritura",
-    ADMIN: "Administrador"
-}
+PERMISSIONS = {READ: "Lectura", WRITE: "Escritura", ADMIN: "Administrador"}
 
 PERMISSIONS_BY_NAME = {v: k for k, v in PERMISSIONS.items()}
 ALL_PERMISSIONS = reduce(lambda p1, p2: p1 | p2, PERMISSIONS.keys())