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

tidy up the database layer

pkg/services/ssosettings/database/database_test.go

@@ -33,7 +33,7 @@ func TestIntegrationGetSSOSettings(t *testing.T) {
 		template := models.SSOSettings{
 			Settings: map[string]any{"enabled": true},
 		}
-		err := populateSSOSettings(sqlStore, template, "azuread")
+		err := populateSSOSettings(sqlStore, template, "azuread", "github", "google")
 		require.NoError(t, err)
 	}
 
@@ -60,10 +60,23 @@ func TestIntegrationGetSSOSettings(t *testing.T) {
 
 	t.Run("returns not found if the SSO setting is soft deleted for the specified provider", func(t *testing.T) {
 		setup()
-		err := ssoSettingsStore.Delete(context.Background(), "azuread")
+
+		provider := "okta"
+		template := models.SSOSettings{
+			Settings:  map[string]any{"enabled": true},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, template, provider)
 		require.NoError(t, err)
 
-		_, err = ssoSettingsStore.Get(context.Background(), "azuread")
+		_, err = ssoSettingsStore.Get(context.Background(), provider)
+		require.ErrorAs(t, err, &ssosettings.ErrNotFound)
+	})
+
+	t.Run("returns not found if the specified provider is empty", func(t *testing.T) {
+		setup()
+
+		_, err := ssoSettingsStore.Get(context.Background(), "")
 		require.ErrorAs(t, err, &ssosettings.ErrNotFound)
 	})
 }
@@ -218,6 +231,33 @@ func TestIntegrationUpsertSSOSettings(t *testing.T) {
 			require.EqualValues(t, template.Settings, existing.Settings)
 		}
 	})
+
+	t.Run("fails if the provider is empty", func(t *testing.T) {
+		setup()
+
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":       true,
+				"client_id":     "azuread-client",
+				"client_secret": "this-is-a-secret",
+			},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, template, "azuread")
+		require.NoError(t, err)
+
+		settings := models.SSOSettings{
+			Provider: "",
+			Settings: map[string]any{
+				"enabled":   true,
+				"client_id": "new-client",
+			},
+		}
+
+		err = ssoSettingsStore.Upsert(context.Background(), settings)
+		require.Error(t, err)
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+	})
 }
 
 func TestIntegrationListSSOSettings(t *testing.T) {
@@ -231,31 +271,58 @@ func TestIntegrationListSSOSettings(t *testing.T) {
 	setup := func() {
 		sqlStore = db.InitTestDB(t)
 		ssoSettingsStore = ProvideStore(sqlStore)
-
-		template := models.SSOSettings{
-			Settings: map[string]any{
-				"enabled": true,
-			},
-		}
-		err := populateSSOSettings(sqlStore, template, "azuread")
-		require.NoError(t, err)
-
-		template = models.SSOSettings{
-			Settings: map[string]any{
-				"enabled": true,
-			},
-		}
-		err = populateSSOSettings(sqlStore, template, "okta")
-		require.NoError(t, err)
 	}
 
 	t.Run("returns every SSO settings successfully", func(t *testing.T) {
 		setup()
 
+		providers := []string{"azuread", "okta", "github"}
+		settings := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled":   true,
+				"client_id": "the_client_id",
+			},
+			IsDeleted: false,
+		}
+		err := populateSSOSettings(sqlStore, settings, providers...)
+		require.NoError(t, err)
+
+		deleted := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": false,
+			},
+			IsDeleted: true,
+		}
+		err = populateSSOSettings(sqlStore, deleted, "google", "gitlab", "okta")
+		require.NoError(t, err)
+
 		list, err := ssoSettingsStore.List(context.Background())
 
 		require.NoError(t, err)
-		require.Equal(t, 2, len(list))
+		require.Len(t, list, len(providers))
+
+		for _, item := range list {
+			require.Contains(t, providers, item.Provider)
+			require.EqualValues(t, settings.Settings, item.Settings)
+		}
+	})
+
+	t.Run("returns empty list if no settings are found", func(t *testing.T) {
+		setup()
+
+		deleted := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": false,
+			},
+			IsDeleted: true,
+		}
+		err := populateSSOSettings(sqlStore, deleted, "google", "gitlab", "okta")
+		require.NoError(t, err)
+
+		list, err := ssoSettingsStore.List(context.Background())
+
+		require.NoError(t, err)
+		require.Len(t, list, 0)
 	})
 }
 
@@ -362,6 +429,28 @@ func TestIntegrationDeleteSSOSettings(t *testing.T) {
 		require.EqualValues(t, 1, deleted)
 		require.EqualValues(t, 1, notDeleted)
 	})
+
+	t.Run("return not found if the provider is empty", func(t *testing.T) {
+		setup()
+
+		providers := []string{"github", "google", "okta"}
+		template := models.SSOSettings{
+			Settings: map[string]any{
+				"enabled": true,
+			},
+		}
+		err := populateSSOSettings(sqlStore, template, providers...)
+		require.NoError(t, err)
+
+		err = ssoSettingsStore.Delete(context.Background(), "")
+		require.Error(t, err)
+		require.ErrorIs(t, err, ssosettings.ErrNotFound)
+
+		deleted, notDeleted, err := getSSOSettingsCountByDeleted(sqlStore)
+		require.NoError(t, err)
+		require.EqualValues(t, 0, deleted)
+		require.EqualValues(t, len(providers), notDeleted)
+	})
 }
 
 func populateSSOSettings(sqlStore *sqlstore.SQLStore, template models.SSOSettings, providers ...string) error {