mirror
/
greatape
kopia lustrzana https://github.com/reiver/greatape
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix(components): 🐛 resolve username and email case sensitiviy issue

master
Xeronith 2023-08-05 13:06:18 +03:30
rodzic 51959fb83e
commit 9640fc47a5
1 zmienionych plików z 12 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
components/core/spi_manager.go
Wyświetl plik

@ -344,6 +344,10 @@ func (result signupResult) Code() string {
//endregion //endregion
func (manager *spiManager) Signup(username string, email string, password string, editor Identity) (result ISignupResult, err error) { func (manager *spiManager) Signup(username string, email string, password string, editor Identity) (result ISignupResult, err error) {
username = strings.ToLower(username)
email = strings.ToLower(email)
if !validators.UsernameIsValid(username) { if !validators.UsernameIsValid(username) {
return nil, ERROR_INVALID_USERNAME_FOR_SIGNUP return nil, ERROR_INVALID_USERNAME_FOR_SIGNUP
} }
@ -362,9 +366,6 @@ func (manager *spiManager) Signup(username string, email string, password string
} }
}() }()
username = strings.ToLower(username)
email = strings.ToLower(email)
editor.Lock(SIGNUP_REQUEST) editor.Lock(SIGNUP_REQUEST)
defer editor.Unlock(SIGNUP_REQUEST) defer editor.Unlock(SIGNUP_REQUEST)
@ -395,6 +396,8 @@ func (result resendVerificationCodeResult) Code() string {
//endregion //endregion
func (manager *spiManager) ResendVerificationCode(email string, editor Identity) (result IResendVerificationCodeResult, err error) { func (manager *spiManager) ResendVerificationCode(email string, editor Identity) (result IResendVerificationCodeResult, err error) {
email = strings.ToLower(email)
if !validators.EmailIsValid(email) { if !validators.EmailIsValid(email) {
return nil, ERROR_INVALID_EMAIL_FOR_RESEND_VERIFICATION_CODE return nil, ERROR_INVALID_EMAIL_FOR_RESEND_VERIFICATION_CODE
} }
@ -405,8 +408,6 @@ func (manager *spiManager) ResendVerificationCode(email string, editor Identity)
} }
}() }()
email = strings.ToLower(email)
editor.Lock(RESEND_VERIFICATION_CODE_REQUEST) editor.Lock(RESEND_VERIFICATION_CODE_REQUEST)
defer editor.Unlock(RESEND_VERIFICATION_CODE_REQUEST) defer editor.Unlock(RESEND_VERIFICATION_CODE_REQUEST)
@ -437,6 +438,8 @@ func (result verifyResult) Token() string {
//endregion //endregion
func (manager *spiManager) Verify(email string, token string, code string, editor Identity) (result IVerifyResult, err error) { func (manager *spiManager) Verify(email string, token string, code string, editor Identity) (result IVerifyResult, err error) {
email = strings.ToLower(email)
if !validators.EmailIsValid(email) { if !validators.EmailIsValid(email) {
return nil, ERROR_INVALID_EMAIL_FOR_VERIFY return nil, ERROR_INVALID_EMAIL_FOR_VERIFY
} }
@ -447,8 +450,6 @@ func (manager *spiManager) Verify(email string, token string, code string, edito
} }
}() }()
email = strings.ToLower(email)
editor.Lock(VERIFY_REQUEST) editor.Lock(VERIFY_REQUEST)
defer editor.Unlock(VERIFY_REQUEST) defer editor.Unlock(VERIFY_REQUEST)
@ -485,6 +486,8 @@ func (result loginResult) Token() string {
//endregion //endregion
func (manager *spiManager) Login(email string, password string, editor Identity) (result ILoginResult, err error) { func (manager *spiManager) Login(email string, password string, editor Identity) (result ILoginResult, err error) {
email = strings.ToLower(email)
if !validators.EmailIsValid(email) { if !validators.EmailIsValid(email) {
return nil, ERROR_INVALID_EMAIL_FOR_LOGIN return nil, ERROR_INVALID_EMAIL_FOR_LOGIN
} }
@ -499,8 +502,6 @@ func (manager *spiManager) Login(email string, password string, editor Identity)
} }
}() }()
email = strings.ToLower(email)
editor.Lock(LOGIN_REQUEST) editor.Lock(LOGIN_REQUEST)
defer editor.Unlock(LOGIN_REQUEST) defer editor.Unlock(LOGIN_REQUEST)
@ -687,14 +688,14 @@ func NewResetPasswordResult(_ interface{}) IResetPasswordResult {
//endregion //endregion
func (manager *spiManager) ResetPassword(usernameOrEmail string, editor Identity) (result IResetPasswordResult, err error) { func (manager *spiManager) ResetPassword(usernameOrEmail string, editor Identity) (result IResetPasswordResult, err error) {
usernameOrEmail = strings.ToLower(usernameOrEmail)
defer func() { defer func() {
if reason := recover(); reason != nil { if reason := recover(); reason != nil {
err = manager.Error(reason) err = manager.Error(reason)
} }
}() }()
usernameOrEmail = strings.ToLower(usernameOrEmail)
editor.Lock(RESET_PASSWORD_REQUEST) editor.Lock(RESET_PASSWORD_REQUEST)
defer editor.Unlock(RESET_PASSWORD_REQUEST) defer editor.Unlock(RESET_PASSWORD_REQUEST)