Update server.py
Browse files
server.py
CHANGED
@@ -211,24 +211,18 @@ async def login(request: Request):
|
|
211 |
|
212 |
@app.route("/auth")
|
213 |
async def auth(request: Request):
|
214 |
-
|
215 |
-
|
216 |
-
|
217 |
-
|
218 |
-
|
219 |
-
|
220 |
-
|
221 |
-
|
222 |
-
|
223 |
-
user_info =
|
224 |
-
|
225 |
-
|
226 |
-
request.session["user"] = dict(user_info)
|
227 |
-
return RedirectResponse(url="/")
|
228 |
-
except Exception as e:
|
229 |
-
import traceback
|
230 |
-
traceback.print_exc()
|
231 |
-
return PlainTextResponse(f"OAuth error: {e}")
|
232 |
|
233 |
@app.route("/logout")
|
234 |
async def logout(request: Request):
|
|
|
211 |
|
212 |
@app.route("/auth")
|
213 |
async def auth(request: Request):
|
214 |
+
token = await oauth.google.authorize_access_token(request)
|
215 |
+
token_dict = dict(token) # Ensure plain dict
|
216 |
+
print("TOKEN:", token_dict)
|
217 |
+
id_token = token_dict.get("id_token")
|
218 |
+
if id_token:
|
219 |
+
user_info = await oauth.google.parse_id_token(request, token_dict)
|
220 |
+
else:
|
221 |
+
user_info = token_dict.get("userinfo")
|
222 |
+
if not user_info:
|
223 |
+
user_info = await oauth.google.userinfo(request, token=token_dict)
|
224 |
+
request.session["user"] = dict(user_info)
|
225 |
+
return RedirectResponse(url="/")
|
|
|
|
|
|
|
|
|
|
|
|
|
226 |
|
227 |
@app.route("/logout")
|
228 |
async def logout(request: Request):
|