mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 19:17:32 +00:00
feat(actions): add token customization flow and extend functionally with modules (#4337)
* fix: potential memory leak * feat(actions): possibility to parse json feat(actions): possibility to perform http calls * add query call * feat(api): list flow and trigger types fix(api): switch flow and trigger types to dynamic objects * fix(translations): add action translations * use `domain.FlowType` * localizers * localization * trigger types * options on `query.Action` * add functions for actions * feat: management api: add list flow and trigger (#4352) * console changes * cleanup * fix: wrong localization Co-authored-by: Max Peintner <max@caos.ch> * id token works * check if claims not nil * feat(actions): metadata api * refactor(actions): modules * fix: allow prerelease * fix: test * feat(actions): deny list for http hosts * feat(actions): deny list for http hosts * refactor: actions * fix: different error ids * fix: rename statusCode to status * Actions objects as options (#4418) * fix: rename statusCode to status * fix(actions): objects as options * fix(actions): objects as options * fix(actions): set fields * add http client to old actions * fix(actions): add log module * fix(actions): add user to context where possible * fix(actions): add user to ctx in external authorization/pre creation * fix(actions): query correct flow in claims * test: actions * fix(id-generator): panic if no machine id * tests * maybe this? * fix linting * refactor: improve code * fix: metadata and usergrant usage in actions * fix: appendUserGrant * fix: allowedToFail and timeout in action execution * fix: allowed to fail in token complement flow * docs: add action log claim * Update defaults.yaml * fix log claim * remove prerelease build Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Silvan
56
internal/actions/object/metadata.go
Normal file
56
internal/actions/object/metadata.go
Normal file
@@ -0,0 +1,56 @@
|
||||
package object
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"time"
|
||||
|
||||
"github.com/dop251/goja"
|
||||
"github.com/zitadel/logging"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/actions"
|
||||
"github.com/zitadel/zitadel/internal/query"
|
||||
)
|
||||
|
||||
func UserMetadataListFromQuery(c *actions.FieldConfig, metadata *query.UserMetadataList) goja.Value {
|
||||
result := &userMetadataList{
|
||||
Count: metadata.Count,
|
||||
Sequence: metadata.Sequence,
|
||||
Timestamp: metadata.Timestamp,
|
||||
Metadata: make([]*userMetadata, len(metadata.Metadata)),
|
||||
}
|
||||
|
||||
for i, md := range metadata.Metadata {
|
||||
var value interface{}
|
||||
err := json.Unmarshal(md.Value, &value)
|
||||
if err != nil {
|
||||
logging.WithError(err).Debug("unable to unmarshal into map")
|
||||
panic(err)
|
||||
}
|
||||
result.Metadata[i] = &userMetadata{
|
||||
CreationDate: md.CreationDate,
|
||||
ChangeDate: md.ChangeDate,
|
||||
ResourceOwner: md.ResourceOwner,
|
||||
Sequence: md.Sequence,
|
||||
Key: md.Key,
|
||||
Value: c.Runtime.ToValue(value),
|
||||
}
|
||||
}
|
||||
|
||||
return c.Runtime.ToValue(result)
|
||||
}
|
||||
|
||||
type userMetadataList struct {
|
||||
Count uint64
|
||||
Sequence uint64
|
||||
Timestamp time.Time
|
||||
Metadata []*userMetadata
|
||||
}
|
||||
|
||||
type userMetadata struct {
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
ResourceOwner string
|
||||
Sequence uint64
|
||||
Key string
|
||||
Value goja.Value
|
||||
}
|
||||
165
internal/actions/object/user.go
Normal file
165
internal/actions/object/user.go
Normal file
@@ -0,0 +1,165 @@
|
||||
package object
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/dop251/goja"
|
||||
"github.com/zitadel/zitadel/internal/actions"
|
||||
"github.com/zitadel/zitadel/internal/database"
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/query"
|
||||
)
|
||||
|
||||
func UserFromExternalUser(c *actions.FieldConfig, user *domain.ExternalUser) goja.Value {
|
||||
return c.Runtime.ToValue(&externalUser{
|
||||
ExternalId: user.ExternalUserID,
|
||||
ExternalIdpId: user.ExternalUserID,
|
||||
Human: human{
|
||||
FirstName: user.FirstName,
|
||||
LastName: user.LastName,
|
||||
NickName: user.NickName,
|
||||
DisplayName: user.DisplayName,
|
||||
PreferredLanguage: user.PreferredLanguage.String(),
|
||||
Email: user.Email,
|
||||
IsEmailVerified: user.IsEmailVerified,
|
||||
Phone: user.Phone,
|
||||
IsPhoneVerified: user.IsPhoneVerified,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func UserFromHuman(c *actions.FieldConfig, user *domain.Human) goja.Value {
|
||||
u := &humanUser{
|
||||
Id: user.AggregateID,
|
||||
CreationDate: user.CreationDate,
|
||||
ChangeDate: user.ChangeDate,
|
||||
ResourceOwner: user.ResourceOwner,
|
||||
Sequence: user.Sequence,
|
||||
State: user.State,
|
||||
Username: user.Username,
|
||||
LoginNames: user.LoginNames,
|
||||
PreferredLoginName: user.PreferredLoginName,
|
||||
}
|
||||
|
||||
if user.Profile != nil {
|
||||
u.Human.FirstName = user.Profile.FirstName
|
||||
u.Human.LastName = user.Profile.LastName
|
||||
u.Human.NickName = user.Profile.NickName
|
||||
u.Human.DisplayName = user.Profile.DisplayName
|
||||
u.Human.PreferredLanguage = user.Profile.PreferredLanguage.String()
|
||||
}
|
||||
|
||||
if user.Email != nil {
|
||||
u.Human.Email = user.Email.EmailAddress
|
||||
u.Human.IsEmailVerified = user.Email.IsEmailVerified
|
||||
}
|
||||
|
||||
if user.Phone != nil {
|
||||
u.Human.Phone = user.Phone.PhoneNumber
|
||||
u.Human.IsPhoneVerified = user.Phone.IsPhoneVerified
|
||||
}
|
||||
|
||||
return c.Runtime.ToValue(u)
|
||||
}
|
||||
|
||||
func UserFromQuery(c *actions.FieldConfig, user *query.User) goja.Value {
|
||||
if user.Human != nil {
|
||||
return humanFromQuery(c, user)
|
||||
}
|
||||
return machineFromQuery(c, user)
|
||||
}
|
||||
|
||||
func humanFromQuery(c *actions.FieldConfig, user *query.User) goja.Value {
|
||||
return c.Runtime.ToValue(&humanUser{
|
||||
Id: user.ID,
|
||||
CreationDate: user.CreationDate,
|
||||
ChangeDate: user.ChangeDate,
|
||||
ResourceOwner: user.ResourceOwner,
|
||||
Sequence: user.Sequence,
|
||||
State: user.State,
|
||||
Username: user.Username,
|
||||
LoginNames: user.LoginNames,
|
||||
PreferredLoginName: user.PreferredLoginName,
|
||||
Human: human{
|
||||
FirstName: user.Human.FirstName,
|
||||
LastName: user.Human.LastName,
|
||||
NickName: user.Human.NickName,
|
||||
DisplayName: user.Human.DisplayName,
|
||||
AvatarKey: user.Human.AvatarKey,
|
||||
PreferredLanguage: user.Human.PreferredLanguage.String(),
|
||||
Gender: user.Human.Gender,
|
||||
Email: user.Human.Email,
|
||||
IsEmailVerified: user.Human.IsEmailVerified,
|
||||
Phone: user.Human.Phone,
|
||||
IsPhoneVerified: user.Human.IsPhoneVerified,
|
||||
},
|
||||
})
|
||||
}
|
||||
func machineFromQuery(c *actions.FieldConfig, user *query.User) goja.Value {
|
||||
return c.Runtime.ToValue(&machineUser{
|
||||
Id: user.ID,
|
||||
CreationDate: user.CreationDate,
|
||||
ChangeDate: user.ChangeDate,
|
||||
ResourceOwner: user.ResourceOwner,
|
||||
Sequence: user.Sequence,
|
||||
State: user.State,
|
||||
Username: user.Username,
|
||||
LoginNames: user.LoginNames,
|
||||
PreferredLoginName: user.PreferredLoginName,
|
||||
Machine: machine{
|
||||
Name: user.Machine.Name,
|
||||
Description: user.Machine.Description,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
type externalUser struct {
|
||||
ExternalId string
|
||||
ExternalIdpId string
|
||||
Human human
|
||||
}
|
||||
|
||||
type humanUser struct {
|
||||
Id string
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
ResourceOwner string
|
||||
Sequence uint64
|
||||
State domain.UserState
|
||||
Username string
|
||||
LoginNames database.StringArray
|
||||
PreferredLoginName string
|
||||
Human human
|
||||
}
|
||||
|
||||
type human struct {
|
||||
FirstName string
|
||||
LastName string
|
||||
NickName string
|
||||
DisplayName string
|
||||
AvatarKey string
|
||||
PreferredLanguage string
|
||||
Gender domain.Gender
|
||||
Email string
|
||||
IsEmailVerified bool
|
||||
Phone string
|
||||
IsPhoneVerified bool
|
||||
}
|
||||
|
||||
type machineUser struct {
|
||||
Id string
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
ResourceOwner string
|
||||
Sequence uint64
|
||||
State domain.UserState
|
||||
Username string
|
||||
LoginNames database.StringArray
|
||||
PreferredLoginName string
|
||||
Machine machine
|
||||
}
|
||||
|
||||
type machine struct {
|
||||
Name string
|
||||
Description string
|
||||
}
|
||||
Reference in New Issue
Block a user