Make emails case insensitive

2022-03-07 00:17:35 +01:00
6 changed files with 9 additions and 3 deletions
--- a/server/controllers/auth.go
+++ b/server/controllers/auth.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
 	"strings"
 	"github.com/akhilrex/hammond/common"
 	"github.com/akhilrex/hammond/db"
@@ -91,7 +92,7 @@ func userLogin(c *gin.Context) {
 		c.JSON(http.StatusUnprocessableEntity, common.NewValidatorError(err))
 		return
 	}
-	user, err := db.FindOneUser(&db.User{Email: loginRequest.Email})
+	user, err := db.FindOneUser(&db.User{Email: strings.ToLower(loginRequest.Email)})
 	if err != nil {
 		c.JSON(http.StatusForbidden, common.NewError("login", errors.New("Not Registered email or invalid password")))
--- a/server/db/migrations.go
+++ b/server/db/migrations.go
@@ -18,6 +18,10 @@ var migrations = []localMigration{
 		Name:  "2021_06_24_04_42_SetUserDisabledFalse",
 		Query: "update users set is_disabled=0",
 	},
 	{
 		Name:  "2021_02_07_00_09_LowerCaseEmails",
 		Query: "update users set email=lower(email)",
 	},
 }
 func RunMigrations() {
--- a/server/service/userService.go
+++ b/server/service/userService.go
@@ -1,6 +1,8 @@
 package service
 import (
 	"strings"
 	"github.com/akhilrex/hammond/db"
 	"github.com/akhilrex/hammond/models"
 )
@@ -8,7 +10,7 @@ import (
 func CreateUser(userModel *models.RegisterRequest, role db.Role) error {
 	setting := db.GetOrCreateSetting()
 	toCreate := db.User{
-		Email:        userModel.Email,
+		Email:        strings.ToLower(userModel.Email),
 		Name:         userModel.Name,
 		Role:         role,
 		Currency:     setting.Currency,
--- a/ui/public/hammond.png
+++ b/ui/public/hammond.png
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -5,7 +5,6 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
    <link rel="shortcut icon" href="<%= webpackConfig.output.publicPath %>hammond.png" />
    <link rel="apple-touch-icon" href="<%= webpackConfig.output.publicPath %>touch-icon.png" />
    <title><%= webpackConfig.name %></title>
  </head>
  <body>
--- a/ui/public/touch-icon.png
+++ b/ui/public/touch-icon.png