Abhishek Thakur
commited on
Commit
·
5ccf24c
1
Parent(s):
0bfa106
center text
Browse files- competitions/app.py +13 -0
- competitions/oauth.py +0 -8
- competitions/templates/index.html +5 -3
competitions/app.py
CHANGED
|
@@ -103,6 +103,19 @@ async def oauth_login(request: Request):
|
|
| 103 |
return RedirectResponse("/login/huggingface")
|
| 104 |
|
| 105 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
@app.get("/use_oauth", response_class=JSONResponse)
|
| 107 |
async def use_oauth(request: Request):
|
| 108 |
if request.session.get("oauth_info") is not None:
|
|
|
|
| 103 |
return RedirectResponse("/login/huggingface")
|
| 104 |
|
| 105 |
|
| 106 |
+
@app.get("/logout", response_class=HTMLResponse)
|
| 107 |
+
async def oauth_logout(request: Request):
|
| 108 |
+
"""Endpoint that logs out the user (e.g. delete cookie session)."""
|
| 109 |
+
request.session.pop("oauth_info", None)
|
| 110 |
+
context = {
|
| 111 |
+
"request": request,
|
| 112 |
+
"logo": COMP_INFO.logo_url,
|
| 113 |
+
"competition_type": COMP_INFO.competition_type,
|
| 114 |
+
}
|
| 115 |
+
|
| 116 |
+
return templates.TemplateResponse("index.html", context)
|
| 117 |
+
|
| 118 |
+
|
| 119 |
@app.get("/use_oauth", response_class=JSONResponse)
|
| 120 |
async def use_oauth(request: Request):
|
| 121 |
if request.session.get("oauth_info") is not None:
|
competitions/oauth.py
CHANGED
|
@@ -73,8 +73,6 @@ def _add_oauth_routes(app: fastapi.FastAPI) -> None:
|
|
| 73 |
@app.get("/login/huggingface")
|
| 74 |
async def oauth_login(request: fastapi.Request):
|
| 75 |
"""Endpoint that redirects to HF OAuth page."""
|
| 76 |
-
# Define target (where to redirect after login)
|
| 77 |
-
# redirect_uri = _generate_redirect_uri(request)
|
| 78 |
redirect_uri = request.url_for("auth")
|
| 79 |
redirect_uri_as_str = str(redirect_uri)
|
| 80 |
if redirect_uri.netloc.endswith(".hf.space"):
|
|
@@ -93,12 +91,6 @@ def _add_oauth_routes(app: fastapi.FastAPI) -> None:
|
|
| 93 |
request.session["oauth_info"] = oauth_info
|
| 94 |
return _redirect_to_target(request)
|
| 95 |
|
| 96 |
-
@app.get("/logout")
|
| 97 |
-
async def oauth_logout(request: fastapi.Request) -> RedirectResponse:
|
| 98 |
-
"""Endpoint that logs out the user (e.g. delete cookie session)."""
|
| 99 |
-
request.session.pop("oauth_info", None)
|
| 100 |
-
return _redirect_to_target(request)
|
| 101 |
-
|
| 102 |
|
| 103 |
def _generate_redirect_uri(request: fastapi.Request) -> str:
|
| 104 |
if "_target_url" in request.query_params:
|
|
|
|
| 73 |
@app.get("/login/huggingface")
|
| 74 |
async def oauth_login(request: fastapi.Request):
|
| 75 |
"""Endpoint that redirects to HF OAuth page."""
|
|
|
|
|
|
|
| 76 |
redirect_uri = request.url_for("auth")
|
| 77 |
redirect_uri_as_str = str(redirect_uri)
|
| 78 |
if redirect_uri.netloc.endswith(".hf.space"):
|
|
|
|
| 91 |
request.session["oauth_info"] = oauth_info
|
| 92 |
return _redirect_to_target(request)
|
| 93 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 94 |
|
| 95 |
def _generate_redirect_uri(request: fastapi.Request) -> str:
|
| 96 |
if "_target_url" in request.query_params:
|
competitions/templates/index.html
CHANGED
|
@@ -394,12 +394,14 @@
|
|
| 394 |
</li>
|
| 395 |
<li id="loginButton" style="display: none;">
|
| 396 |
<a href="/login/huggingface" target="_blank"
|
| 397 |
-
class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded">Login
|
|
|
|
|
|
|
| 398 |
Face</a>
|
| 399 |
</li>
|
| 400 |
<li id="logoutButton" style="display: none;">
|
| 401 |
-
<a href="/logout"
|
| 402 |
-
class="bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded">Logout</a>
|
| 403 |
</li>
|
| 404 |
</ul>
|
| 405 |
|
|
|
|
| 394 |
</li>
|
| 395 |
<li id="loginButton" style="display: none;">
|
| 396 |
<a href="/login/huggingface" target="_blank"
|
| 397 |
+
class="flex bg-blue-500 hover:bg-blue-700 text-white text-center font-bold py-2 px-4 rounded">Login
|
| 398 |
+
with
|
| 399 |
+
Hugging
|
| 400 |
Face</a>
|
| 401 |
</li>
|
| 402 |
<li id="logoutButton" style="display: none;">
|
| 403 |
+
<a href="/logout" target=" _blank"
|
| 404 |
+
class="flex bg-red-500 hover:bg-red-700 text-white text-center font-bold py-2 px-4 rounded">Logout</a>
|
| 405 |
</li>
|
| 406 |
</ul>
|
| 407 |
|