Stevan/chirpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: we made it better...aka i did too many things and don't remember

Browse Source
This commit is contained in:
Stevan Freeborn
2026-08-15 10:48:29 -05:00
parent 5c5a126d88
commit c3fded4492
14 changed files with 919 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/auth/auth.go
+77
View File
@@ -0,0 +1,77 @@
package auth
import (
"crypto/rand"
"encoding/hex"
"errors"
"net/http"
"strings"
"time"
"github.com/alexedwards/argon2id"
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"
)
func HashPassword(password string) (string, error) {
return argon2id.CreateHash(password, argon2id.DefaultParams)
}
func CheckPasswordHash(password string, hash string) (bool, error) {
return argon2id.ComparePasswordAndHash(password, hash)
}
func MakeJWT(userID uuid.UUID, tokenSecret []byte, expiresIn time.Duration) (string, error) {
token := jwt.New(jwt.GetSigningMethod(jwt.SigningMethodHS256.Name))
token.Claims = &jwt.RegisteredClaims{
Issuer: "chirpy-access",
IssuedAt: jwt.NewNumericDate(time.Now()),
ExpiresAt: jwt.NewNumericDate(time.Now().Add(expiresIn)),
Subject: userID.String(),
}
return token.SignedString(tokenSecret)
}
func ValidateJWT(tokenString string, tokenSecret []byte) (uuid.UUID, error) {
token, err := jwt.ParseWithClaims(tokenString, &jwt.RegisteredClaims{}, func(t *jwt.Token) (any, error) {
return tokenSecret, nil
})
if err != nil {
return uuid.Nil, err
}
userId, err := token.Claims.GetSubject()
if err != nil {
return uuid.Nil, err
}
validUserId, err := uuid.Parse(userId)
if err != nil {
return uuid.Nil, err
}
return validUserId, nil
}
func GetBearerToken(headers http.Header) (string, error) {
authorizationHeader := headers.Get("Authorization")
if strings.TrimSpace(authorizationHeader) == "" {
return "", errors.New("Missing Authorization header")
}
token := strings.TrimPrefix(authorizationHeader, "Bearer ")
return token, nil
}
func MakeRefreshToken() string {
bytes := make([]byte, 32)
rand.Read(bytes)
return hex.EncodeToString(bytes)
}
internal/auth/auth_test.go
+21
View File
@@ -0,0 +1,21 @@
package auth_test
import (
"testing"
"time"
"github.com/StevanFreeborn/chirpy/internal/auth"
"github.com/google/uuid"
)
func TestJwtCreationAndValidation(t *testing.T) {
userId := uuid.New()
secret := []byte("RTCK2UTcOUkiswdrClC6Z3KmmEq/+QicpD9iRx7J0qY=")
jwtString, err := auth.MakeJWT(userId, secret, time.Hour)
validatedUserId, err := auth.ValidateJWT(jwtString, secret)
if userId != validatedUserId {
t.Fatalf("received %s expected %s: %v", validatedUserId, userId, err)
}
}
internal/database/chirps.sql.go
+61
View File
@@ -40,3 +40,64 @@ func (q *Queries) CreateChirp(ctx context.Context, arg CreateChirpParams) (Chirp
)
return i, err
}
const deleteChirpById = `-- name: DeleteChirpById :exec
DELETE FROM chirps WHERE id = $1
`
func (q *Queries) DeleteChirpById(ctx context.Context, id uuid.UUID) error {
_, err := q.db.ExecContext(ctx, deleteChirpById, id)
return err
}
const getAllChirps = `-- name: GetAllChirps :many
SELECT id, created_at, updated_at, body, user_id FROM chirps
ORDER BY created_at ASC
`
func (q *Queries) GetAllChirps(ctx context.Context) ([]Chirp, error) {
rows, err := q.db.QueryContext(ctx, getAllChirps)
if err != nil {
return nil, err
}
defer rows.Close()
var items []Chirp
for rows.Next() {
var i Chirp
if err := rows.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Body,
&i.UserID,
); err != nil {
return nil, err
}
items = append(items, i)
}
if err := rows.Close(); err != nil {
return nil, err
}
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil
}
const getChirpById = `-- name: GetChirpById :one
SELECT id, created_at, updated_at, body, user_id FROM chirps
WHERE id = $1
`
func (q *Queries) GetChirpById(ctx context.Context, id uuid.UUID) (Chirp, error) {
row := q.db.QueryRowContext(ctx, getChirpById, id)
var i Chirp
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Body,
&i.UserID,
)
return i, err
}
internal/database/models.go
+14 -3
View File
@@ -5,6 +5,7 @@
package database
import (
"database/sql"
"time"
"github.com/google/uuid"
@@ -18,9 +19,19 @@ type Chirp struct {
UserID uuid.UUID
}
type User struct {
ID uuid.UUID
type RefreshToken struct {
Token string
CreatedAt time.Time
UpdatedAt time.Time
Email string
ExpiresAt time.Time
RevokedAt sql.NullTime
UserID uuid.UUID
}
type User struct {
ID uuid.UUID
CreatedAt time.Time
UpdatedAt time.Time
Email string
HashedPassword string
}
internal/database/refresh_tokens.sql.go
+99
View File
@@ -0,0 +1,99 @@
// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.31.1
// source: refresh_tokens.sql
package database
import (
"context"
"database/sql"
"time"
"github.com/google/uuid"
)
const createRefreshToken = `-- name: CreateRefreshToken :one
INSERT INTO refresh_tokens (created_at, updated_at, token, expires_at, revoked_at, user_id)
VALUES (
NOW(),
NOW(),
$1,
$2,
$3,
$4
)
RETURNING token, created_at, updated_at, expires_at, revoked_at, user_id
`
type CreateRefreshTokenParams struct {
Token string
ExpiresAt time.Time
RevokedAt sql.NullTime
UserID uuid.UUID
}
func (q *Queries) CreateRefreshToken(ctx context.Context, arg CreateRefreshTokenParams) (RefreshToken, error) {
row := q.db.QueryRowContext(ctx, createRefreshToken,
arg.Token,
arg.ExpiresAt,
arg.RevokedAt,
arg.UserID,
)
var i RefreshToken
err := row.Scan(
&i.Token,
&i.CreatedAt,
&i.UpdatedAt,
&i.ExpiresAt,
&i.RevokedAt,
&i.UserID,
)
return i, err
}
const getRefreshTokenByToken = `-- name: GetRefreshTokenByToken :one
SELECT
created_at,
updated_at,
token,
expires_at,
revoked_at,
user_id
FROM refresh_tokens
WHERE token = $1
`
type GetRefreshTokenByTokenRow struct {
CreatedAt time.Time
UpdatedAt time.Time
Token string
ExpiresAt time.Time
RevokedAt sql.NullTime
UserID uuid.UUID
}
func (q *Queries) GetRefreshTokenByToken(ctx context.Context, token string) (GetRefreshTokenByTokenRow, error) {
row := q.db.QueryRowContext(ctx, getRefreshTokenByToken, token)
var i GetRefreshTokenByTokenRow
err := row.Scan(
&i.CreatedAt,
&i.UpdatedAt,
&i.Token,
&i.ExpiresAt,
&i.RevokedAt,
&i.UserID,
)
return i, err
}
const revokeRefreshToken = `-- name: RevokeRefreshToken :exec
UPDATE refresh_tokens
SET revoked_at = NOW(), updated_at = NOW()
WHERE token = $1
`
func (q *Queries) RevokeRefreshToken(ctx context.Context, token string) error {
_, err := q.db.ExecContext(ctx, revokeRefreshToken, token)
return err
}
internal/database/users.sql.go
+58 -6
View File
@@ -12,24 +12,31 @@ import (
)
const createUser = `-- name: CreateUser :one
INSERT INTO users (id, created_at, updated_at, email)
INSERT INTO users (id, created_at, updated_at, email, hashed_password)
VALUES (
gen_random_uuid(),
NOW(),
NOW(),
$1
$1,
$2
)
RETURNING id, created_at, updated_at, email
RETURNING id, created_at, updated_at, email, hashed_password
`
func (q *Queries) CreateUser(ctx context.Context, email string) (User, error) {
row := q.db.QueryRowContext(ctx, createUser, email)
type CreateUserParams struct {
Email string
HashedPassword string
}
func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (User, error) {
row := q.db.QueryRowContext(ctx, createUser, arg.Email, arg.HashedPassword)
var i User
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Email,
&i.HashedPassword,
)
return i, err
}
@@ -43,8 +50,26 @@ func (q *Queries) DeleteAllUsers(ctx context.Context) error {
return err
}
const getUserByEmail = `-- name: GetUserByEmail :one
SELECT id, created_at, updated_at, email, hashed_password FROM users
WHERE email = $1
`
func (q *Queries) GetUserByEmail(ctx context.Context, email string) (User, error) {
row := q.db.QueryRowContext(ctx, getUserByEmail, email)
var i User
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Email,
&i.HashedPassword,
)
return i, err
}
const getUserById = `-- name: GetUserById :one
SELECT id, created_at, updated_at, email FROM users
SELECT id, created_at, updated_at, email, hashed_password FROM users
WHERE id = $1
`
@@ -56,6 +81,33 @@ func (q *Queries) GetUserById(ctx context.Context, id uuid.UUID) (User, error) {
&i.CreatedAt,
&i.UpdatedAt,
&i.Email,
&i.HashedPassword,
)
return i, err
}
const updateUser = `-- name: UpdateUser :one
UPDATE users
SET email = $2, hashed_password = $3, updated_at = NOW()
WHERE id = $1
RETURNING id, created_at, updated_at, email, hashed_password
`
type UpdateUserParams struct {
ID uuid.UUID
Email string
HashedPassword string
}
func (q *Queries) UpdateUser(ctx context.Context, arg UpdateUserParams) (User, error) {
row := q.db.QueryRowContext(ctx, updateUser, arg.ID, arg.Email, arg.HashedPassword)
var i User
err := row.Scan(
&i.ID,
&i.CreatedAt,
&i.UpdatedAt,
&i.Email,
&i.HashedPassword,
)
return i, err
}