WIP: Almost full token controller
Some checks failed
ci/woodpecker/push/build Pipeline failed

Signed-off-by: Nikolai Rodionov <allanger@badhouseplants.net>
This commit is contained in:
2026-05-14 18:10:49 +02:00
parent ee2aa77ceb
commit c5af2c7544
6 changed files with 192 additions and 33 deletions

View File

@@ -35,7 +35,7 @@ type TokenData struct {
Name string
UserID string
CreatedAt time.Time
LastUserAt time.Time
LastUsedAt time.Time
RevokedAt time.Time
ExpiresAt time.Time
GeneratedAt time.Time
@@ -83,12 +83,13 @@ func (ctrl *TokenController) Create(ctx context.Context, data *TokenData) (strin
}
query := `
INSERT INTO tokens (uuid, token_hash, user_id, scopes, created_at, generated_at, expires_at)
VALUES ($1, $2, $3, $4, $5, $6, $7)`
INSERT INTO tokens (uuid, description, token_hash, user_id, scopes, created_at, generated_at, expires_at)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`
if _, err := ctrl.DB.Query(
query,
id,
data.Name,
tokenHash,
data.UserID,
scopesJson,
@@ -114,12 +115,14 @@ func (ctrl *TokenController) Update(ctx context.Context, data *TokenData) error
return ErrServerError
}
query := "UPDATE tokens SET name = $1, scopes = $2 WHERE uuid = $3;"
query := "UPDATE tokens SET description = $1, scopes = $2 WHERE uuid = $3;"
if _, err := ctrl.DB.Query(query, data.Name, scopesJson, data.UUID); err != nil {
log.Error(err, "Couldn't update a token in the database")
return ErrServerError
}
data, err := ctrl.Get(ctx, , id string, userID string)
return nil
}
@@ -171,8 +174,42 @@ func (ctrl *TokenController) Regenerate(ctx context.Context, id string) (string,
}
// Get an existing token data
func (ctrl *TokenController) Get(ctx context.Context, uuid string) error {
return nil
func (ctrl *TokenController) Get(ctx context.Context, id, userID string) (*TokenData, error) {
log := logger.FromContext(ctx).WithValues("uuid", id, "user_id", userID)
log.V(2).Info("Regenerating a token")
query := `
SELECT uuid, description, generated_at, expires_at, last_used_at, revoked_at, created_at
FROM tokens
WHERE uuid = $1 AND user_id = $2`
token := &TokenData{}
var generatedAt sql.NullTime
var expiresAt sql.NullTime
var revokedAt sql.NullTime
var lastUsedAt sql.NullTime
var createdAt sql.NullTime
if err := ctrl.DB.QueryRowContext(ctx, query, id, userID).Scan(
&token.UUID,
&token.Name,
&generatedAt,
&expiresAt,
&lastUsedAt,
&revokedAt,
&createdAt,
); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, err
}
log.Error(err, "Couldn't find a token")
return nil, ErrServerError
}
token.GeneratedAt = generatedAt.Time
token.ExpiresAt = expiresAt.Time
token.RevokedAt = revokedAt.Time
token.LastUsedAt = lastUsedAt.Time
token.CreatedAt = createdAt.Time
return token, nil
}
// List all available token
@@ -183,7 +220,7 @@ func (ctrl *TokenController) List(ctx context.Context, userID string) ([]TokenDa
result := []TokenData{}
query := `
SELECT uuid, name, generated_at, expires_at
SELECT uuid, description, generated_at, expires_at, revoked_at, last_used_at, created_at
FROM tokens
WHERE user_id = $1`
@@ -203,13 +240,30 @@ func (ctrl *TokenController) List(ctx context.Context, userID string) ([]TokenDa
for rows.Next() {
var t TokenData
var generatedAt sql.NullTime
var expiresAt sql.NullTime
var revokedAt sql.NullTime
var lastUsedAt sql.NullTime
var createdAt sql.NullTime
err := rows.Scan(
&t.UUID,
&t.Name,
&t.GeneratedAt,
&t.ExpiresAt,
&generatedAt,
&expiresAt,
&revokedAt,
&lastUsedAt,
&createdAt,
)
t.GeneratedAt = generatedAt.Time
t.ExpiresAt = expiresAt.Time
t.RevokedAt = revokedAt.Time
t.LastUsedAt = lastUsedAt.Time
t.CreatedAt = createdAt.Time
if err != nil {
log.Error(err, "Couldn't write token into a struct")
return nil, err
}