d3m0k1d/d3m0k1d.ru
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: update auth and fix url for gitea
Some checks failed
Backend ci / build (push) Failing after 3m12s
Details
Backend ci / build (pull_request) Failing after 3m6s
Details

Browse Source
This commit is contained in:
d3m0k1d
2026-02-12 19:14:23 +03:00
parent 7464828e07
commit 809879971a
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
backend/?_journal_mode=WAL&_busy_timeout=5000&_synchronous=NORMAL&_cache_size=2000&_foreign_keys=ON Normal file
View File

Binary file not shown.

8
backend/internal/handlers/auth_handlers.go
View File

@@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"os" "os"
"gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/auth"
"gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/logger" "gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/logger"
"gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/repositories" "gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/repositories"
"gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/storage" "gitea.d3m0k1d.ru/d3m0k1d/d3m0k1d.ru/backend/internal/storage"
@@ -106,13 +107,10 @@ func (h *AuthHandlers) CallbackGithub(c *gin.Context) {
c.JSON(200, gin.H{"user": ghUser}) c.JSON(200, gin.H{"user": ghUser})
reg := h.repo.Register(c.Request.Context(), ghUser) reg := h.repo.Register(c.Request.Context(), ghUser)
if reg != nil { if reg = nil {
c.JSON(500, gin.H{"error": "database error", "details": reg.Error()}) c.JSON(500, gin.H{"error": "database error", "details": reg.Error()})
err := h.repo.Register(c.Request.Context(), ghUser)
if err != nil {
c.JSON(500, gin.H{"error": "database error", "details": err.Error()})
h.logger.Error("Database eer in gh callback handler")
} }
} }
} }

12
backend/internal/repositories/auth_repository.go
View File

@@ -20,16 +20,20 @@ func NewAuthRepository(db *sql.DB) AuthRepository {
} }
} }
func (a *authRepository) Register(ctx context.Context, user storage.UserReg) error { func (a *authRepository) Register(ctx context.Context, user storage.UserReg) (int, error) {
var id int
_, err := a.db.Exec( _, err := a.db.Exec(
"INSERT INTO users(email, github_id, github_login, avatar_url) VALUES(?, ?, ?, ?)", "INSERT INTO users(email, github_id, github_login, avatar_url) VALUES(?, ?, ?, ?)",
) )
if err != nil { if err != nil {
a.logger.Error("error scan: " + err.Error()) a.logger.Error("error request: " + err.Error())
return err return 0, err
} }
row := a.db.QueryRow("SELECT id FROM users WHERE github_id = ?", user.GithubID)
row.Scan(&id)
a.logger.Info("User registered:", "email", user.Email) a.logger.Info("User registered:", "email", user.Email)
return nil return id, nil
} }
func (a *authRepository) IsRegistered(ctx context.Context, github_id int) (bool, error) { func (a *authRepository) IsRegistered(ctx context.Context, github_id int) (bool, error) {

2
backend/internal/repositories/interface.go
View File

@@ -15,6 +15,6 @@ type PostRepository interface {
} }
type AuthRepository interface { type AuthRepository interface {
Register(ctx context.Context, user storage.UserReg) error Register(ctx context.Context, user storage.UserReg) (int, error)
IsRegistered(ctx context.Context, github_id int) (bool, error) IsRegistered(ctx context.Context, github_id int) (bool, error)
} }

2
frontend/src/components/Skills.tsx
View File

@@ -12,7 +12,7 @@ export default function About() {
💻 Github 💻 Github
</a> </a>
<a <a
href="https://git.d3m0k1d.ru" href="https://gitea.d3m0k1d.ru"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
className="px-3 py-1 border border-base-content/20 rounded hover:border-[hsl(270,73%,63%)] hover:text-[hsl(270,73%,63%)] transition-all font-mono" className="px-3 py-1 border border-base-content/20 rounded hover:border-[hsl(270,73%,63%)] hover:text-[hsl(270,73%,63%)] transition-all font-mono"