refactor(http): api key cache handling (#1632)

This commit is contained in:
ze0s 2024-08-28 16:51:03 +02:00 committed by GitHub
parent 0d53f7e5fc
commit d13b421c42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 117 additions and 50 deletions

View file

@ -25,9 +25,8 @@ func NewAPIRepo(log logger.Logger, db *DB) domain.APIRepo {
}
type APIRepo struct {
log zerolog.Logger
db *DB
cache map[string]domain.APIKey
log zerolog.Logger
db *DB
}
func (r *APIRepo) Store(ctx context.Context, key *domain.APIKey) error {
@ -57,9 +56,7 @@ func (r *APIRepo) Store(ctx context.Context, key *domain.APIKey) error {
}
func (r *APIRepo) Delete(ctx context.Context, key string) error {
queryBuilder := r.db.squirrel.
Delete("api_key").
Where(sq.Eq{"key": key})
queryBuilder := r.db.squirrel.Delete("api_key").Where(sq.Eq{"key": key})
query, args, err := queryBuilder.ToSql()
if err != nil {
@ -76,14 +73,9 @@ func (r *APIRepo) Delete(ctx context.Context, key string) error {
return nil
}
func (r *APIRepo) GetKeys(ctx context.Context) ([]domain.APIKey, error) {
func (r *APIRepo) GetAllAPIKeys(ctx context.Context) ([]domain.APIKey, error) {
queryBuilder := r.db.squirrel.
Select(
"name",
"key",
"scopes",
"created_at",
).
Select("name", "key", "scopes", "created_at").
From("api_key")
query, args, err := queryBuilder.ToSql()
@ -116,3 +108,35 @@ func (r *APIRepo) GetKeys(ctx context.Context) ([]domain.APIKey, error) {
return keys, nil
}
func (r *APIRepo) GetKey(ctx context.Context, key string) (*domain.APIKey, error) {
queryBuilder := r.db.squirrel.
Select("name", "key", "scopes", "created_at").
From("api_key").
Where(sq.Eq{"key": key})
query, args, err := queryBuilder.ToSql()
if err != nil {
return nil, errors.Wrap(err, "error building query")
}
row := r.db.handler.QueryRowContext(ctx, query, args...)
if err := row.Err(); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, domain.ErrRecordNotFound
}
return nil, errors.Wrap(err, "error executing query")
}
var apiKey domain.APIKey
var name sql.NullString
if err := row.Scan(&name, &apiKey.Key, pq.Array(&apiKey.Scopes), &apiKey.CreatedAt); err != nil {
return nil, errors.Wrap(err, "error scanning row")
}
apiKey.Name = name.String
return &apiKey, nil
}

View file

@ -69,7 +69,7 @@ func TestAPIRepo_Delete(t *testing.T) {
}
func TestAPIRepo_GetKeys(t *testing.T) {
func TestAPIRepo_GetAllAPIKeys(t *testing.T) {
for dbType, db := range testDBs {
log := setupLoggerForTest()
repo := NewAPIRepo(log, db)
@ -77,7 +77,7 @@ func TestAPIRepo_GetKeys(t *testing.T) {
t.Run(fmt.Sprintf("GetKeys_Returns_Keys_If_Exists [%s]", dbType), func(t *testing.T) {
key := &domain.APIKey{Name: "TestKey", Key: "123", Scopes: []string{"read", "write"}}
_ = repo.Store(context.Background(), key)
keys, err := repo.GetKeys(context.Background())
keys, err := repo.GetAllAPIKeys(context.Background())
assert.NoError(t, err)
assert.Greater(t, len(keys), 0)
// Cleanup
@ -85,9 +85,32 @@ func TestAPIRepo_GetKeys(t *testing.T) {
})
t.Run(fmt.Sprintf("GetKeys_Returns_Empty_If_No_Keys [%s]", dbType), func(t *testing.T) {
keys, err := repo.GetKeys(context.Background())
keys, err := repo.GetAllAPIKeys(context.Background())
assert.NoError(t, err)
assert.Equal(t, 0, len(keys))
})
}
}
func TestAPIRepo_GetKey(t *testing.T) {
for dbType, db := range testDBs {
log := setupLoggerForTest()
repo := NewAPIRepo(log, db)
t.Run(fmt.Sprintf("GetKey_Returns_Key_If_Exists [%s]", dbType), func(t *testing.T) {
key := &domain.APIKey{Name: "TestKey", Key: "123", Scopes: []string{"read", "write"}}
_ = repo.Store(context.Background(), key)
apiKey, err := repo.GetKey(context.Background(), key.Key)
assert.NoError(t, err)
assert.NotNil(t, apiKey)
// Cleanup
_ = repo.Delete(context.Background(), key.Key)
})
t.Run(fmt.Sprintf("GetKeys_Returns_Empty_If_No_Keys [%s]", dbType), func(t *testing.T) {
key, err := repo.GetKey(context.Background(), "nonexistent")
assert.ErrorIs(t, err, domain.ErrRecordNotFound)
assert.Nil(t, key)
})
}
}