Remove DisabledAt for users

controllers/login.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"errors"
 	"fmt"
-	"time"
 
 	"git.readonly.ch/bouzoure/popvaud-people/helpers"
 	"git.readonly.ch/bouzoure/popvaud-people/models"
@@ -33,12 +32,7 @@ func LoginForm(c *fiber.Ctx) error {
 		password := c.FormValue("password")
 
 		var user models.User
-		result := db.First(
+		result := db.First(&user, "LOWER(email) = LOWER(?)", email)
-			&user,
-			"LOWER(email) = LOWER(?) AND (disabled_at IS NULL OR disabled_at <= ?)",
-			email,
-			time.Now(),
-		)
 
 		if result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) {
 			return err

helpers/users.go

@@ -3,7 +3,6 @@ package helpers
 import (
 	"errors"
 	"fmt"
-	"time"
 
 	"git.readonly.ch/bouzoure/popvaud-people/models"
 	"github.com/gofiber/fiber/v2"
@@ -63,7 +62,7 @@ func UserExistsAndIsActive(id uint) (bool, error) {
 	}
 
 	var user models.User
-	result := db.First(&user, "id = ? AND (disabled_at IS NULL OR disabled_at <= ?)", id, time.Now())
+	result := db.First(&user, "id = ?", id)
 
 	if errors.Is(result.Error, gorm.ErrRecordNotFound) {
 		return false, nil

models/users.go

@@ -12,7 +12,6 @@ type User struct {
 	Email       string
 	Password    string
 	TotpSercet  sql.NullString
-	DisabledAt  sql.NullTime
 	IsAdmin     bool
 	SkipWelcome bool
 }