feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 09:30:11 +00:00
|
|
|
package test
|
|
|
|
|
|
|
|
import (
|
|
|
|
"reflect"
|
|
|
|
"sort"
|
|
|
|
"strings"
|
|
|
|
)
|
|
|
|
|
2024-04-03 10:43:43 +00:00
|
|
|
// testingT is a wrapper for testing.T
|
feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 09:30:11 +00:00
|
|
|
//
|
|
|
|
// this wrapper is needed for internal testing
|
|
|
|
type testingT interface {
|
|
|
|
Errorf(format string, args ...interface{})
|
|
|
|
Helper()
|
|
|
|
}
|
|
|
|
|
|
|
|
func AssertFieldsMapped(t testingT, object interface{}, ignoreFields ...string) (failed bool) {
|
|
|
|
t.Helper()
|
|
|
|
val := reflect.ValueOf(object)
|
|
|
|
|
|
|
|
fields := BuildList(val)
|
|
|
|
|
|
|
|
notEmptyFields := validateEmptyFields(fields, ignoreFields)
|
|
|
|
if len(notEmptyFields) > 0 {
|
|
|
|
sort.Strings(notEmptyFields)
|
|
|
|
t.Errorf("expected fields are not empty:\n\t%s\n", strings.Join(notEmptyFields, ",\n\t"))
|
|
|
|
}
|
|
|
|
|
|
|
|
notFilledFields := validateFilledFields(fields)
|
|
|
|
if len(notFilledFields) > 0 {
|
|
|
|
sort.Strings(notFilledFields)
|
|
|
|
t.Errorf("unexpected empty fields:\n\t%s\n", strings.Join(notFilledFields, ",\n\t"))
|
|
|
|
}
|
|
|
|
|
|
|
|
return len(notEmptyFields) > 0 || len(notFilledFields) > 0
|
|
|
|
}
|
|
|
|
|
|
|
|
func BuildList(val reflect.Value) map[string]bool {
|
|
|
|
if val.Kind() == reflect.Ptr {
|
|
|
|
if val.IsNil() {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
val = reflect.Indirect(val)
|
|
|
|
}
|
|
|
|
|
|
|
|
fields := map[string]bool{}
|
|
|
|
|
|
|
|
for i := 0; i < val.NumField(); i++ {
|
|
|
|
if !isPublicField(val.Type().Field(i).Name) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
if val.Field(i).Kind() == reflect.Struct || val.Field(i).Kind() == reflect.Ptr {
|
|
|
|
fieldName := val.Type().Field(i).Name
|
|
|
|
fields[fieldName] = false
|
|
|
|
subFields := BuildList(val.Field(i))
|
|
|
|
for k, v := range subFields {
|
|
|
|
fields[fieldName+"."+k] = v
|
|
|
|
fields[fieldName] = fields[val.Type().Field(i).Name] || v
|
|
|
|
}
|
|
|
|
if len(subFields) == 0 &&
|
|
|
|
((val.Field(i).Kind() == reflect.Ptr && !val.Field(i).IsNil()) ||
|
|
|
|
val.Field(i).Kind() == reflect.Struct && !val.Field(i).IsZero()) {
|
|
|
|
|
|
|
|
fields[fieldName] = true
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
fields[val.Type().Field(i).Name] = isFieldFilled(val.Field(i))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return fields
|
|
|
|
}
|
|
|
|
|
|
|
|
func isPublicField(fieldName string) bool {
|
|
|
|
return fieldName[0] >= 'A' && fieldName[0] <= 'Z'
|
|
|
|
}
|
|
|
|
|
|
|
|
func isFieldFilled(val reflect.Value) bool {
|
|
|
|
if isLengthMeasurable(val) {
|
|
|
|
switch val.Kind() {
|
|
|
|
case reflect.Slice:
|
|
|
|
if val.IsNil() {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
fallthrough
|
|
|
|
case reflect.Array:
|
|
|
|
if val.Len() == 0 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
for i := 0; i < val.Len(); i++ {
|
|
|
|
if val.Index(i).IsZero() {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
case reflect.Map:
|
|
|
|
if val.Len() == 0 {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
for _, key := range val.MapKeys() {
|
|
|
|
if val.MapIndex(key).IsZero() {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return !val.IsZero()
|
|
|
|
}
|
|
|
|
|
|
|
|
func isLengthMeasurable(val reflect.Value) bool {
|
|
|
|
return val.Kind() == reflect.Slice ||
|
|
|
|
val.Kind() == reflect.Array ||
|
|
|
|
val.Kind() == reflect.Map
|
|
|
|
}
|
|
|
|
|
|
|
|
func validateEmptyFields(fields map[string]bool, emptyFields []string) (notEmptyFields []string) {
|
|
|
|
for _, emptyField := range emptyFields {
|
|
|
|
isFilled := fields[emptyField]
|
|
|
|
subs := subFields(fields, emptyField)
|
|
|
|
if isFilled {
|
|
|
|
filledFields := filledSubFields(fields, subs)
|
|
|
|
if len(filledFields) == 0 {
|
|
|
|
filledFields = append(filledFields, emptyField)
|
|
|
|
}
|
|
|
|
notEmptyFields = append(notEmptyFields, filledFields...)
|
|
|
|
}
|
|
|
|
fields = removeFields(fields, append([]string{emptyField}, subs...))
|
|
|
|
}
|
|
|
|
return notEmptyFields
|
|
|
|
}
|
|
|
|
|
|
|
|
func filledSubFields(fields map[string]bool, subFields []string) (filledSubs []string) {
|
|
|
|
for _, subField := range subFields {
|
|
|
|
if fields[subField] {
|
|
|
|
filledSubs = append(filledSubs, subField)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return filledSubs
|
|
|
|
}
|
|
|
|
|
|
|
|
func subFields(fields map[string]bool, parentName string) (subs []string) {
|
|
|
|
for fieldName := range fields {
|
|
|
|
if strings.HasPrefix(fieldName, parentName+".") {
|
|
|
|
subs = append(subs, fieldName)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return subs
|
|
|
|
}
|
|
|
|
|
|
|
|
func removeFields(fields map[string]bool, fieldNames []string) map[string]bool {
|
|
|
|
for _, fieldName := range fieldNames {
|
|
|
|
delete(fields, fieldName)
|
|
|
|
}
|
|
|
|
return fields
|
|
|
|
}
|
|
|
|
|
|
|
|
func validateFilledFields(fields map[string]bool) (emptyFields []string) {
|
|
|
|
for fieldName, isFilled := range fields {
|
|
|
|
if !isFilled {
|
|
|
|
emptyFields = append(emptyFields, fieldName)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return emptyFields
|
|
|
|
}
|