Open platform to collect and prioritize feedback
fix: emails should be case insensitive (#746)
Guilherme Oenning16242143a7ad
diff --git a/app/pkg/web/oauth.go b/app/pkg/web/oauth.goindex 23cf607f8..e2e6e1af4 100644--- a/app/pkg/web/oauth.go+++ b/app/pkg/web/oauth.go@@ -188,7 +188,7 @@ func (s *OAuthService) ParseRawProfile(provider, body string) (*oauth.UserProfilprofile := &oauth.UserProfile{ID: strings.TrimSpace(query.String(config.JSONUserIDPath)),Name: strings.TrimSpace(query.String(config.JSONUserNamePath)),- Email: strings.TrimSpace(query.String(config.JSONUserEmailPath)),+ Email: strings.ToLower(strings.TrimSpace(query.String(config.JSONUserEmailPath))),}if profile.ID == "" {diff --git a/app/pkg/web/oauth_test.go b/app/pkg/web/oauth_test.goindex 95ed7f98a..886a7fe2b 100644--- a/app/pkg/web/oauth_test.go+++ b/app/pkg/web/oauth_test.go@@ -120,7 +120,7 @@ func TestParseProfileResponse_NestedData(t *testing.T) {"id": "123","profile": {"name": "Jon Snow",- "email": "[email protected]"+ "email": "[email protected]"}}`,)diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex 2ccc13eda..6ec8446ba 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -99,6 +99,7 @@ func (s *UserStorage) GetByID(userID int) (*models.User, error) {// GetByEmail returns a user based on given emailfunc (s *UserStorage) GetByEmail(email string) (*models.User, error) {+ email = strings.ToLower(email)user, err := s.getUser(s.trx, "email = $1 AND tenant_id = $2", email, s.tenant.ID)if err != nil {return nil, errors.Wrap(err, "failed to get user with email '%s'", email)@@ -128,7 +129,7 @@ func (s *UserStorage) GetByProvider(provider string, uid string) (*models.User,func (s *UserStorage) Register(user *models.User) error {now := time.Now()user.Status = models.UserActive- user.Email = strings.TrimSpace(user.Email)+ user.Email = strings.ToLower(strings.TrimSpace(user.Email))if err := s.trx.Get(&user.ID,"INSERT INTO users (name, email, created_at, tenant_id, role, status, avatar_type, avatar_bkey) VALUES ($1, $2, $3, $4, $5, $6, $7, '') RETURNING id",user.Name, user.Email, now, s.tenant.ID, user.Role, models.UserActive, models.AvatarTypeGravatar); err != nil {@@ -227,7 +228,7 @@ func (s *UserStorage) ChangeRole(userID int, role models.Role) error {// ChangeEmail of given userfunc (s *UserStorage) ChangeEmail(userID int, email string) error {cmd := "UPDATE users SET email = $3 WHERE id = $1 AND tenant_id = $2"- _, err := s.trx.Execute(cmd, userID, s.tenant.ID, email)+ _, err := s.trx.Execute(cmd, userID, s.tenant.ID, strings.ToLower(email))if err != nil {return errors.Wrap(err, "failed to update user's email")}diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex e79a09d77..a1f794fa8 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -51,6 +51,10 @@ func TestUserStorage_GetByEmail(t *testing.T) {Expect(user.Providers).HasLen(1)Expect(user.Providers[0].UID).Equals("FB1234")Expect(user.Providers[0].Name).Equals("facebook")++ user, err = users.GetByEmail("[email protected]")+ Expect(err).IsNil()+ Expect(user.ID).Equals(int(1))}func TestUserStorage_GetByProvider(t *testing.T) {diff --git a/migrations/201904022134_lowercase_emails.sql b/migrations/201904022134_lowercase_emails.sqlnew file mode 100644index 000000000..3229bf375--- /dev/null+++ b/migrations/201904022134_lowercase_emails.sql@@ -0,0 +1 @@+update users set email = lower(email) where email != lower(email)\ No newline at end of file