From 9c1ef8b16e302b6dd879e2f6f0a4c46e049f2937 Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Tue, 16 Apr 2024 17:47:17 +0100 Subject: [PATCH] Auth: Remove caseinsensitive check on update user (#86286) * Removal: case insensitive check on update * refactor and removal of test for duplicate user * refactor to still shadow user variable --- pkg/services/user/userimpl/store.go | 4 ---- pkg/services/user/userimpl/store_test.go | 9 --------- 2 files changed, 13 deletions(-) diff --git a/pkg/services/user/userimpl/store.go b/pkg/services/user/userimpl/store.go index 62fb4393fc6..e9eb275a9e3 100644 --- a/pkg/services/user/userimpl/store.go +++ b/pkg/services/user/userimpl/store.go @@ -333,10 +333,6 @@ func (ss *sqlStore) Update(ctx context.Context, cmd *user.UpdateUserCommand) err return err } - if err := ss.userCaseInsensitiveLoginConflict(ctx, sess, user.Login, user.Email); err != nil { - return err - } - if cmd.IsGrafanaAdmin != nil && !*cmd.IsGrafanaAdmin { // validate that after update there is at least one server admin if err := validateOneAdminLeft(ctx, sess); err != nil { diff --git a/pkg/services/user/userimpl/store_test.go b/pkg/services/user/userimpl/store_test.go index b172f6c09ec..68f62f7c346 100644 --- a/pkg/services/user/userimpl/store_test.go +++ b/pkg/services/user/userimpl/store_test.go @@ -924,15 +924,6 @@ func TestIntegrationUserUpdate(t *testing.T) { } }) - t.Run("Testing DB - update generates duplicate user", func(t *testing.T) { - err := userStore.Update(context.Background(), &user.UpdateUserCommand{ - Login: "loginuser2", - UserID: users[0].ID, - }) - - require.Error(t, err) - }) - t.Run("Testing DB - update lowercases existing user", func(t *testing.T) { err := userStore.Update(context.Background(), &user.UpdateUserCommand{ Login: "loginUSER0",