Update app.py

app.py

@@ -853,6 +853,14 @@ def initialize_database():
     conn.commit()
     conn.close()
 
+# Email validation
+def is_valid_email(email):
+    regex = r'^\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b'
+    if re.match(regex, email):
+        return True
+    else:
+        return False
+
 # Hashing and checking passwords
 def hash_password(password):
     return bcrypt.hashpw(password.encode(), bcrypt.gensalt())
@@ -861,8 +869,9 @@ def check_password(password, hashed):
     return bcrypt.checkpw(password.encode(), hashed)
 
 # User signup and login functions
-
 def signup_user(email, password):
+    if not is_valid_email(email):
+        return "Invalid email!"
     conn = sqlite3.connect('user_data.db')
     c = conn.cursor()
     try:
@@ -875,6 +884,8 @@ def signup_user(email, password):
         conn.close()
 
 def login_user(email, password, state):
+    if not is_valid_email(email):
+        return "Invalid email!", state
     conn = sqlite3.connect('user_data.db')
     c = conn.cursor()
     c.execute("SELECT password FROM users WHERE email = ?", (email,))
@@ -886,9 +897,9 @@ def login_user(email, password, state):
     else:
         return "Invalid email or password!", state
 
-def logout(state):
-    message, state = logout_user(state)
-    return message, state, "Login"
+def logout_user(state):
+    state['authenticated'] = False
+    return "Logged out successfully!", state
 
 # Define the necessary functions
 def signup(email, password):
@@ -898,6 +909,10 @@ def login(email, password, state):
     message, state = login_user(email, password, state)
     return message, state, "Logout" if state['authenticated'] else "Login"
 
+def logout(state):
+    message, state = logout_user(state)
+    return message, state, "Login", "", ""
+
 # Initialize database
 initialize_database()
 
@@ -926,7 +941,7 @@ with gr.Blocks(theme='Pijush2023/scikit-learn-pijush') as demo:
                 login_button = gr.Button("Login")
                 login_output = gr.Textbox(interactive=False, label="Output")
                 login_button.click(login, inputs=[login_email, login_password, state], outputs=[login_output, state, login_button])
-                login_button.click(logout, inputs=[state], outputs=[login_output, state, login_button], show_progress=False)
+                login_button.click(logout, inputs=[state], outputs=[login_output, state, login_button, login_email, login_password], show_progress=False)
             
             state = gr.State()
             chatbot = gr.Chatbot([], elem_id="RADAR:Channel 94.1", bubble_full_width=False)