x/web-app-template
Archived
Template
2
0
Fork 0
Code Issues 13 Pull Requests 4 Actions Packages Activity

fix: remove redundante names
Some checks failed
Build Docker Image / Build-Docker-Image (push) Failing after 37s
Details

Browse Source
This commit is contained in:
Tim Wundenberg
2024-12-04 23:22:25 +01:00
parent 2d5f42bb28
commit a69e9537d2
15 changed files with 188 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
db/auth.go
View File

@@ -78,7 +78,7 @@ func NewToken(userId uuid.UUID, token string, tokenType string, createdAt time.T
}
}
type AuthDb interface {
type Auth interface {
InsertUser(user *User) error
UpdateUser(user *User) error
GetUserByEmail(email string) (*User, error)
@@ -96,15 +96,15 @@ type AuthDb interface {
DeleteOldSessions(userId uuid.UUID) error
}
type AuthDbSqlite struct {
type AuthSqlite struct {
db *sql.DB
}
func NewAuthDbSqlite(db *sql.DB) *AuthDbSqlite {
return &AuthDbSqlite{db: db}
func NewAuthSqlite(db *sql.DB) *AuthSqlite {
return &AuthSqlite{db: db}
}
func (db AuthDbSqlite) InsertUser(user *User) error {
func (db AuthSqlite) InsertUser(user *User) error {
_, err := db.db.Exec(`
INSERT INTO user (user_uuid, email, email_verified, email_verified_at, is_admin, password, salt, created_at)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
@@ -122,7 +122,7 @@ func (db AuthDbSqlite) InsertUser(user *User) error {
return nil
}
func (db AuthDbSqlite) UpdateUser(user *User) error {
func (db AuthSqlite) UpdateUser(user *User) error {
_, err := db.db.Exec(`
UPDATE user
SET email_verified = ?, email_verified_at = ?, password = ?
@@ -137,7 +137,7 @@ func (db AuthDbSqlite) UpdateUser(user *User) error {
return nil
}
func (db AuthDbSqlite) GetUserByEmail(email string) (*User, error) {
func (db AuthSqlite) GetUserByEmail(email string) (*User, error) {
var (
userId uuid.UUID
emailVerified bool
@@ -164,7 +164,7 @@ func (db AuthDbSqlite) GetUserByEmail(email string) (*User, error) {
return NewUser(userId, email, emailVerified, emailVerifiedAt, isAdmin, password, salt, createdAt), nil
}
func (db AuthDbSqlite) GetUser(userId uuid.UUID) (*User, error) {
func (db AuthSqlite) GetUser(userId uuid.UUID) (*User, error) {
var (
email string
emailVerified bool
@@ -191,7 +191,7 @@ func (db AuthDbSqlite) GetUser(userId uuid.UUID) (*User, error) {
return NewUser(userId, email, emailVerified, emailVerifiedAt, isAdmin, password, salt, createdAt), nil
}
func (db AuthDbSqlite) DeleteUser(userId uuid.UUID) error {
func (db AuthSqlite) DeleteUser(userId uuid.UUID) error {
tx, err := db.db.Begin()
if err != nil {
@@ -236,7 +236,7 @@ func (db AuthDbSqlite) DeleteUser(userId uuid.UUID) error {
return nil
}
func (db AuthDbSqlite) InsertToken(token *Token) error {
func (db AuthSqlite) InsertToken(token *Token) error {
_, err := db.db.Exec(`
INSERT INTO user_token (user_uuid, type, token, created_at, expires_at)
VALUES (?, ?, ?, ?, ?)`, token.UserId, token.Type, token.Token, token.CreatedAt, token.ExpiresAt)
@@ -249,7 +249,7 @@ func (db AuthDbSqlite) InsertToken(token *Token) error {
return nil
}
func (db AuthDbSqlite) GetToken(token string) (*Token, error) {
func (db AuthSqlite) GetToken(token string) (*Token, error) {
var (
userId uuid.UUID
tokenType string
@@ -290,7 +290,7 @@ func (db AuthDbSqlite) GetToken(token string) (*Token, error) {
return NewToken(userId, token, tokenType, createdAt, expiresAt), nil
}
func (db AuthDbSqlite) GetTokensByUserIdAndType(userId uuid.UUID, tokenType string) ([]*Token, error) {
func (db AuthSqlite) GetTokensByUserIdAndType(userId uuid.UUID, tokenType string) ([]*Token, error) {
query, err := db.db.Query(`
SELECT token, created_at, expires_at
@@ -338,7 +338,7 @@ func (db AuthDbSqlite) GetTokensByUserIdAndType(userId uuid.UUID, tokenType stri
return tokens, nil
}
func (db AuthDbSqlite) DeleteToken(token string) error {
func (db AuthSqlite) DeleteToken(token string) error {
_, err := db.db.Exec("DELETE FROM user_token WHERE token = ?", token)
if err != nil {
log.Error("Could not delete token: %v", err)
@@ -347,7 +347,7 @@ func (db AuthDbSqlite) DeleteToken(token string) error {
return nil
}
func (db AuthDbSqlite) InsertSession(session *Session) error {
func (db AuthSqlite) InsertSession(session *Session) error {
_, err := db.db.Exec(`
INSERT INTO session (session_id, user_uuid, created_at)
@@ -361,7 +361,7 @@ func (db AuthDbSqlite) InsertSession(session *Session) error {
return nil
}
func (db AuthDbSqlite) GetSession(sessionId string) (*Session, error) {
func (db AuthSqlite) GetSession(sessionId string) (*Session, error) {
var (
userId uuid.UUID
@@ -381,7 +381,7 @@ func (db AuthDbSqlite) GetSession(sessionId string) (*Session, error) {
return NewSession(sessionId, userId, sessionCreatedAt), nil
}
func (db AuthDbSqlite) DeleteOldSessions(userId uuid.UUID) error {
func (db AuthSqlite) DeleteOldSessions(userId uuid.UUID) error {
// Delete old inactive sessions
_, err := db.db.Exec("DELETE FROM session WHERE created_at < datetime('now','-8 hours') AND user_uuid = ?", userId)
if err != nil {
@@ -391,7 +391,7 @@ func (db AuthDbSqlite) DeleteOldSessions(userId uuid.UUID) error {
return nil
}
func (db AuthDbSqlite) DeleteSession(sessionId string) error {
func (db AuthSqlite) DeleteSession(sessionId string) error {
if sessionId != "" {
_, err := db.db.Exec("DELETE FROM session WHERE session_id = ?", sessionId)

10
db/auth_test.go
View File

@@ -33,7 +33,7 @@ func TestUser(t *testing.T) {
t.Parallel()
db := setupDb(t)
underTest := AuthDbSqlite{db: db}
underTest := AuthSqlite{db: db}
_, err := underTest.GetUserByEmail("someNonExistentEmail")
assert.Equal(t, ErrNotFound, err)
@@ -43,7 +43,7 @@ func TestUser(t *testing.T) {
t.Parallel()
db := setupDb(t)
underTest := AuthDbSqlite{db: db}
underTest := AuthSqlite{db: db}
verifiedAt := time.Date(2020, 1, 5, 13, 0, 0, 0, time.UTC)
createAt := time.Date(2020, 1, 5, 12, 0, 0, 0, time.UTC)
@@ -62,7 +62,7 @@ func TestUser(t *testing.T) {
t.Parallel()
db := setupDb(t)
underTest := AuthDbSqlite{db: db}
underTest := AuthSqlite{db: db}
verifiedAt := time.Date(2020, 1, 5, 13, 0, 0, 0, time.UTC)
createAt := time.Date(2020, 1, 5, 12, 0, 0, 0, time.UTC)
@@ -83,7 +83,7 @@ func TestEmailVerification(t *testing.T) {
t.Parallel()
db := setupDb(t)
underTest := AuthDbSqlite{db: db}
underTest := AuthSqlite{db: db}
token, err := underTest.GetToken("someNonExistentToken")
@@ -94,7 +94,7 @@ func TestEmailVerification(t *testing.T) {
t.Parallel()
db := setupDb(t)
underTest := AuthDbSqlite{db: db}
underTest := AuthSqlite{db: db}
tokenStr := "some secure token"
createdAt := time.Date(2020, 1, 5, 13, 0, 0, 0, time.UTC)