sprava uzivatelu
This commit is contained in:
+9
-1
@@ -9,7 +9,7 @@ from urllib.request import urlopen
|
||||
from fastapi import APIRouter, Form, Request
|
||||
from fastapi.responses import HTMLResponse, RedirectResponse
|
||||
|
||||
from app.auth import authenticate_user, current_user, find_or_create_oauth_user
|
||||
from app.auth import authenticate_user, current_user, find_or_create_oauth_user, mark_last_login
|
||||
from app.config import (
|
||||
get_gitea_public_url,
|
||||
get_gitea_redirect_uri,
|
||||
@@ -114,12 +114,16 @@ def gitea_callback(request: Request, code: str = "", state: str = "", error: str
|
||||
display_name = (gitea_user.get("full_name") or username).strip()
|
||||
email = (gitea_user.get("email") or "").strip()
|
||||
user = find_or_create_oauth_user(username, display_name, email)
|
||||
if not user.get("is_enabled", 1):
|
||||
_log_gitea_failure("disabled_user", username=username)
|
||||
return _render_login("User is disabled in the portal.")
|
||||
if not user.get("is_active"):
|
||||
_log_gitea_failure("disabled_user", username=username)
|
||||
return _render_login("Uživatel je v portálu vypnutý.")
|
||||
|
||||
request.session.clear()
|
||||
request.session["user_id"] = user["id"]
|
||||
mark_last_login(int(user["id"]))
|
||||
log_audit_event(
|
||||
user,
|
||||
action="auth.gitea.login.success",
|
||||
@@ -201,12 +205,16 @@ def google_callback(request: Request, code: str = "", state: str = "", error: st
|
||||
username = email
|
||||
display_name = (google_user.get("name") or email).strip()
|
||||
user = find_or_create_oauth_user(username, display_name, email)
|
||||
if not user.get("is_enabled", 1):
|
||||
_log_google_failure("disabled_user", username=username)
|
||||
return _render_login("User is disabled in the portal.")
|
||||
if not user.get("is_active"):
|
||||
_log_google_failure("disabled_user", username=username)
|
||||
return _render_login("Uživatel je v portálu vypnutý.")
|
||||
|
||||
request.session.clear()
|
||||
request.session["user_id"] = user["id"]
|
||||
mark_last_login(int(user["id"]))
|
||||
log_audit_event(
|
||||
user,
|
||||
action="auth.google.login.success",
|
||||
|
||||
Reference in New Issue
Block a user