Skip to content

Commit d3bb1a1

Browse files
update to ui routes
1 parent 2eeab2b commit d3bb1a1

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

src/routers/ui_routes.py

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from pathlib import Path
77
import http3
88

9-
109
import src.oauth2 as oauth2
1110
from src.config import Settings
1211
from src import models
@@ -24,12 +23,13 @@
2423
@router.get("/", status_code=status.HTTP_200_OK)
2524
async def home(request: Request, response_model=HTMLResponse):
2625

27-
print ('\n\n\n')
28-
print ('HOME HEADERS')
29-
print (request.headers)
30-
print ('\n\n\n')
26+
auth_token = request.cookies.get('Authorization')
27+
if (auth_token):
28+
# verify = oauth2.get_current_user(auth_token)
29+
return TEMPLATES.TemplateResponse("home/index.html", {"request" : request})
30+
31+
return RedirectResponse(router.url_path_for('signin'))
3132

32-
return TEMPLATES.TemplateResponse("home/index.html", {"request" : request})
3333

3434

3535

@@ -45,26 +45,33 @@ async def signin(request: Request):
4545

4646
base_url = request.base_url
4747
login_url = app.auth_router.url_path_for('login')
48+
home_url = app.ui_router.url_path_for('home')
4849
request_url = base_url.__str__() + login_url.__str__()[1:]
50+
home_url = base_url.__str__() + home_url.__str__()[1:]
4951

5052
http3client = http3.AsyncClient()
5153
response = await http3client.post(request_url, data=form)
5254

5355
if (response.status_code==200):
5456
data = response.json()
5557
token = data['access_token']
56-
headers = {
57-
'Authorization': f'Bearer {token}',
58-
}
59-
print (headers)
60-
# print (headers)
61-
redirect = RedirectResponse(url='/')
58+
59+
redirect = RedirectResponse(url=router.url_path_for('home'))
6260
redirect.status_code = 302
63-
redirect.headers.append('authorization', f'Bearer {token}')
61+
# redirect.delete_cookie('Authorization')
62+
redirect.set_cookie('Authorization', f'Bearer {token}')
63+
# redirect._headers = headers
64+
6465
return redirect
6566

6667
return TEMPLATES.TemplateResponse("accounts/login.html", {"request" : request})
6768

69+
6870
@router.get("/register", status_code=status.HTTP_200_OK)
6971
async def register(request: Request, response_model=HTMLResponse):
7072
return TEMPLATES.TemplateResponse("accounts/register.html", {"request" : request})
73+
74+
75+
@router.post("/register", status_code=status.HTTP_200_OK)
76+
async def register(request: Request, response_model=HTMLResponse):
77+
return TEMPLATES.TemplateResponse("accounts/register.html", {"request" : request})

src/sql_app.db

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)