Improve auth errors for invalid users

2019-12-03 16:48:58 +01:00
parent ab77e92c14
commit f763dc26fc
2 changed files with 11 additions and 1 deletions
@@ -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
 	}

@@ -21,6 +21,10 @@ const (
 	ErrNoScriptCreatePermissions      serviceError = "NoScriptCreatePermissions"
 	ErrNoReminderAssignPermissions    serviceError = "NoReminderAssignPermissions"

+	ErrUserSuspended serviceError = "UserSuspended"
+	ErrUserDeleted   serviceError = "UserDeleted"
+	ErrUserInvalid   serviceError = "UserInvalid"
+
 	ErrNoEmailTemplateForGivenOperation serviceError = "NoEmailTemplateForGivenOperation"
 )