admin/hspguard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: refactor login

Browse Source
This commit is contained in:
Amir Adal
2025-06-11 20:33:49 +02:00
parent 5ea6bc4251
commit 4c318b15cd
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
internal/auth/login.go
View File

@ -2,15 +2,12 @@ package auth
import ( import (
"encoding/json" "encoding/json"
"fmt"
"log" "log"
"net/http" "net/http"
"gitea.local/admin/hspguard/internal/repository" "gitea.local/admin/hspguard/internal/repository"
"gitea.local/admin/hspguard/internal/types"
"gitea.local/admin/hspguard/internal/util" "gitea.local/admin/hspguard/internal/util"
"gitea.local/admin/hspguard/internal/web" "gitea.local/admin/hspguard/internal/web"
"github.com/avct/uasurfer"
) )
type LoginParams struct { type LoginParams struct {
@ -36,12 +33,14 @@ func (h *AuthHandler) login(w http.ResponseWriter, r *http.Request) {
user, err := h.repo.FindUserEmail(r.Context(), params.Email) user, err := h.repo.FindUserEmail(r.Context(), params.Email)
if err != nil { if err != nil {
web.Error(w, "user with provided email does not exists", http.StatusBadRequest) log.Printf("DEBUG: No user found with '%s' email: %v\n", params.Email, err)
web.Error(w, "email or/and password are incorrect", http.StatusBadRequest)
return return
} }
if !util.VerifyPassword(params.Password, user.PasswordHash) { if !util.VerifyPassword(params.Password, user.PasswordHash) {
web.Error(w, "username or/and password are incorrect", http.StatusBadRequest) log.Printf("DEBUG: Incorrect password '%s' for '%s' email: %v\n", params.Password, params.Email, err)
web.Error(w, "email or/and password are incorrect", http.StatusBadRequest)
return return
} }
@ -53,29 +52,8 @@ func (h *AuthHandler) login(w http.ResponseWriter, r *http.Request) {
userAgent := r.UserAgent() userAgent := r.UserAgent()
var deviceInfo types.DeviceInfo ipAddr := util.GetClientIP(r)
deviceInfo := util.BuildDeviceInfo(userAgent, ipAddr)
parsed := uasurfer.Parse(userAgent)
deviceInfo.Browser = parsed.Browser.Name.StringTrimPrefix()
deviceInfo.BrowserVersion = fmt.Sprintf("%d.%d.%d", parsed.Browser.Version.Major, parsed.Browser.Version.Minor, parsed.Browser.Version.Patch)
deviceInfo.DeviceName = fmt.Sprintf("%s %s", parsed.OS.Platform.StringTrimPrefix(), parsed.OS.Name.StringTrimPrefix())
deviceInfo.DeviceType = parsed.DeviceType.StringTrimPrefix()
deviceInfo.OS = parsed.OS.Platform.StringTrimPrefix()
deviceInfo.OSVersion = fmt.Sprintf("%d.%d.%d", parsed.OS.Version.Major, parsed.OS.Version.Minor, parsed.OS.Version.Patch)
deviceInfo.UserAgent = userAgent
if location, err := util.GetLocation(r.RemoteAddr); err != nil {
log.Printf("WARN: Failed to get location from ip (%s): %v\n", r.RemoteAddr, err)
} else {
deviceInfo.Location = fmt.Sprintf("%s, %s, %s", location.Country, location.Region, location.City)
}
serialized, err := json.Marshal(deviceInfo)
if err != nil {
log.Printf("ERR: Failed to serialize device info: %v\n", err)
serialized = []byte{'{', '}'}
}
// Create User Session // Create User Session
session, err := h.repo.CreateUserSession(r.Context(), repository.CreateUserSessionParams{ session, err := h.repo.CreateUserSession(r.Context(), repository.CreateUserSessionParams{
@ -83,17 +61,17 @@ func (h *AuthHandler) login(w http.ResponseWriter, r *http.Request) {
SessionType: "user", SessionType: "user",
ExpiresAt: &refresh.ExpiresAt, ExpiresAt: &refresh.ExpiresAt,
LastActive: nil, LastActive: nil,
IpAddress: &r.RemoteAddr, IpAddress: &ipAddr,
UserAgent: &userAgent, UserAgent: &userAgent,
AccessTokenID: &access.ID, AccessTokenID: &access.ID,
RefreshTokenID: &refresh.ID, RefreshTokenID: &refresh.ID,
DeviceInfo: serialized, DeviceInfo: deviceInfo,
}) })
if err != nil { if err != nil {
log.Printf("ERR: Failedd to create user session after logging in: %v\n", err) log.Printf("ERR: Failed to create user session after logging in: %v\n", err)
} }
log.Printf("INFO: User session created for '%s': %#v\n", user.Email, session) log.Printf("INFO: User session created for '%s' with '%s' id\n", user.Email, session.ID.String())
if err := h.repo.UpdateLastLogin(r.Context(), user.ID); err != nil { if err := h.repo.UpdateLastLogin(r.Context(), user.ID); err != nil {
web.Error(w, "failed to update user's last login", http.StatusInternalServerError) web.Error(w, "failed to update user's last login", http.StatusInternalServerError)