feat: ci/cd

This commit is contained in:
Giovanni Rezcjikov
2026-03-09 12:50:29 +03:00
parent f4e4fb21e3
commit daaa702dad
21 changed files with 585 additions and 267 deletions
+102 -121
View File
@@ -20,12 +20,11 @@ func NewOAuthRepository(db *pgxpool.Pool) *OAuthRepository {
func (r *OAuthRepository) CreateOAuthClient(ctx context.Context, client models.OAuthClient) (*models.OAuthClient, error) {
err := r.db.QueryRow(ctx, `
INSERT INTO oauth_clients (client_id, client_secret, name, redirect_uris, grant_types, scopes, trusted)
VALUES ($1, $2, $3, $4, $5, $6, $7)
RETURNING id, is_active, created_at, updated_at
`, client.ClientID, client.ClientSecret, client.Name, client.RedirectURIs, client.GrantTypes, client.Scopes, client.Trusted).
INSERT INTO oauth_clients (client_id, client_secret, name, redirect_uris, grant_types, scopes, trusted)
VALUES ($1, $2, $3, $4, $5, $6, $7)
RETURNING id, is_active, created_at, updated_at
`, client.ClientID, client.ClientSecret, client.Name, client.RedirectURIs, client.GrantTypes, client.Scopes, client.Trusted).
Scan(&client.ID, &client.IsActive, &client.CreatedAt, &client.UpdatedAt)
if err != nil {
return nil, fmt.Errorf("failed to create OAuth client: %w", err)
}
@@ -37,7 +36,11 @@ func (r *OAuthRepository) GetOAuthClientByClientID(ctx context.Context, clientID
err := r.db.QueryRow(ctx, `
SELECT id, client_id, client_secret, name, redirect_uris, grant_types, scopes, is_active, trusted, created_at, updated_at
FROM oauth_clients WHERE client_id = $1 AND is_active = true
`, clientID).Scan(&client.ID, &client.ClientID, &client.ClientSecret, &client.Name, &client.RedirectURIs, &client.GrantTypes, &client.Scopes, &client.IsActive, &client.Trusted, &client.CreatedAt, &client.UpdatedAt)
`, clientID).Scan(
&client.ID, &client.ClientID, &client.ClientSecret, &client.Name,
&client.RedirectURIs, &client.GrantTypes, &client.Scopes,
&client.IsActive, &client.Trusted, &client.CreatedAt, &client.UpdatedAt,
)
if err != nil {
return nil, err
}
@@ -49,7 +52,11 @@ func (r *OAuthRepository) GetOAuthClientByID(ctx context.Context, id uuid.UUID)
err := r.db.QueryRow(ctx, `
SELECT id, client_id, client_secret, name, redirect_uris, grant_types, scopes, is_active, trusted, created_at, updated_at
FROM oauth_clients WHERE id = $1 AND is_active = true
`, id).Scan(&client.ID, &client.ClientID, &client.ClientSecret, &client.Name, &client.RedirectURIs, &client.GrantTypes, &client.Scopes, &client.IsActive, &client.Trusted, &client.CreatedAt, &client.UpdatedAt)
`, id).Scan(
&client.ID, &client.ClientID, &client.ClientSecret, &client.Name,
&client.RedirectURIs, &client.GrantTypes, &client.Scopes,
&client.IsActive, &client.Trusted, &client.CreatedAt, &client.UpdatedAt,
)
if err != nil {
return nil, err
}
@@ -61,8 +68,11 @@ func (r *OAuthRepository) CreateAuthorizationCode(ctx context.Context, row model
INSERT INTO authorization_codes (code_hash, user_id, client_id, redirect_uri, scopes, code_challenge, code_challenge_method, expires_at, consumed_at, created_at)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
RETURNING id, code_hash, user_id, client_id, redirect_uri, scopes, code_challenge, code_challenge_method, expires_at, consumed_at, created_at
`, row.CodeHash, row.UserID, row.ClientID, row.RedirectURI, row.Scopes, row.CodeChallenge, row.CodeChallengeMethod, row.ExpiresAt, row.ConsumedAt, row.CreatedAt).
Scan(&row.ID, &row.CodeHash, &row.UserID, &row.ClientID, &row.RedirectURI, &row.Scopes, &row.CodeChallenge, &row.CodeChallengeMethod, &row.ExpiresAt, &row.ConsumedAt, &row.CreatedAt)
`, row.CodeHash, row.UserID, row.ClientID, row.RedirectURI, row.Scopes,
row.CodeChallenge, row.CodeChallengeMethod, row.ExpiresAt, row.ConsumedAt, row.CreatedAt).
Scan(&row.ID, &row.CodeHash, &row.UserID, &row.ClientID, &row.RedirectURI,
&row.Scopes, &row.CodeChallenge, &row.CodeChallengeMethod,
&row.ExpiresAt, &row.ConsumedAt, &row.CreatedAt)
if err != nil {
return nil, fmt.Errorf("create authorization code: %w", err)
}
@@ -74,7 +84,11 @@ func (r *OAuthRepository) GetAuthorizationCodeByHash(ctx context.Context, codeHa
err := r.db.QueryRow(ctx, `
SELECT id, code_hash, user_id, client_id, redirect_uri, scopes, code_challenge, code_challenge_method, expires_at, consumed_at, created_at
FROM authorization_codes WHERE code_hash = $1
`, codeHash).Scan(&row.ID, &row.CodeHash, &row.UserID, &row.ClientID, &row.RedirectURI, &row.Scopes, &row.CodeChallenge, &row.CodeChallengeMethod, &row.ExpiresAt, &row.ConsumedAt, &row.CreatedAt)
`, codeHash).Scan(
&row.ID, &row.CodeHash, &row.UserID, &row.ClientID, &row.RedirectURI,
&row.Scopes, &row.CodeChallenge, &row.CodeChallengeMethod,
&row.ExpiresAt, &row.ConsumedAt, &row.CreatedAt,
)
if err != nil {
return nil, err
}
@@ -107,7 +121,10 @@ func (r *OAuthRepository) GetRefreshTokenByHash(ctx context.Context, tokenHash s
err := r.db.QueryRow(ctx, `
SELECT id, token_hash, user_id, client_id, scopes, expires_at, created_at
FROM refresh_tokens WHERE token_hash = $1
`, tokenHash).Scan(&row.ID, &row.TokenHash, &row.UserID, &row.ClientID, &row.Scopes, &row.ExpiresAt, &row.CreatedAt)
`, tokenHash).Scan(
&row.ID, &row.TokenHash, &row.UserID, &row.ClientID,
&row.Scopes, &row.ExpiresAt, &row.CreatedAt,
)
if err != nil {
return nil, err
}
@@ -119,32 +136,27 @@ func (r *OAuthRepository) DeleteRefreshTokenByID(ctx context.Context, id uuid.UU
return err
}
func (r *OAuthRepository) DeleteRefreshTokensByUserID(ctx context.Context, userID uuid.UUID) error {
_, err := r.db.Exec(ctx, `DELETE FROM refresh_tokens WHERE user_id = $1`, userID)
return err
}
func (r *OAuthRepository) RecordUserConsent(
ctx context.Context,
userID, clientID uuid.UUID,
scopes []string,
) error {
scopeJSON, err := json.Marshal(scopes)
if err != nil {
return err
}
_, err = r.db.Exec(ctx, `
INSERT INTO user_consents (
user_id,
client_id,
scopes,
authorized_at,
last_used_at,
revoked_at
)
INSERT INTO user_consents (user_id, client_id, scopes, authorized_at, last_used_at, revoked_at)
VALUES ($1, $2, $3, now(), now(), NULL)
ON CONFLICT (user_id, client_id)
WHERE revoked_at IS NULL
DO UPDATE SET
scopes = EXCLUDED.scopes,
last_used_at = now()
DO UPDATE SET scopes = EXCLUDED.scopes, last_used_at = now()
`, userID, clientID, scopeJSON)
return err
@@ -154,14 +166,13 @@ func (r *OAuthRepository) GetUserConsents(
ctx context.Context,
userID uuid.UUID,
) ([]models.UserConsent, error) {
rows, err := r.db.Query(ctx, `
SELECT
SELECT
uc.id,
uc.user_id,
uc.client_id,
oc.client_id AS client_identifier,
oc.name AS client_name,
oc.name AS client_name,
uc.scopes,
uc.authorized_at,
uc.last_used_at,
@@ -173,52 +184,18 @@ func (r *OAuthRepository) GetUserConsents(
AND (uc.expires_at IS NULL OR uc.expires_at > now())
ORDER BY uc.authorized_at DESC
`, userID)
if err != nil {
return nil, err
}
defer rows.Close()
var consents []models.UserConsent
for rows.Next() {
var c models.UserConsent
var scopeJSON []byte
err := rows.Scan(
&c.ID,
&c.UserID,
&c.ClientID,
&c.ClientIdentifier,
&c.ClientName,
&scopeJSON,
&c.AuthorizedAt,
&c.LastUsedAt,
&c.RevokedAt,
)
if err != nil {
return nil, err
}
if err := json.Unmarshal(scopeJSON, &c.Scopes); err != nil {
return nil, err
}
consents = append(consents, c)
}
if err := rows.Err(); err != nil {
return nil, err
}
return consents, nil
return scanConsents(rows)
}
func (r *OAuthRepository) UpdateConsentLastUsed(
ctx context.Context,
userID, clientID uuid.UUID,
) error {
_, err := r.db.Exec(ctx, `
UPDATE user_consents
SET last_used_at = now()
@@ -227,12 +204,7 @@ func (r *OAuthRepository) UpdateConsentLastUsed(
AND revoked_at IS NULL
AND (expires_at IS NULL OR expires_at > now())
`, userID, clientID)
if err != nil {
return err
}
return nil
return err
}
func (r *OAuthRepository) GetUserConsentsByClientID(
@@ -240,49 +212,96 @@ func (r *OAuthRepository) GetUserConsentsByClientID(
userID uuid.UUID,
clientID uuid.UUID,
) ([]models.UserConsent, error) {
rows, err := r.db.Query(ctx, `
SELECT
SELECT
uc.id,
uc.user_id,
uc.client_id,
oc.client_id AS client_identifier,
oc.name AS client_name,
oc.name AS client_name,
uc.scopes,
uc.authorized_at,
uc.last_used_at,
uc.revoked_at
FROM user_consents uc
JOIN oauth_clients oc ON uc.client_id = oc.id
WHERE uc.user_id = $1
AND uc.client_id = $2
AND uc.revoked_at IS NULL
AND (uc.expires_at IS NULL OR uc.expires_at > now())
AND uo.id = $2
ORDER BY uc.authorized_at DESC
`, userID, clientID)
if err != nil {
return nil, err
}
defer rows.Close()
return scanConsents(rows)
}
func (r *OAuthRepository) RevokeConsent(
ctx context.Context,
userID, clientID uuid.UUID,
revokedBy *uuid.UUID,
) error {
tx, err := r.db.Begin(ctx)
if err != nil {
return err
}
defer tx.Rollback(ctx)
_, err = tx.Exec(ctx, `
UPDATE user_consents
SET revoked_at = now(), revoked_by = $3
WHERE user_id = $1 AND client_id = $2 AND revoked_at IS NULL
`, userID, clientID, revokedBy)
if err != nil {
return err
}
_, err = tx.Exec(ctx, `
DELETE FROM refresh_tokens WHERE user_id = $1 AND client_id = $2
`, userID, clientID)
if err != nil {
return err
}
return tx.Commit(ctx)
}
func (r *OAuthRepository) UpsertClient(ctx context.Context, client models.OAuthClient) error {
_, err := r.db.Exec(ctx, `
INSERT INTO oauth_clients (client_id, client_secret, name, redirect_uris, grant_types, scopes, trusted)
VALUES ($1, $2, $3, $4, $5, $6, $7)
ON CONFLICT (client_id) DO UPDATE SET
client_secret = EXCLUDED.client_secret,
name = EXCLUDED.name,
redirect_uris = EXCLUDED.redirect_uris,
grant_types = EXCLUDED.grant_types,
scopes = EXCLUDED.scopes,
updated_at = now()
`, client.ClientID, client.ClientSecret, client.Name,
client.RedirectURIs, client.GrantTypes, client.Scopes, client.Trusted)
return err
}
func scanConsents(rows interface {
Next() bool
Scan(...any) error
Err() error
}) ([]models.UserConsent, error) {
var consents []models.UserConsent
for rows.Next() {
var c models.UserConsent
var scopeJSON []byte
err := rows.Scan(
&c.ID,
&c.UserID,
&c.ClientID,
&c.ClientIdentifier,
&c.ClientName,
if err := rows.Scan(
&c.ID, &c.UserID, &c.ClientID,
&c.ClientIdentifier, &c.ClientName,
&scopeJSON,
&c.AuthorizedAt,
&c.LastUsedAt,
&c.RevokedAt,
)
if err != nil {
&c.AuthorizedAt, &c.LastUsedAt, &c.RevokedAt,
); err != nil {
return nil, err
}
@@ -299,41 +318,3 @@ func (r *OAuthRepository) GetUserConsentsByClientID(
return consents, nil
}
func (r *OAuthRepository) RevokeConsent(
ctx context.Context,
userID, clientID uuid.UUID,
revokedBy *uuid.UUID,
) error {
tx, err := r.db.Begin(ctx)
if err != nil {
return err
}
defer tx.Rollback(ctx)
_, err = tx.Exec(ctx, `
UPDATE user_consents
SET revoked_at = now(),
revoked_by = $3
WHERE user_id = $1
AND client_id = $2
AND revoked_at IS NULL
`, userID, clientID, revokedBy)
if err != nil {
return err
}
_, err = tx.Exec(ctx, `
DELETE FROM refresh_tokens
WHERE user_id = $1
AND client_id = $2
`, userID, clientID)
if err != nil {
return err
}
return tx.Commit(ctx)
}