Merge pull request #61 from CS222-UIUC/aden/fix-oauth

fix oauth …

src/backend/app.py

@@ -50,12 +50,12 @@ def authorize():
     resp.raise_for_status()  # check status code
     user_info = resp.json()  # convert to json
     # query database for username and create session
-    page = UserPage(user_info["email"])
-    session["username"] = page.get_user(user_info["email"]).username
-    return (
-        redirect("http://localhost:3000"),
-        301,
-    )  # necessary status code for Flask to auto-redirect
+    get = UserPage("").get_user(user_info["email"])
+    if get.email != "" and get.user_id != "":
+        session["username"] = get.username
+        return redirect("http://localhost:3000"), 301
+    # necessary status code for Flask to auto-redirect
+    return redirect("http://localhost:3000/login"), 301
 
 
 @app.route("/login", methods=["GET", "POST"])

src/backend/pages/mainpage.py

@@ -284,15 +284,13 @@ def delete_apartment_review(self, apt_id: int, user: str) -> List[Review]:
     def check_user_reviewed(self, apt_id: int, user: str) -> bool:
         """Check if review exists for an user"""
         user_id = self.get_user_id_from_user(user)
-        print(user_id)
         review = self.check_user_reviewed.cursor.execute(
             "SELECT * FROM Reviews WHERE (apt_id = ? AND user_id = ?)",
             (
                 apt_id,
                 user_id,
             ),
         ).fetchone()
-        print(review)
         return review is not None
 
     @use_database

src/backend/pages/userpage.py

@@ -16,7 +16,7 @@ def __init__(self, name: str) -> None:
 
     @use_database
     def get_user(self, query_sql: str) -> User:
-        """Return User object based on username"""
+        """Return User object based on username or email"""
         user_query = self.get_user.cursor.execute(
             "SELECT u.user_id, u.username, u.password, u.email, u.phone \
             FROM USERS u\