认证授权测试代码与业务代码质量修复

web/services/verifier.go

@@ -15,9 +15,6 @@ import (
 
 var Verifier = &verifierService{}
 
-type verifierService struct {
-}
-
 type VerifierServiceError string
 
 func (e VerifierServiceError) Error() string {
@@ -37,11 +34,10 @@ func (e VerifierServiceSendLimitErr) Error() string {
 type VerifierSmsPurpose int
 
 const (
-	Login VerifierSmsPurpose = iota
+	VerifierSmsPurposeLogin VerifierSmsPurpose = iota
 )
 
-func smsKey(phone string, purpose VerifierSmsPurpose) string {
-	return fmt.Sprintf("verify:sms:%d:%s", purpose, phone)
+type verifierService struct {
 }
 
 func (s *verifierService) SendSms(ctx context.Context, phone string, purpose VerifierSmsPurpose) error {
@@ -83,8 +79,8 @@ func (s *verifierService) SendSms(ctx context.Context, phone string, purpose Ver
 	return nil
 }
 
-func (s *verifierService) VerifySms(ctx context.Context, phone, code string) (bool, error) {
-	key := smsKey(phone, Login)
+func (s *verifierService) VerifySms(ctx context.Context, phone, code string) error {
+	key := smsKey(phone, VerifierSmsPurposeLogin)
 	keyLock := key + ":lock"
 
 	err := rds.Client.Watch(ctx, func(tx *redis.Tx) error {
@@ -114,11 +110,12 @@ func (s *verifierService) VerifySms(ctx context.Context, phone, code string) (bo
 		return nil
 	}, key)
 	if err != nil {
-		if errors.Is(err, ErrVerifierServiceInvalid) {
-			return false, nil
-		}
-		return false, err
+		return err
 	}
 
-	return true, nil
+	return nil
+}
+
+func smsKey(phone string, purpose VerifierSmsPurpose) string {
+	return fmt.Sprintf("verify:sms:%d:%s", purpose, phone)
 }