helloparthshah commited on
Commit
7bc0b90
·
1 Parent(s): 8f5f340

Updated logic routes

Browse files
Files changed (1) hide show
  1. app.py +11 -6
app.py CHANGED
@@ -67,17 +67,20 @@ def get_user(request: Request):
67
 
68
  @app.get('/')
69
  def public(request: Request, user=Depends(get_user)):
 
70
  if user:
71
- return RedirectResponse("/hashiru")
72
  else:
73
- return RedirectResponse("/login-page")
74
 
75
 
76
  @app.get("/login")
77
  async def login(request: Request):
78
  print("Session cookie:", request.cookies.get("session"))
79
  print("Session data:", dict(request.session))
80
- return await oauth.auth0.authorize_redirect(request, request.url_for("auth"), audience=AUTH0_AUDIENCE, prompt="login")
 
 
81
 
82
 
83
  @app.get("/auth")
@@ -86,18 +89,20 @@ async def auth(request: Request):
86
  token = await oauth.auth0.authorize_access_token(request)
87
  print("Token received:", token)
88
  request.session["user"] = token["userinfo"]
89
- return RedirectResponse("/")
90
  except Exception as e:
91
  print("Error during authentication:", str(e))
92
- return JSONResponse({"error": str(e)}, status_code=500)
93
 
94
 
95
  @app.get("/logout")
96
  async def logout(request: Request):
 
 
97
  auth0_logout_url = (
98
  f"https://{AUTH0_DOMAIN}/v2/logout"
99
  f"?client_id={AUTH0_CLIENT_ID}"
100
- f"&returnTo={request.url_for('post-logout')}"
101
  )
102
  return RedirectResponse(auth0_logout_url)
103
 
 
67
 
68
  @app.get('/')
69
  def public(request: Request, user=Depends(get_user)):
70
+ root_url = gr.route_utils.get_root_url(request, "/", None)
71
  if user:
72
+ return RedirectResponse(url=f'{root_url}/hashiru/')
73
  else:
74
+ return RedirectResponse(url=f'{root_url}/login-page')
75
 
76
 
77
  @app.get("/login")
78
  async def login(request: Request):
79
  print("Session cookie:", request.cookies.get("session"))
80
  print("Session data:", dict(request.session))
81
+ root_url = gr.route_utils.get_root_url(request, "/login", None)
82
+ redirect_uri = f"{root_url}/auth"
83
+ return await oauth.auth0.authorize_redirect(request, redirect_uri, audience=AUTH0_AUDIENCE, prompt="login")
84
 
85
 
86
  @app.get("/auth")
 
89
  token = await oauth.auth0.authorize_access_token(request)
90
  print("Token received:", token)
91
  request.session["user"] = token["userinfo"]
92
+ return RedirectResponse("/hashiru")
93
  except Exception as e:
94
  print("Error during authentication:", str(e))
95
+ return RedirectResponse("/")
96
 
97
 
98
  @app.get("/logout")
99
  async def logout(request: Request):
100
+ root_url = gr.route_utils.get_root_url(request, "/logout", None)
101
+ redirect_uri = f"{root_url}/post-logout"
102
  auth0_logout_url = (
103
  f"https://{AUTH0_DOMAIN}/v2/logout"
104
  f"?client_id={AUTH0_CLIENT_ID}"
105
+ f"&returnTo={redirect_uri}"
106
  )
107
  return RedirectResponse(auth0_logout_url)
108