From f763dc26fcd46685f265e266ba943c748f7fdcc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Tue, 3 Dec 2019 16:48:55 +0100 Subject: [PATCH] Improve auth errors for invalid users --- system/service/auth.go | 8 +++++++- system/service/error.go | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/system/service/auth.go b/system/service/auth.go index d85e71a93..3534ba9e5 100644 --- a/system/service/auth.go +++ b/system/service/auth.go @@ -423,8 +423,14 @@ func (svc auth) InternalLogin(email string, password string) (u *types.User, err } if !u.Valid() { + if u.SuspendedAt != nil { + err = ErrUserSuspended + } else if u.DeletedAt != nil { + err = ErrUserDeleted + } else { + err = ErrUserInvalid + } u = nil - err = errors.New("user not valid") return } diff --git a/system/service/error.go b/system/service/error.go index 03590918c..aec50486c 100644 --- a/system/service/error.go +++ b/system/service/error.go @@ -21,6 +21,10 @@ const ( ErrNoScriptCreatePermissions serviceError = "NoScriptCreatePermissions" ErrNoReminderAssignPermissions serviceError = "NoReminderAssignPermissions" + ErrUserSuspended serviceError = "UserSuspended" + ErrUserDeleted serviceError = "UserDeleted" + ErrUserInvalid serviceError = "UserInvalid" + ErrNoEmailTemplateForGivenOperation serviceError = "NoEmailTemplateForGivenOperation" )