andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-10-31 03:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: all enums same style (#262)

Browse Source 
* fix: all enums same style

* fix: rename process to reduce

* add some missing enum renaming

Co-authored-by: Livio Amstutz <[email protected]>
This commit is contained in:
Fabi
2020-06-23 14:47:47 +02:00
committed by GitHub
co-authored by Livio Amstutz
parent c376b92315
commit 3cd3a238c2
152 changed files with 1026 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/auth/api/grpc/search_converter.go
+7 -7
View File
@@ -5,18 +5,18 @@ import "github.com/caos/zitadel/internal/model"
func searchMethodToModel(method SearchMethod) model.SearchMethod {
switch method {
case SearchMethod_SEARCHMETHOD_EQUALS:
return model.SEARCHMETHOD_EQUALS
return model.SearchMethodEquals
case SearchMethod_SEARCHMETHOD_CONTAINS:
return model.SEARCHMETHOD_CONTAINS
return model.SearchMethodContains
case SearchMethod_SEARCHMETHOD_STARTS_WITH:
return model.SEARCHMETHOD_STARTS_WITH
return model.SearchMethodStartsWith
case SearchMethod_SEARCHMETHOD_EQUALS_IGNORE_CASE:
return model.SEARCHMETHOD_EQUALS_IGNORE_CASE
return model.SearchMethodEqualsIgnoreCase
case SearchMethod_SEARCHMETHOD_CONTAINS_IGNORE_CASE:
return model.SEARCHMETHOD_CONTAINS_IGNORE_CASE
return model.SearchMethodContainsIgnoreCase
case SearchMethod_SEARCHMETHOD_STARTS_WITH_IGNORE_CASE:
return model.SEARCHMETHOD_STARTS_WITH_IGNORE_CASE
return model.SearchMethodStartsWithIgnoreCase
default:
return model.SEARCHMETHOD_EQUALS
return model.SearchMethodEquals
}
}
pkg/auth/api/grpc/user_converter.go
+14 -14
View File
@@ -258,15 +258,15 @@ func otpFromModel(otp *usr_model.OTP) *MfaOtpResponse {
func userStateFromModel(state usr_model.UserState) UserState {
switch state {
case usr_model.USERSTATE_ACTIVE:
case usr_model.UserStateActive:
return UserState_USERSTATE_ACTIVE
case usr_model.USERSTATE_INACTIVE:
case usr_model.UserStateInactive:
return UserState_USERSTATE_INACTIVE
case usr_model.USERSTATE_LOCKED:
case usr_model.UserStateLocked:
return UserState_USERSTATE_LOCKED
case usr_model.USERSTATE_INITIAL:
case usr_model.UserStateInitial:
return UserState_USERSTATE_INITIAL
case usr_model.USERSTATE_SUSPEND:
case usr_model.UserStateSuspend:
return UserState_USERSTATE_SUSPEND
default:
return UserState_USERSTATE_UNSPECIFIED
@@ -275,11 +275,11 @@ func userStateFromModel(state usr_model.UserState) UserState {
func genderFromModel(gender usr_model.Gender) Gender {
switch gender {
case usr_model.GENDER_FEMALE:
case usr_model.GenderFemale:
return Gender_GENDER_FEMALE
case usr_model.GENDER_MALE:
case usr_model.GenderMale:
return Gender_GENDER_MALE
case usr_model.GENDER_DIVERSE:
case usr_model.GenderDiverse:
return Gender_GENDER_DIVERSE
default:
return Gender_GENDER_UNSPECIFIED
@@ -289,21 +289,21 @@ func genderFromModel(gender usr_model.Gender) Gender {
func genderToModel(gender Gender) usr_model.Gender {
switch gender {
case Gender_GENDER_FEMALE:
return usr_model.GENDER_FEMALE
return usr_model.GenderFemale
case Gender_GENDER_MALE:
return usr_model.GENDER_MALE
return usr_model.GenderMale
case Gender_GENDER_DIVERSE:
return usr_model.GENDER_DIVERSE
return usr_model.GenderDiverse
default:
return usr_model.GENDER_UNDEFINED
return usr_model.GenderUnspecified
}
}
func mfaStateFromModel(state usr_model.MfaState) MFAState {
switch state {
case usr_model.MFASTATE_READY:
case usr_model.MfaStateReady:
return MFAState_MFASTATE_NOT_READY
case usr_model.MFASTATE_NOTREADY:
case usr_model.MfaStateNotReady:
return MFAState_MFASTATE_NOT_READY
default:
return MFAState_MFASTATE_UNSPECIFIED
pkg/auth/api/grpc/user_grant_converter.go
+6 -6
View File
@@ -31,11 +31,11 @@ func userGrantSearchQueryToModel(query *UserGrantSearchQuery) *grant_model.UserG
func userGrantSearchKeyToModel(key UserGrantSearchKey) grant_model.UserGrantSearchKey {
switch key {
case UserGrantSearchKey_UserGrantSearchKey_ORG_ID:
return grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER
return grant_model.UserGrantSearchKeyResourceOwner
case UserGrantSearchKey_UserGrantSearchKey_PROJECT_ID:
return grant_model.USERGRANTSEARCHKEY_PROJECT_ID
return grant_model.UserGrantSearchKeyProjectID
default:
return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
return grant_model.UserGrantSearchKeyUnspecified
}
}
@@ -44,7 +44,7 @@ func myProjectOrgSearchRequestRequestsToModel(request *MyProjectOrgSearchRequest
Offset: request.Offset,
Limit: request.Limit,
Asc: request.Asc,
SortingColumn: grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER,
SortingColumn: grant_model.UserGrantSearchKeyResourceOwner,
Queries: myProjectOrgSearchQueriesToModel(request.Queries),
}
}
@@ -68,9 +68,9 @@ func myProjectOrgSearchQueryToModel(query *MyProjectOrgSearchQuery) *grant_model
func myProjectOrgSearchKeyToModel(key MyProjectOrgSearchKey) grant_model.UserGrantSearchKey {
switch key {
case MyProjectOrgSearchKey_MYPROJECTORGSEARCHKEY_ORG_NAME:
return grant_model.USERGRANTSEARCHKEY_ORG_NAME
return grant_model.UserGrantSearchKeyOrgName
default:
return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
return grant_model.UserGrantSearchKeyUnspecified
}
}
pkg/auth/api/oidc/client.go
+4 -4
View File
@@ -27,7 +27,7 @@ func (o *OPStorage) GetClientByClientID(ctx context.Context, id string) (op.Clie
if err != nil {
return nil, err
}
if client.State != proj_model.APPSTATE_ACTIVE {
if client.State != proj_model.AppStateActive {
return nil, errors.ThrowPreconditionFailed(nil, "OIDC-sdaGg", "client is not active")
}
return ClientFromBusiness(client, o.defaultLoginURL, o.defaultAccessTokenLifetime, o.defaultIdTokenLifetime)
@@ -86,11 +86,11 @@ func (o *OPStorage) GetUserinfoFromScopes(ctx context.Context, userID string, sc
func getGender(gender user_model.Gender) string {
switch gender {
case user_model.GENDER_FEMALE:
case user_model.GenderFemale:
return "female"
case user_model.GENDER_MALE:
case user_model.GenderMale:
return "male"
case user_model.GENDER_DIVERSE:
case user_model.GenderDiverse:
return "diverse"
}
return ""
pkg/auth/api/oidc/client_converter.go
+3 -3
View File
@@ -61,11 +61,11 @@ func (c *Client) AccessTokenType() op.AccessTokenType {
func authMethodToOIDC(authType model.OIDCAuthMethodType) op.AuthMethod {
switch authType {
case model.OIDCAUTHMETHODTYPE_BASIC:
case model.OIDCAuthMethodTypeBasic:
return op.AuthMethodBasic
case model.OIDCAUTHMETHODTYPE_POST:
case model.OIDCAuthMethodTypePost:
return op.AuthMethodPost
case model.OIDCAUTHMETHODTYPE_NONE:
case model.OIDCAuthMethodTypeNone:
return op.AuthMethodNone
default:
return op.AuthMethodBasic