forked from baron/baron-sso
테넌트 목록 조회 cursor기반으로 재구성. 사용자 metadata 미사용 필드 제거
This commit is contained in:
@@ -221,25 +221,41 @@ func gradeFromTraits(traits map[string]interface{}) string {
|
||||
return value
|
||||
}
|
||||
|
||||
func tenantSlugFromRequest(tenantSlug string, legacyCompanyCode string) string {
|
||||
if value := strings.TrimSpace(tenantSlug); value != "" {
|
||||
return value
|
||||
}
|
||||
return strings.TrimSpace(legacyCompanyCode)
|
||||
}
|
||||
|
||||
func tenantSlugPointerFromRequest(tenantSlug *string, legacyCompanyCode *string) *string {
|
||||
if tenantSlug != nil {
|
||||
value := strings.TrimSpace(*tenantSlug)
|
||||
return &value
|
||||
}
|
||||
if legacyCompanyCode != nil {
|
||||
value := strings.TrimSpace(*legacyCompanyCode)
|
||||
return &value
|
||||
func rejectLegacyCompanyCode(value string) error {
|
||||
if strings.TrimSpace(value) != "" {
|
||||
return errors.New("companyCode is deprecated; use tenantSlug")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func rejectLegacyCompanyCodePointer(value *string) error {
|
||||
if value == nil {
|
||||
return nil
|
||||
}
|
||||
return rejectLegacyCompanyCode(*value)
|
||||
}
|
||||
|
||||
func tenantSlugFromRequest(tenantSlug string, legacyCompanyCode string) (string, error) {
|
||||
if err := rejectLegacyCompanyCode(legacyCompanyCode); err != nil {
|
||||
return "", err
|
||||
}
|
||||
if value := strings.TrimSpace(tenantSlug); value != "" {
|
||||
return value, nil
|
||||
}
|
||||
return "", nil
|
||||
}
|
||||
|
||||
func tenantSlugPointerFromRequest(tenantSlug *string, legacyCompanyCode *string) (*string, error) {
|
||||
if err := rejectLegacyCompanyCodePointer(legacyCompanyCode); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tenantSlug != nil {
|
||||
value := strings.TrimSpace(*tenantSlug)
|
||||
return &value, nil
|
||||
}
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
type userSummary struct {
|
||||
ID string `json:"id"`
|
||||
Email string `json:"email"`
|
||||
|
||||
Reference in New Issue
Block a user