LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Implemented Oauth in frontend and fixed it in backend

Browse Source
This commit is contained in:
Mawoka
2022-06-11 18:09:47 +02:00
parent 39dce66b78
commit 03a76a448f
6 changed files with 88 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classquiz/oauth/__init__.py
+1
View File
@@ -1,6 +1,7 @@
from fastapi import APIRouter
from classquiz.oauth import google, github
router = APIRouter()
router.include_router(google.router, prefix="/google")
router.include_router(github.router, prefix="/github")
classquiz/oauth/github.py
+7 -14
View File
@@ -7,22 +7,11 @@ from pydantic import BaseModel, ValidationError
from classquiz.auth import check_token, credentials_exception
from classquiz.oauth.authenticate_user import log_user_in, rememberme_check
from datetime import datetime
from classquiz.oauth.init_oauth import init_oauth
settings = settings()
router = APIRouter()
oauth = OAuth()
oauth.register(
name="github",
client_kwargs={"scope": "read:user user:email"},
access_token_url="https://github.com/login/oauth/access_token",
access_token_params=None,
authorize_url="https://github.com/login/oauth/authorize",
authorize_params=None,
api_base_url="https://api.github.com/",
client_id=settings.github_client_id,
client_secret=settings.github_client_secret,
)
class Plan(BaseModel):
@@ -78,6 +67,7 @@ class GitHubOauthResponse(BaseModel):
async def github_login(req: Request):
if settings.github_client_id is None or settings.github_client_secret is None:
raise HTTPException(status_code=501, detail="GitHub-Login isn't available on this server")
oauth = init_oauth()
return await oauth.github.authorize_redirect(req, f"{settings.root_address}/api/v1/users/oauth/github/auth")
@@ -87,7 +77,6 @@ async def auth(request: Request, response: Response):
raise HTTPException(status_code=501, detail="GitHub-Login isn't available on this server")
access_token = request.cookies.get("access_token")
rememberme_token = request.cookies.get("rememberme_token")
print(access_token, rememberme_token)
if access_token is not None:
try:
data = await check_token(access_token)
@@ -97,6 +86,7 @@ async def auth(request: Request, response: Response):
pass
if rememberme_token is not None:
return await rememberme_check(rememberme_token=rememberme_token, response=response)
oauth = init_oauth()
try:
token = await oauth.github.authorize_access_token(request)
except:
@@ -120,4 +110,7 @@ async def auth(request: Request, response: Response):
email=user_data.email, username=user_data.login, auth_type=UserAuthTypes.GITHUB, verified=True
)
return await log_user_in(user=user, request=request, response=response)
await log_user_in(user=user, request=request, response=response)
response.headers.append("Location", "/account/login")
response.status_code = 302
return response
classquiz/oauth/google.py
+8 -11
View File
@@ -1,23 +1,15 @@
from fastapi import APIRouter, Request, HTTPException, Response
from classquiz.config import settings
from authlib.integrations.starlette_client import OAuth
from classquiz.db.models import User, UserAuthTypes
from pydantic import BaseModel, ValidationError
from classquiz.auth import check_token, credentials_exception
from classquiz.oauth.authenticate_user import log_user_in, rememberme_check
from classquiz.oauth.init_oauth import init_oauth
settings = settings()
router = APIRouter()
oauth = OAuth()
oauth.register(
name="github",
server_metadata_url="https://accounts.google.com/.well-known/openid-configuration",
client_kwargs={"scope": "openid email profile"},
client_id=settings.google_client_id,
client_secret=settings.google_client_secret,
)
class Userinfo(BaseModel):
@@ -51,6 +43,8 @@ class OauthGoogleResponse(BaseModel):
async def google_login(req: Request):
if settings.google_client_secret is None or settings.google_client_id is None:
raise HTTPException(status_code=501, detail="Google-Login isn't available on this server")
oauth = init_oauth()
return await oauth.google.authorize_redirect(req, f"{settings.root_address}/api/v1/users/oauth/google/auth")
@@ -60,7 +54,6 @@ async def auth(request: Request, response: Response):
raise HTTPException(status_code=501, detail="Google-Login isn't available on this server")
access_token = request.cookies.get("access_token")
rememberme_token = request.cookies.get("rememberme_token")
print(rememberme_token, access_token)
if access_token is not None:
try:
data = await check_token(access_token)
@@ -70,6 +63,7 @@ async def auth(request: Request, response: Response):
pass
if rememberme_token is not None:
return await rememberme_check(rememberme_token=rememberme_token, response=response)
oauth = init_oauth()
try:
user_data = await oauth.google.authorize_access_token(request)
@@ -97,4 +91,7 @@ async def auth(request: Request, response: Response):
email=user_data.email, google_uid=user_data.sub, auth_type=UserAuthTypes.GOOGLE, verified=True
)
return await log_user_in(user=user, request=request, response=response)
await log_user_in(user=user, request=request, response=response)
response.headers.append("Location", "/account/login")
response.status_code = 302
return response
classquiz/oauth/init_oauth.py
+30
View File
@@ -0,0 +1,30 @@
from authlib.integrations.starlette_client import OAuth
from classquiz.config import settings
from functools import lru_cache
settings = settings()
@lru_cache()
def init_oauth() -> OAuth:
oauth = OAuth()
oauth.register(
name="google",
server_metadata_url="https://accounts.google.com/.well-known/openid-configuration",
client_kwargs={"scope": "openid email profile"},
client_id=settings.google_client_id,
client_secret=settings.google_client_secret,
)
oauth.register(
name="github",
client_kwargs={"scope": "read:user user:email"},
access_token_url="https://github.com/login/oauth/access_token",
access_token_params=None,
authorize_url="https://github.com/login/oauth/authorize",
authorize_params=None,
api_base_url="https://api.github.com/",
client_id=settings.github_client_id,
client_secret=settings.github_client_secret,
)
return oauth
frontend/src/lib/config.ts
+2
View File
@@ -0,0 +1,2 @@
export const google_auth_enabled = import.meta.env.VITE_GOOGLE_AUTH_ENABLED === 'true';
export const github_auth_enabled = import.meta.env.VITE_GITHUB_AUTH_ENABLED === 'true';
frontend/src/routes/account/login.svelte
+40
View File
@@ -27,6 +27,7 @@
import Cookies from 'js-cookie';
import { getLocalization } from '$lib/i18n';
import Footer from '$lib/footer.svelte';
import { google_auth_enabled, github_auth_enabled } from '$lib/config';
const { t } = getLocalization();
@@ -226,6 +227,45 @@
{/if}
</button>
</div>
{#if google_auth_enabled}
<div class="flex items-center justify-center pt-4">
<a
href="/api/v1/users/oauth/google/login"
class="inline-flex w-fit p-1 rounded-lg border-gray-500 border border-2 hover:bg-[#4285F4] transition"
>Google Login
<svg
class="h-6 w-6 ml-4 dark:fill-gray-300"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
><title> Google</title>
<path
d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"
/>
</svg>
</a>
</div>
{/if}
{#if github_auth_enabled}
<div class="flex items-center w-full justify-center pt-4">
<a
href="/api/v1/users/oauth/github/login"
class="inline-flex w-fit p-1 rounded-lg border-gray-500 border border-2 hover:bg-[#181717] transition hover:text-white group"
>GitHub Login
<svg
class="h-6 w-6 ml-4 dark:fill-gray-300 group-hover:fill-white transition"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
><title> GitHub</title>
<path
d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
/>
</svg>
</a>
</div>
{/if}
</div>
</form>
</div>