pro/olons_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: select support identity by IM tenant
Deploy olons-server production / deploy (push) Successful in 5m4s
Details

Browse Source
This commit is contained in:
Your Name
2026-10-20 21:42:43 +08:00
parent 975a2a2ed2
commit 6954d375b5
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/support/service.go
+2 -8
View File
@@ -20,7 +20,7 @@ import (
type Repository interface {
CustomerServiceByID(context.Context, int64, int64) (*store.CustomerService, error)
MemberIMIdentity(context.Context, int64, int64) (*store.MemberIMIdentity, error)
MemberIMIdentityForTenant(context.Context, int64, int64, string) (*store.MemberIMIdentity, error)
MemberIMProfile(context.Context, int64, int64) (*store.MemberIMProfile, error)
SaveMemberIMIdentity(context.Context, *store.MemberIMIdentity) (*store.MemberIMIdentity, error)
}
@@ -188,14 +188,8 @@ func (s *Service) OpenSession(ctx context.Context, tenantID, memberID, serviceID
}
func (s *Service) ensureIdentity(ctx context.Context, tenantID, memberID int64, imTenantCode string) (*store.MemberIMIdentity, error) {
identity, err := s.repository.MemberIMIdentity(ctx, tenantID, memberID)
identity, err := s.repository.MemberIMIdentityForTenant(ctx, tenantID, memberID, imTenantCode)
if err == nil {
if !strings.EqualFold(identity.IMTenantCode, imTenantCode) {
// A tenant switch creates a distinct IM user. Keep the old tenant's IM
// account intact, but replace this member's local mapping with a newly
// provisioned account in the active tenant.
return s.createIdentity(ctx, tenantID, memberID, imTenantCode)
}
if identity.IMUserID == "" || identity.IMUsername == "" {
return nil, ErrIMUnavailable
}