diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index f31900d..a8e1e6f 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -10,8 +10,8 @@ import ( "time" "unicode" + "git.umbach.dev/app-idea/rest-api/modules/config" "git.umbach.dev/app-idea/rest-api/modules/database" - "git.umbach.dev/app-idea/rest-api/modules/serversettings" "git.umbach.dev/app-idea/rest-api/modules/structs" "github.com/gofiber/fiber/v2" "github.com/google/uuid" @@ -21,7 +21,7 @@ import ( "gorm.io/gorm" ) -var settings = &serversettings.Settings +var cfg = &config.Cfg.Settings type LoginInput struct { Username string `json:"username"` @@ -89,7 +89,7 @@ func NewUser(c *fiber.Ctx) error { input.Password = string(decodedPassword) - if /*!isValid(input.Username, 3, 30)*/ !isUsernameValid(input.Username) || !isEmailValid(input.Email) || /*!isValid(input.Password, 6, 250)*/ !isPasswordValid(input.Password) { + if !isUsernameValid(input.Username) || !isEmailValid(input.Email) || !isPasswordValid(input.Password) { return c.SendStatus(fiber.StatusForbidden) } @@ -223,7 +223,7 @@ func isUpper(s string) bool { } func isUsernameValid(u string) bool { - if len(u) < int(settings.UsernameMinLen) || len(u) > int(settings.UsernameMaxLen) { + if len(u) < int(cfg.UsernameMinLen) || len(u) > int(cfg.UsernameMaxLen) { return false } return true @@ -232,14 +232,14 @@ func isUsernameValid(u string) bool { var emailRegex = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$") func isEmailValid(e string) bool { - if len(e) < int(settings.EmailMinLen) || len(e) > int(settings.EmailMaxLen) { + if len(e) < int(cfg.EmailMinLen) || len(e) > int(cfg.EmailMaxLen) { return false } return emailRegex.MatchString(e) } func isPasswordValid(p string) bool { - if len(p) < int(settings.PasswordMinLen) || len(p) > int(settings.PasswordMaxLen) { + if len(p) < int(cfg.PasswordMinLen) || len(p) > int(cfg.PasswordMaxLen) { return false } return true @@ -324,7 +324,7 @@ func createUserSession(db *gorm.DB, userId string, ip string, userAgent string) } func getExpiresTime() time.Time { - return time.Now().Add(time.Hour * time.Duration(serversettings.Settings.ExpiredTime)) + return time.Now().Add(time.Hour * time.Duration(cfg.ExpiredTime)) } func Login(c *fiber.Ctx) error {