From 58364277943611f3ee822a4be9d66efebbd68b64 Mon Sep 17 00:00:00 2001 From: Oleg Gaidarenko Date: Mon, 1 Jul 2019 14:32:17 +0300 Subject: [PATCH] Login: divide login errors by pkg and service (#17835) Define errors in the login module only if they are used --- pkg/login/auth.go | 3 --- pkg/services/login/errors.go | 12 +++--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkg/login/auth.go b/pkg/login/auth.go index ca5b572deb8..19232e5f441 100644 --- a/pkg/login/auth.go +++ b/pkg/login/auth.go @@ -10,15 +10,12 @@ import ( var ( ErrEmailNotAllowed = errors.New("Required email domain not fulfilled") - ErrNoLDAPServers = errors.New("No LDAP servers are configured") ErrInvalidCredentials = errors.New("Invalid Username or Password") ErrNoEmail = errors.New("Login provider didn't return an email address") ErrProviderDeniedRequest = errors.New("Login provider denied login request") ErrSignUpNotAllowed = errors.New("Signup is not allowed for this adapter") ErrTooManyLoginAttempts = errors.New("Too many consecutive incorrect login attempts for user. Login for user temporarily blocked") ErrPasswordEmpty = errors.New("No password provided") - ErrUsersQuotaReached = errors.New("Users quota reached") - ErrGettingUserQuota = errors.New("Error getting user quota") ErrUserDisabled = errors.New("User is disabled") ) diff --git a/pkg/services/login/errors.go b/pkg/services/login/errors.go index dbf15ea76cd..7f39389c16d 100644 --- a/pkg/services/login/errors.go +++ b/pkg/services/login/errors.go @@ -3,13 +3,7 @@ package login import "errors" var ( - ErrEmailNotAllowed = errors.New("Required email domain not fulfilled") - ErrInvalidCredentials = errors.New("Invalid Username or Password") - ErrNoEmail = errors.New("Login provider didn't return an email address") - ErrProviderDeniedRequest = errors.New("Login provider denied login request") - ErrSignUpNotAllowed = errors.New("Signup is not allowed for this adapter") - ErrTooManyLoginAttempts = errors.New("Too many consecutive incorrect login attempts for user. Login for user temporarily blocked") - ErrPasswordEmpty = errors.New("No password provided") - ErrUsersQuotaReached = errors.New("Users quota reached") - ErrGettingUserQuota = errors.New("Error getting user quota") + ErrInvalidCredentials = errors.New("Invalid Username or Password") + ErrUsersQuotaReached = errors.New("Users quota reached") + ErrGettingUserQuota = errors.New("Error getting user quota") )