From 60241a2b164ddbd847cb15a22ade749a8f4818bf Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 1 Nov 2025 17:27:26 -0400 Subject: [PATCH] Cleanup --- internal/config/config.go | 3 ++- internal/db/connection.go | 5 +---- internal/model/user.go | 8 -------- internal/utility/token.go | 2 -- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/internal/config/config.go b/internal/config/config.go index c6eeeb2..8df32c9 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -27,10 +27,11 @@ type ConnectionInfo struct { SslMode string } -const Port = "9080" +const Port = "9080" const App_Name = "textsender_auth" + func (ci ConnectionInfo) Parse() string { return fmt.Sprintf("postgres://%s:%s@%s:%d/%s?sslmode=%s", ci.Username, ci.Password, ci.Host, ci.Port, ci.Database, ci.SslMode) } diff --git a/internal/db/connection.go b/internal/db/connection.go index 877b19e..cbd50d2 100644 --- a/internal/db/connection.go +++ b/internal/db/connection.go @@ -45,7 +45,6 @@ func NewDatabase(connString string) (*Database, error) { } // Test the connection with a short timeout - if err := pool.Ping(ctx); err != nil { pool.Close() return nil, fmt.Errorf("unable to ping database: %v", err) @@ -92,9 +91,7 @@ func (db *Database) ResetDatabase(ctx context.Context) error { } } - statements := strings.Split(string(schemaContent), ";") - - for _, stmt := range statements { + for _, stmt := range strings.Split(string(schemaContent), ";") { stmt = strings.TrimSpace(stmt) if stmt == "" { continue diff --git a/internal/model/user.go b/internal/model/user.go index e532b21..9fc8de6 100644 --- a/internal/model/user.go +++ b/internal/model/user.go @@ -11,14 +11,6 @@ import ( "git.kundeng.us/phoenix/textsender-models/pkg/user" ) -/* -type User struct { - Id uuid.UUID `json:"id"` - PhoneNumber string `json:"phone_number"` - Username string `json:"username"` - Password string `json:"password"` -} -*/ type UserStore interface { CreateUser(ctx context.Context, user *user.User) error diff --git a/internal/utility/token.go b/internal/utility/token.go index b02d2f6..00bfc36 100644 --- a/internal/utility/token.go +++ b/internal/utility/token.go @@ -4,7 +4,6 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - // "github.com/google/uuid" "git.kundeng.us/phoenix/textsender-auth/internal/config" "git.kundeng.us/phoenix/textsender-models/pkg/token" @@ -37,7 +36,6 @@ func (t *TokenGenerator) GenerateToken(user user.User) (*token.Login, error) { func (t *TokenGenerator) generateClaims(user user.User, role string, issuedAt time.Time, expiredAt time.Time) token.Claims { return token.Claims{ - // UserId: user.Id.String(), UserId: user.Id, Role: role, RegisteredClaims: jwt.RegisteredClaims{