Tag login email field as email type

server/controllers/auth.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"strings"
 
 	"github.com/akhilrex/hammond/common"
 	"github.com/akhilrex/hammond/db"
@@ -92,7 +91,7 @@ func userLogin(c *gin.Context) {
 		c.JSON(http.StatusUnprocessableEntity, common.NewValidatorError(err))
 		return
 	}
-	user, err := db.FindOneUser(&db.User{Email: strings.ToLower(loginRequest.Email)})
+	user, err := db.FindOneUser(&db.User{Email: loginRequest.Email})
 
 	if err != nil {
 		c.JSON(http.StatusForbidden, common.NewError("login", errors.New("Not Registered email or invalid password")))

server/db/migrations.go

@@ -18,10 +18,6 @@ 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() {

server/service/userService.go

@@ -1,8 +1,6 @@
 package service
 
 import (
-	"strings"
-
 	"github.com/akhilrex/hammond/db"
 	"github.com/akhilrex/hammond/models"
 )
@@ -10,7 +8,7 @@ import (
 func CreateUser(userModel *models.RegisterRequest, role db.Role) error {
 	setting := db.GetOrCreateSetting()
 	toCreate := db.User{
-		Email:        strings.ToLower(userModel.Email),
+		Email:        userModel.Email,
 		Name:         userModel.Name,
 		Role:         role,
 		Currency:     setting.Currency,

ui/src/router/views/login.vue

@@ -16,7 +16,7 @@ export default {
       password: '',
       authError: null,
       tryingToLogIn: false,
-      errorMessage:''
+      errorMessage: '',
     }
   },
   computed: {
@@ -38,7 +38,7 @@ export default {
     // and password they provided.
     tryToLogIn() {
       this.tryingToLogIn = true
-      this.errorMessage='';
+      this.errorMessage = ''
       // Reset the authError if it existed.
       this.authError = null
       return this.logIn({
@@ -53,9 +53,9 @@ export default {
           // Redirect to the originally requested page, or to the home page
         })
         .catch((error) => {
-         if(error.response.data?.errors?.login){
+          if (error.response.data?.errors?.login) {
-           this.errorMessage=error.response.data.errors.login
+            this.errorMessage = error.response.data.errors.login
-         }
+          }
           this.tryingToLogIn = false
           this.authError = error
         })
@@ -67,21 +67,9 @@ export default {
 <template>
   <Layout>
     <form @submit.prevent="tryToLogIn">
-      <b-field label="Email">
+      <b-field label="Email"> <b-input v-model="username" tag="b-input" name="username" type="email" :placeholder="placeholders.username"/></b-field>
-        <b-input
-          v-model="username"
-          tag="b-input"
-          name="username"
-          :placeholder="placeholders.username"
-      /></b-field>
       <b-field label="Password">
-        <b-input
+        <b-input v-model="password" tag="b-input" name="password" type="password" :placeholder="placeholders.password" />
-          v-model="password"
-          tag="b-input"
-          name="password"
-          type="password"
-          :placeholder="placeholders.password"
-        />
       </b-field>
       <b-button tag="input" native-type="submit" :disabled="tryingToLogIn" type="is-primary">
         <BaseIcon v-if="tryingToLogIn" name="sync" spin />
@@ -89,9 +77,7 @@ export default {
           Log in
         </span>
       </b-button>
-      <p v-if="authError">
+      <p v-if="authError"> There was an error logging in to your account. {{ errorMessage }} </p>
-        There was an error logging in to your account. {{errorMessage}}
-      </p>
     </form>
   </Layout>
 </template>