TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 14:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): correct mapping of user state queries (#9956)

Browse Source 
# Which Problems Are Solved

the mapping of `ListUsers` was wrong for user states.

# How the Problems Are Solved

mapping of user state introduced to correctly map it

# Additional Changes

mapping of user type introduced to prevent same issue

# Additional Context

Requires backport to 2.x and 3.x

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Silvan
2025-05-26 13:23:38 +02:00
committed by GitHub
parent 2cf3ef4de4
commit eb0eed21fa
8 changed files with 113 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/grpc/user/user.go
View File

@@ -1,5 +1,7 @@
package user
import "github.com/zitadel/zitadel/internal/domain"
type SearchQuery_ResourceOwner struct {
ResourceOwner *ResourceOwnerQuery
}
@@ -13,3 +15,37 @@ type ResourceOwnerQuery struct {
type UserType = isUser_Type
type MembershipType = isMembership_Type
func (s UserState) ToDomain() domain.UserState {
switch s {
case UserState_USER_STATE_UNSPECIFIED:
return domain.UserStateUnspecified
case UserState_USER_STATE_ACTIVE:
return domain.UserStateActive
case UserState_USER_STATE_INACTIVE:
return domain.UserStateInactive
case UserState_USER_STATE_DELETED:
return domain.UserStateDeleted
case UserState_USER_STATE_LOCKED:
return domain.UserStateLocked
case UserState_USER_STATE_SUSPEND:
return domain.UserStateSuspend
case UserState_USER_STATE_INITIAL:
return domain.UserStateInitial
default:
return domain.UserStateUnspecified
}
}
func (t Type) ToDomain() domain.UserType {
switch t {
case Type_TYPE_UNSPECIFIED:
return domain.UserTypeUnspecified
case Type_TYPE_HUMAN:
return domain.UserTypeHuman
case Type_TYPE_MACHINE:
return domain.UserTypeMachine
default:
return domain.UserTypeUnspecified
}
}

34
pkg/grpc/user/v2/user.go
View File

@@ -1,3 +1,37 @@
package user
import "github.com/zitadel/zitadel/internal/domain"
type UserType = isUser_Type
func (s UserState) ToDomain() domain.UserState {
switch s {
case UserState_USER_STATE_UNSPECIFIED:
return domain.UserStateUnspecified
case UserState_USER_STATE_ACTIVE:
return domain.UserStateActive
case UserState_USER_STATE_INACTIVE:
return domain.UserStateInactive
case UserState_USER_STATE_DELETED:
return domain.UserStateDeleted
case UserState_USER_STATE_LOCKED:
return domain.UserStateLocked
case UserState_USER_STATE_INITIAL:
return domain.UserStateInitial
default:
return domain.UserStateUnspecified
}
}
func (t Type) ToDomain() domain.UserType {
switch t {
case Type_TYPE_UNSPECIFIED:
return domain.UserTypeUnspecified
case Type_TYPE_HUMAN:
return domain.UserTypeHuman
case Type_TYPE_MACHINE:
return domain.UserTypeMachine
default:
return domain.UserTypeUnspecified
}
}

34
pkg/grpc/user/v2beta/user.go
View File

@@ -1,3 +1,37 @@
package user
import "github.com/zitadel/zitadel/internal/domain"
type UserType = isUser_Type
func (s UserState) ToDomain() domain.UserState {
switch s {
case UserState_USER_STATE_UNSPECIFIED:
return domain.UserStateUnspecified
case UserState_USER_STATE_ACTIVE:
return domain.UserStateActive
case UserState_USER_STATE_INACTIVE:
return domain.UserStateInactive
case UserState_USER_STATE_DELETED:
return domain.UserStateDeleted
case UserState_USER_STATE_LOCKED:
return domain.UserStateLocked
case UserState_USER_STATE_INITIAL:
return domain.UserStateInitial
default:
return domain.UserStateUnspecified
}
}
func (t Type) ToDomain() domain.UserType {
switch t {
case Type_TYPE_UNSPECIFIED:
return domain.UserTypeUnspecified
case Type_TYPE_HUMAN:
return domain.UserTypeHuman
case Type_TYPE_MACHINE:
return domain.UserTypeMachine
default:
return domain.UserTypeUnspecified
}
}