use oauth

competitions/app.py

@@ -105,6 +105,8 @@ async def oauth_login(request: Request):
 
 @app.get("/use_oauth", response_class=JSONResponse)
 async def use_oauth(request: Request):
+    if request.session.get("oauth_info") is not None:
+        return {"response": 2}
     return {"response": USE_OAUTH}
 
 
@@ -159,6 +161,9 @@ async def get_leaderboard(request: Request, lb: str):
 
 @app.post("/my_submissions", response_class=JSONResponse)
 async def my_submissions(request: Request, user: User):
+    if request.session.get("oauth_info") is not None:
+        user.user_token = request.session.get("oauth_info")["access_token"]
+
     sub = Submissions(
         end_date=COMP_INFO.end_date,
         submission_limit=COMP_INFO.submission_limit,
@@ -206,6 +211,9 @@ async def new_submission(
     if submission_comment is None:
         submission_comment = ""
 
+    # if request.session.get("oauth_info") is not None:
+    #     token = request.session.get("oauth_info")["access_token"]
+
     todays_date = datetime.datetime.now()
     start_date = datetime.datetime.strptime(START_DATE, "%Y-%m-%d")
     if todays_date < start_date:
@@ -235,6 +243,9 @@ async def new_submission(
 
 @app.post("/update_selected_submissions", response_class=JSONResponse)
 def update_selected_submissions(request: Request, user_sub: UserSubmissionUpdate):
+    if request.session.get("oauth_info") is not None:
+        user_sub.user_token = request.session.get("oauth_info")["access_token"]
+
     sub = Submissions(
         end_date=COMP_INFO.end_date,
         submission_limit=COMP_INFO.submission_limit,

competitions/submissions.py

@@ -161,8 +161,8 @@ class Submissions:
         if "error" in user_info:
             raise AuthenticationError("Invalid token")
 
-        if user_info["emailVerified"] is False:
-            raise AuthenticationError("Please verify your email on Hugging Face Hub")
+        # if user_info["emailVerified"] is False:
+        #     raise AuthenticationError("Please verify your email on Hugging Face Hub")
         return user_info
 
     def my_submissions(self, user_token):

competitions/templates/index.html

@@ -263,6 +263,11 @@
                 if (response === 1) {
                     document.getElementById("userToken").style.display = "none";
                     document.getElementById("loginButton").style.display = "block";
+                    document.getElementById("logoutButton").style.display = "none";
+                } else if (response === 2) {
+                    document.getElementById("userToken").style.display = "none";
+                    document.getElementById("loginButton").style.display = "none";
+                    document.getElementById("logoutButton").style.display = "block";
                 }
             });
         }
@@ -392,6 +397,10 @@
                         class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">Login with Hugging
                         Face</a>
                 </li>
+                <li id="logoutButton" style="display: none;">
+                    <a href="/logout"
+                        class="bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded">Logout</a>
+                </li>
             </ul>
 
             <footer>

competitions/utils.py

@@ -16,6 +16,10 @@ from . import HF_URL
 
 
 def user_authentication(token):
+    if token.startswith("hf_oauth"):
+        _api_url = HF_URL + "/oauth/userinfo"
+    else:
+        _api_url = HF_URL + "/api/whoami-v2"
     headers = {}
     cookies = {}
     if token.startswith("hf_"):
@@ -24,7 +28,7 @@ def user_authentication(token):
         cookies = {"token": token}
     try:
         response = requests.get(
-            HF_URL + "/api/whoami-v2",
+            _api_url,
             headers=headers,
             cookies=cookies,
             timeout=3,
@@ -32,7 +36,19 @@ def user_authentication(token):
     except (requests.Timeout, ConnectionError) as err:
         logger.error(f"Failed to request whoami-v2 - {repr(err)}")
         raise Exception("Hugging Face Hub is unreachable, please try again later.")
-    return response.json()
+    resp = response.json()
+    user_info = {}
+    if "error" in resp:
+        return resp
+    if token.startswith("hf_oauth"):
+        user_info["id"] = resp["userinfo"]["sub"]
+        user_info["name"] = resp["userinfo"]["preferred_username"]
+        user_info["orgs"] = []
+    else:
+        user_info["id"] = resp["id"]
+        user_info["name"] = resp["name"]
+        user_info["orgs"] = resp["orgs"]
+    return user_info
 
 
 def make_clickable_user(user_id):