Skip to content

Commit c7a0d5e

Browse files
authored
Enhance logging in OAuth authorization and user check
1 parent 226c9ab commit c7a0d5e

1 file changed

Lines changed: 45 additions & 1 deletion

File tree

  • anyway/views/user_system

anyway/views/user_system/api.py

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,18 @@ def sd_oauth_authorize(provider: str) -> Response:
294294

295295

296296
def oauth_authorize(provider: str, callback_endpoint: str, app_id: int) -> Response:
297+
logger.info(
298+
"oauth_authorize host=%s path=%s app_id=%s is_anonymous=%s user_id=%s user_app=%s cookies=%s referrer=%s",
299+
request.host,
300+
request.path,
301+
app_id,
302+
current_user.is_anonymous,
303+
getattr(current_user, "id", None),
304+
getattr(current_user, "app", None),
305+
list(request.cookies.keys()),
306+
request.referrer,
307+
)
308+
297309
if provider != "google":
298310
return return_json_error(Es.BR_ONLY_SUPPORT_GOOGLE)
299311

@@ -398,8 +410,29 @@ def oauth_callback(provider: str, app_id: int, callback_endpoint: str) -> Respon
398410
if redirect_url_to_check and is_a_safe_redirect_url(redirect_url_to_check):
399411
redirect_url = redirect_url_to_check
400412

413+
logger.info(
414+
"oauth_callback before login_user host=%s path=%s user_id=%s user_app=%s current_is_anonymous=%s current_user_id=%s cookies=%s",
415+
request.host,
416+
request.path,
417+
user.id,
418+
user.app,
419+
current_user.is_anonymous,
420+
getattr(current_user, "id", None),
421+
list(request.cookies.keys()),
422+
)
423+
401424
login_user(user, True)
402-
identity_changed.send(current_app._get_current_object(), identity=Identity(user.id))
425+
426+
logger.info(
427+
"oauth_callback after login_user host=%s path=%s user_id=%s user_app=%s current_is_anonymous=%s current_user_id=%s cookies=%s",
428+
request.host,
429+
request.path,
430+
user.id,
431+
user.app,
432+
current_user.is_anonymous,
433+
getattr(current_user, "id", None),
434+
list(request.cookies.keys()),
435+
)
403436

404437
return redirect(redirect_url, code=HTTPStatus.FOUND)
405438

@@ -450,6 +483,17 @@ def is_user_logged_in(app_id: int) -> Response:
450483
is_logged_in = not current_user.is_anonymous
451484
if is_logged_in and hasattr(current_user, "app") and current_user.app != app_id:
452485
is_logged_in = False
486+
logger.info(
487+
"is_user_logged_in host=%s path=%s app_id=%s is_anonymous=%s user_id=%s user_app=%s cookies=%s res=%s",
488+
request.host,
489+
request.path,
490+
app_id,
491+
current_user.is_anonymous,
492+
getattr(current_user, "id", None),
493+
getattr(current_user, "app", None),
494+
list(request.cookies.keys()),
495+
is_logged_in,
496+
)
453497
return jsonify({"is_user_logged_in": is_logged_in})
454498

455499

0 commit comments

Comments
 (0)