From f7b205bbf655079b4faa9689feabd595f8a11761 Mon Sep 17 00:00:00 2001
From: anxi0uz <yuzkov.a@yandex.ru>
Date: Fri, 20 Mar 2026 09:26:40 +0500
Subject: [PATCH] /me endpoint and slightly refactored auth

---
 internal/handler/server_impl.go |  2 +-
 internal/handler/user.go        | 36 ++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/internal/handler/server_impl.go b/internal/handler/server_impl.go
index d4ac264..f549f50 100644
--- a/internal/handler/server_impl.go
+++ b/internal/handler/server_impl.go
@@ -158,7 +158,7 @@ func (s *Server) JSON(w http.ResponseWriter, r *http.Request, status int, payloa
 		Success:   &success,
 		Data:      &map[string]interface{}{respType: payload},
 	}
-	w.Header().Set("Content-Type", "applicaton/json; charset=utf-8")
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(status)
 
 	if err := json.NewEncoder(w).Encode(resp); err != nil {
diff --git a/internal/handler/user.go b/internal/handler/user.go
index e41866b..883af13 100644
--- a/internal/handler/user.go
+++ b/internal/handler/user.go
@@ -51,7 +51,12 @@ func (s *Server) AuthLogin(w http.ResponseWriter, r *http.Request) {
 		s.JSON(w, r, http.StatusBadRequest, "Неверный пароль", "error")
 		return
 	}
-
+	now := time.Now()
+	user.LastLoginAt = &now
+	user.UpdatedAt = now
+	err = storage.Update(ctx, "users", user, s.DB, func(sb *sqlbuilder.UpdateBuilder) {
+		sb.Where(sb.Equal("id", user.ID))
+	})
 	s.issueTokens(w, r, user)
 }
 
@@ -171,7 +176,30 @@ func (s *Server) AuthRegister(w http.ResponseWriter, r *http.Request) {
 	s.issueTokens(w, r, &user)
 }
 func (s *Server) DeleteMe(w http.ResponseWriter, r *http.Request) {}
-func (s *Server) GetMe(w http.ResponseWriter, r *http.Request)    {}
+func (s *Server) GetMe(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+
+	claimsValue := ctx.Value("user")
+	claims, ok := claimsValue.(*Claims)
+	if !ok {
+		slog.ErrorContext(ctx, "Error while converting claims", slog.Any("claims", claimsValue))
+		s.JSON(w, r, http.StatusInternalServerError, "Internal server error", "error")
+		return
+	}
+
+	userID := claims.ID
+	user, err := storage.GetOne[models.User](ctx, s.DB, "users", func(sb *sqlbuilder.SelectBuilder) {
+		sb.Where(sb.Equal("id", userID))
+	})
+	if err != nil {
+		slog.ErrorContext(ctx, "No user was found with that id",
+			slog.String("id", userID.String()),
+			slog.String("error", err.Error()))
+		s.JSON(w, r, http.StatusInternalServerError, "invalid user id", "error")
+		return
+	}
+	s.JSON(w, r, http.StatusOK, user, "ok")
+}
 func (s *Server) UpdateMe(w http.ResponseWriter, r *http.Request) {}
 
 func (s *Server) issueTokens(w http.ResponseWriter, r *http.Request, user *models.User) {
@@ -184,6 +212,7 @@ func (s *Server) issueTokens(w http.ResponseWriter, r *http.Request, user *model
 	if err != nil {
 		slog.ErrorContext(r.Context(), "generate refresh token failed", slog.String("error", err.Error()))
 		s.JSON(w, r, http.StatusInternalServerError, "Failure during generating tokens", "error")
+		return
 	}
 
 	key := "access_token:" + access
@@ -215,6 +244,7 @@ func (s *Server) issueTokens(w http.ResponseWriter, r *http.Request, user *model
 	s.JSON(w, r, http.StatusOK, map[string]any{
 		"access_token": access,
 		"expires_in":   86400,
+		"user":         user,
 	}, "auth")
 }
 
@@ -271,5 +301,5 @@ func (s *Server) GenerateUserSlug(username string, uuid uuid.UUID) string {
 
 	base := slug.Make(username)
 
-	return base + uuid.String()
+	return base + "-" + uuid.String()
 }