public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auth: tidy up the database layer from the SSO Settings Service (#80341)

Browse Source 
tidy up the database layer
This commit is contained in:
Mihai Doarna
2024-01-11 14:45:01 +02:00
committed by GitHub
parent dad50fbba9
commit 4bf5c63657
4 changed files with 144 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ssosettings/database/database.go
+34 -16
View File
@@ -12,6 +12,11 @@ import (
"github.com/grafana/grafana/pkg/services/ssosettings/models"
)
const (
isDeletedColumn = "is_deleted"
updatedColumn = "updated"
)
type SSOSettingsStore struct {
sqlStore db.DB
log log.Logger
@@ -27,12 +32,17 @@ func ProvideStore(sqlStore db.DB) *SSOSettingsStore {
var _ ssosettings.Store = (*SSOSettingsStore)(nil)
func (s *SSOSettingsStore) Get(ctx context.Context, provider string) (*models.SSOSettings, error) {
result := models.SSOSettings{Provider: provider}
err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
var err error
sess.Table("sso_setting")
found, err := sess.Where("is_deleted = ?", s.sqlStore.GetDialect().BooleanStr(false)).Get(&result)
if provider == "" {
return nil, ssosettings.ErrNotFound
}
result := models.SSOSettings{
Provider: provider,
IsDeleted: false,
}
err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
found, err := sess.UseBool(isDeletedColumn).Get(&result)
if err != nil {
return err
}
@@ -53,10 +63,13 @@ func (s *SSOSettingsStore) Get(ctx context.Context, provider string) (*models.SS
func (s *SSOSettingsStore) List(ctx context.Context) ([]*models.SSOSettings, error) {
result := make([]*models.SSOSettings, 0)
err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
sess.Table("sso_setting")
err := sess.Where("is_deleted = ?", s.sqlStore.GetDialect().BooleanStr(false)).Find(&result)
err := s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
condition := &models.SSOSettings{
IsDeleted: false,
}
err := sess.UseBool(isDeletedColumn).Find(&result, condition)
if err != nil {
return err
}
@@ -72,12 +85,17 @@ func (s *SSOSettingsStore) List(ctx context.Context) ([]*models.SSOSettings, err
}
func (s *SSOSettingsStore) Upsert(ctx context.Context, settings models.SSOSettings) error {
if settings.Provider == "" {
return ssosettings.ErrNotFound
}
return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
existing := &models.SSOSettings{
Provider: settings.Provider,
IsDeleted: false,
}
found, err := sess.UseBool("is_deleted").Exist(existing)
found, err := sess.UseBool(isDeletedColumn).Exist(existing)
if err != nil {
return err
}
@@ -90,7 +108,7 @@ func (s *SSOSettingsStore) Upsert(ctx context.Context, settings models.SSOSettin
Updated: now,
IsDeleted: false,
}
_, err = sess.UseBool("is_deleted").Update(updated, existing)
_, err = sess.UseBool(isDeletedColumn).Update(updated, existing)
} else {
_, err = sess.Insert(&models.SSOSettings{
ID: uuid.New().String(),
@@ -105,18 +123,18 @@ func (s *SSOSettingsStore) Upsert(ctx context.Context, settings models.SSOSettin
})
}
func (s *SSOSettingsStore) Patch(ctx context.Context, provider string, data map[string]interface{}) error {
panic("not implemented") // TODO: Implement
}
func (s *SSOSettingsStore) Delete(ctx context.Context, provider string) error {
if provider == "" {
return ssosettings.ErrNotFound
}
return s.sqlStore.WithDbSession(ctx, func(sess *db.Session) error {
existing := &models.SSOSettings{
Provider: provider,
IsDeleted: false,
}
found, err := sess.UseBool("is_deleted").Get(existing)
found, err := sess.UseBool(isDeletedColumn).Get(existing)
if err != nil {
return err
}
@@ -128,7 +146,7 @@ func (s *SSOSettingsStore) Delete(ctx context.Context, provider string) error {
existing.Updated = time.Now().UTC()
existing.IsDeleted = true
_, err = sess.ID(existing.ID).MustCols("updated", "is_deleted").Update(existing)
_, err = sess.ID(existing.ID).MustCols(updatedColumn, isDeletedColumn).Update(existing)
return err
})
}