浏览代码

Login: divide login errors by pkg and service (#17835)

Define errors in the login module only if they are used
Oleg Gaidarenko 6 年之前
父节点
当前提交
5836427794
共有 2 个文件被更改,包括 3 次插入12 次删除
  1. 0 3
      pkg/login/auth.go
  2. 3 9
      pkg/services/login/errors.go

+ 0 - 3
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")
 )
 

+ 3 - 9
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")
 )