Update app.py

app.py

@@ -37,27 +37,21 @@ detector = dlib.get_frontal_face_detector()
 shape_predictor = dlib.shape_predictor(shape_predictor_path)
 
 # Firebase Authentication
-def authenticate_user(email_or_username, password):
+def authenticate_user(email, password):
     try:
-        # Check if the input is an email
-        if "@" in email_or_username:
-            user = auth.get_user_by_email(email_or_username)
-        else:
-            # If not an email, assume it's a username
-            user = auth.get_user_by_email(email_or_username + "@example.com")  # Assuming the username is unique and we append a dummy domain
-        # The user is successfully fetched, meaning the email/username and password are valid.
+        user = auth.get_user_by_email(email)
+        # The user is successfully fetched, meaning the email and password are valid.
         return True, user
-    except Exception as e:
+    except auth.AuthError as e:
         print(f"Authentication error: {str(e)}")
         return False, None
         
 # Sign-up Functionality
-def create_user(email, username, password):
+def create_user(email, password):
     try:
         user = auth.create_user(
             email=email,
-            password=password,
-            display_name=username  # Using display_name to store the username
+            password=password
         )
         return True, user.uid
     except Exception as e:
@@ -273,13 +267,13 @@ def authenticate_user_ui():
     else:
         option = st.sidebar.radio("Select Option", ["Login", "Sign-Up"])
 
+        email = st.text_input("Enter Email", help="Enter your email address")
+        password = st.text_input("Enter Password", type="password", help="Enter your password")
+
         if option == "Login":
-            st.write("## Login")
-            email = st.text_input("Email or Username", help="Enter your email address or username")
-            password = st.text_input("Password", type="password", help="Enter your password")
             if st.button("Login"):
                 if not email or not password:
-                    st.error("Please enter both email/username and password.")
+                    st.error("Please enter both email and password.")
                 else:
                     success, user = authenticate_user(email, password)
                     if success:
@@ -288,20 +282,17 @@ def authenticate_user_ui():
                         st.success("Authentication successful! You can now manage your set of images and profiles.")
                         main()
                     else:
-                        st.error("Authentication failed. Please check your email/username and password.")
+                        st.error("Authentication failed. Please check your email and password.")
+
         elif option == "Sign-Up":
-            st.write("## Sign-Up")
-            email = st.text_input("Email", help="Enter your email address")
-            username = st.text_input("Username", help="Enter your desired username")
-            password = st.text_input("Password", type="password", help="Enter your password")
             confirm_password = st.text_input("Confirm Password", type="password", help="Re-enter your password for confirmation")
             if st.button("Sign-Up"):
-                if not email or not username or not password or not confirm_password:
+                if not email or not password or not confirm_password:
                     st.error("Please fill all the fields.")
                 elif password != confirm_password:
                     st.error("Passwords do not match.")
                 else:
-                    success, uid = create_user(email, username, password)  # Include username argument here
+                    success, uid = create_user(email, password)
                     if success:
                         st.success(f"User with UID: {uid} created successfully! You can now log in.")
                     else: