feat(sms): 支持双站点独立配置登录短信
This commit is contained in:
@@ -55,13 +55,18 @@ type SiteSMSProviderResolver interface {
|
||||
ResolveSMSProvider(ctx context.Context, siteCode, domain string) (smsprovider.Provider, error)
|
||||
}
|
||||
|
||||
type TenantSMSProviderResolver interface {
|
||||
ResolveSMSProvider(ctx context.Context) (smsprovider.Provider, error)
|
||||
}
|
||||
|
||||
type Service struct {
|
||||
users *UserRepository
|
||||
redis *redis.Client
|
||||
jwt *JWTManager
|
||||
sms smsprovider.Provider
|
||||
smsResolver SiteSMSProviderResolver
|
||||
log *zap.Logger
|
||||
users *UserRepository
|
||||
redis *redis.Client
|
||||
jwt *JWTManager
|
||||
sms smsprovider.Provider
|
||||
tenantSMSResolver TenantSMSProviderResolver
|
||||
smsResolver SiteSMSProviderResolver
|
||||
log *zap.Logger
|
||||
}
|
||||
|
||||
type LoginResult struct {
|
||||
@@ -77,6 +82,10 @@ func (s *Service) SetSiteSMSResolver(resolver SiteSMSProviderResolver) {
|
||||
s.smsResolver = resolver
|
||||
}
|
||||
|
||||
func (s *Service) SetTenantSMSResolver(resolver TenantSMSProviderResolver) {
|
||||
s.tenantSMSResolver = resolver
|
||||
}
|
||||
|
||||
func (s *Service) Captcha(ctx context.Context) (*captcha.Item, error) {
|
||||
if s.redis == nil {
|
||||
return nil, ErrDependencyUnavailable
|
||||
@@ -139,7 +148,19 @@ func (s *Service) SendSMSCode(ctx context.Context, phone string, captchaID strin
|
||||
if len(siteContext) > 1 {
|
||||
domain = strings.TrimSpace(siteContext[1])
|
||||
}
|
||||
if s.smsResolver != nil && (siteCode != "" || domain != "") {
|
||||
if tenantID > 0 && s.tenantSMSResolver != nil {
|
||||
customProvider, resolveErr := s.tenantSMSResolver.ResolveSMSProvider(ctx)
|
||||
if resolveErr != nil {
|
||||
if s.log != nil {
|
||||
s.log.Warn("解析本站独立短信服务商失败,将回退至主站默认通道",
|
||||
zap.Uint64("tenant_id", tenantID),
|
||||
zap.Error(resolveErr),
|
||||
)
|
||||
}
|
||||
} else if customProvider != nil {
|
||||
provider = customProvider
|
||||
}
|
||||
} else if s.smsResolver != nil && (siteCode != "" || domain != "") {
|
||||
customProvider, resolveErr := s.smsResolver.ResolveSMSProvider(ctx, siteCode, domain)
|
||||
if resolveErr != nil {
|
||||
if s.log != nil {
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
smsprovider "hfb_sys/backend/internal/integrations/sms"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"github.com/redis/go-redis/v9"
|
||||
"go.uber.org/zap"
|
||||
@@ -30,6 +31,16 @@ type mockResolver struct {
|
||||
calledSites []string
|
||||
}
|
||||
|
||||
type mockTenantResolver struct {
|
||||
customProvider smsprovider.Provider
|
||||
called bool
|
||||
}
|
||||
|
||||
func (m *mockTenantResolver) ResolveSMSProvider(ctx context.Context) (smsprovider.Provider, error) {
|
||||
m.called = true
|
||||
return m.customProvider, nil
|
||||
}
|
||||
|
||||
func (m *mockResolver) ResolveSMSProvider(ctx context.Context, siteCode, domain string) (smsprovider.Provider, error) {
|
||||
m.calledSites = append(m.calledSites, siteCode)
|
||||
if siteCode == "site_custom" {
|
||||
@@ -38,6 +49,45 @@ func (m *mockResolver) ResolveSMSProvider(ctx context.Context, siteCode, domain
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func TestSendSMSCode_TenantResolutionOverridesDefault(t *testing.T) {
|
||||
rdb := redis.NewClient(&redis.Options{
|
||||
Addr: "127.0.0.1:16379",
|
||||
DB: 15,
|
||||
})
|
||||
ctx := tenancy.WithScope(t.Context(), tenancy.Scope{TenantID: 202})
|
||||
if err := rdb.Ping(ctx).Err(); err != nil {
|
||||
t.Skipf("跳过测试:未检测到测试 Redis: %v", err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
_ = rdb.FlushDB(context.Background()).Err()
|
||||
_ = rdb.Close()
|
||||
})
|
||||
_ = rdb.FlushDB(ctx)
|
||||
|
||||
defaultProv := &recordProvider{}
|
||||
customProv := &recordProvider{}
|
||||
tenantResolver := &mockTenantResolver{customProvider: customProv}
|
||||
svc := NewService(nil, rdb, nil, defaultProv, zap.NewNop())
|
||||
svc.SetTenantSMSResolver(tenantResolver)
|
||||
|
||||
if err := rdb.Set(ctx, "captcha:auth:sms:tenant-cap", "ABCD", time.Minute).Err(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
phone := "13800138202"
|
||||
if err := svc.SendSMSCode(ctx, phone, "tenant-cap", "ABCD"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !tenantResolver.called {
|
||||
t.Fatal("tenant resolver was not called")
|
||||
}
|
||||
if len(customProv.sentPhones) != 1 || customProv.sentPhones[0] != phone {
|
||||
t.Fatalf("custom provider sent = %v", customProv.sentPhones)
|
||||
}
|
||||
if len(defaultProv.sentPhones) != 0 {
|
||||
t.Fatalf("default provider sent = %v", defaultProv.sentPhones)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSendSMSCode_SiteResolutionAndFallback(t *testing.T) {
|
||||
rdb := redis.NewClient(&redis.Options{
|
||||
Addr: "127.0.0.1:16379",
|
||||
|
||||
Reference in New Issue
Block a user