From 7d71923d4f725338674689a5297a1f45ea7cf2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20Bouzour=C3=A8ne?= <william@bouzourene.ch>
Date: Thu, 2 Jan 2025 19:50:14 +0100
Subject: [PATCH] Remove DisabledAt for users

---
 controllers/login.go | 8 +-------
 helpers/users.go     | 3 +--
 models/users.go      | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/controllers/login.go b/controllers/login.go
index b7e438b..b4c4b67 100644
--- a/controllers/login.go
+++ b/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(
-			&user,
-			"LOWER(email) = LOWER(?) AND (disabled_at IS NULL OR disabled_at <= ?)",
-			email,
-			time.Now(),
-		)
+		result := db.First(&user, "LOWER(email) = LOWER(?)", email)
 
 		if result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) {
 			return err
diff --git a/helpers/users.go b/helpers/users.go
index a599108..2d2a785 100644
--- a/helpers/users.go
+++ b/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
diff --git a/models/users.go b/models/users.go
index 004c190..9bde084 100644
--- a/models/users.go
+++ b/models/users.go
@@ -12,7 +12,6 @@ type User struct {
 	Email       string
 	Password    string
 	TotpSercet  sql.NullString
-	DisabledAt  sql.NullTime
 	IsAdmin     bool
 	SkipWelcome bool
 }