2020-05-18 10:06:36 +00:00
|
|
|
package handler
|
|
|
|
|
|
|
|
import (
|
2020-06-16 09:40:18 +00:00
|
|
|
"context"
|
2022-01-21 07:52:12 +00:00
|
|
|
|
2022-04-26 23:01:45 +00:00
|
|
|
"github.com/zitadel/logging"
|
2022-03-24 13:00:24 +00:00
|
|
|
|
2022-04-26 23:01:45 +00:00
|
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
|
|
v1 "github.com/zitadel/zitadel/internal/eventstore/v1"
|
|
|
|
es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/query"
|
|
|
|
es_sdk "github.com/zitadel/zitadel/internal/eventstore/v1/sdk"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/spooler"
|
|
|
|
org_model "github.com/zitadel/zitadel/internal/org/model"
|
|
|
|
org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model"
|
|
|
|
"github.com/zitadel/zitadel/internal/org/repository/view"
|
|
|
|
query2 "github.com/zitadel/zitadel/internal/query"
|
|
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
|
|
user_repo "github.com/zitadel/zitadel/internal/repository/user"
|
|
|
|
view_model "github.com/zitadel/zitadel/internal/user/repository/view/model"
|
2020-05-18 10:06:36 +00:00
|
|
|
)
|
|
|
|
|
2020-12-18 15:47:45 +00:00
|
|
|
const (
|
|
|
|
userTable = "auth.users"
|
|
|
|
)
|
|
|
|
|
2020-05-18 10:06:36 +00:00
|
|
|
type User struct {
|
|
|
|
handler
|
2021-02-23 14:13:04 +00:00
|
|
|
subscription *v1.Subscription
|
2022-01-21 07:52:12 +00:00
|
|
|
queries *query2.Queries
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2020-12-18 15:47:45 +00:00
|
|
|
func newUser(
|
|
|
|
handler handler,
|
2022-01-21 07:52:12 +00:00
|
|
|
queries *query2.Queries,
|
2020-12-18 15:47:45 +00:00
|
|
|
) *User {
|
|
|
|
h := &User{
|
2021-02-22 13:08:47 +00:00
|
|
|
handler: handler,
|
2022-01-21 07:52:12 +00:00
|
|
|
queries: queries,
|
2020-12-18 15:47:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
h.subscribe()
|
|
|
|
|
|
|
|
return h
|
|
|
|
}
|
|
|
|
|
|
|
|
func (k *User) subscribe() {
|
|
|
|
k.subscription = k.es.Subscribe(k.AggregateTypes()...)
|
|
|
|
go func() {
|
|
|
|
for event := range k.subscription.Events {
|
|
|
|
query.ReduceEvent(k, event)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
2020-05-18 10:06:36 +00:00
|
|
|
|
2020-08-18 06:57:16 +00:00
|
|
|
func (u *User) ViewModel() string {
|
2020-05-18 10:06:36 +00:00
|
|
|
return userTable
|
|
|
|
}
|
|
|
|
|
2021-07-06 11:36:35 +00:00
|
|
|
func (u *User) Subscription() *v1.Subscription {
|
|
|
|
return u.subscription
|
|
|
|
}
|
2021-02-23 14:13:04 +00:00
|
|
|
func (_ *User) AggregateTypes() []es_models.AggregateType {
|
2022-03-31 09:36:26 +00:00
|
|
|
return []es_models.AggregateType{user_repo.AggregateType, org.AggregateType}
|
2020-12-18 15:47:45 +00:00
|
|
|
}
|
|
|
|
|
2022-04-19 06:26:12 +00:00
|
|
|
func (u *User) CurrentSequence(instanceID string) (uint64, error) {
|
|
|
|
sequence, err := u.view.GetLatestUserSequence(instanceID)
|
2020-12-18 15:47:45 +00:00
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
return sequence.CurrentSequence, nil
|
|
|
|
}
|
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) EventQuery() (*es_models.SearchQuery, error) {
|
2022-04-19 06:26:12 +00:00
|
|
|
sequences, err := u.view.GetLatestUserSequences()
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-04-19 06:26:12 +00:00
|
|
|
query := es_models.NewSearchQuery()
|
|
|
|
instances := make([]string, 0)
|
|
|
|
for _, sequence := range sequences {
|
|
|
|
for _, instance := range instances {
|
|
|
|
if sequence.InstanceID == instance {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
instances = append(instances, sequence.InstanceID)
|
|
|
|
query.AddQuery().
|
|
|
|
AggregateTypeFilter(u.AggregateTypes()...).
|
|
|
|
LatestSequenceFilter(sequence.CurrentSequence).
|
|
|
|
InstanceIDFilter(sequence.InstanceID)
|
|
|
|
}
|
|
|
|
return query.AddQuery().
|
2020-12-18 15:47:45 +00:00
|
|
|
AggregateTypeFilter(u.AggregateTypes()...).
|
2022-04-19 06:26:12 +00:00
|
|
|
LatestSequenceFilter(0).
|
|
|
|
ExcludedInstanceIDsFilter(instances...).
|
|
|
|
SearchQuery(), nil
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) Reduce(event *es_models.Event) (err error) {
|
2020-06-16 09:40:18 +00:00
|
|
|
switch event.AggregateType {
|
2022-03-31 09:36:26 +00:00
|
|
|
case user_repo.AggregateType:
|
2020-06-16 09:40:18 +00:00
|
|
|
return u.ProcessUser(event)
|
2022-03-31 09:36:26 +00:00
|
|
|
case org.AggregateType:
|
2020-06-16 09:40:18 +00:00
|
|
|
return u.ProcessOrg(event)
|
|
|
|
default:
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) ProcessUser(event *es_models.Event) (err error) {
|
2020-05-18 10:06:36 +00:00
|
|
|
user := new(view_model.UserView)
|
2022-03-31 09:36:26 +00:00
|
|
|
switch eventstore.EventType(event.Type) {
|
|
|
|
case user_repo.UserV1AddedType,
|
|
|
|
user_repo.MachineAddedEventType,
|
|
|
|
user_repo.HumanAddedType,
|
|
|
|
user_repo.UserV1RegisteredType,
|
|
|
|
user_repo.HumanRegisteredType:
|
2020-08-13 07:43:47 +00:00
|
|
|
err = user.AppendEvent(event)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-12-02 16:00:04 +00:00
|
|
|
err = u.fillLoginNames(user)
|
2022-03-31 09:36:26 +00:00
|
|
|
case user_repo.UserV1ProfileChangedType,
|
|
|
|
user_repo.UserV1EmailChangedType,
|
|
|
|
user_repo.UserV1EmailVerifiedType,
|
|
|
|
user_repo.UserV1PhoneChangedType,
|
|
|
|
user_repo.UserV1PhoneVerifiedType,
|
|
|
|
user_repo.UserV1PhoneRemovedType,
|
|
|
|
user_repo.UserV1AddressChangedType,
|
|
|
|
user_repo.UserDeactivatedType,
|
|
|
|
user_repo.UserReactivatedType,
|
|
|
|
user_repo.UserLockedType,
|
|
|
|
user_repo.UserUnlockedType,
|
|
|
|
user_repo.UserV1MFAOTPAddedType,
|
|
|
|
user_repo.UserV1MFAOTPVerifiedType,
|
|
|
|
user_repo.UserV1MFAOTPRemovedType,
|
|
|
|
user_repo.UserV1MFAInitSkippedType,
|
|
|
|
user_repo.UserV1PasswordChangedType,
|
|
|
|
user_repo.HumanProfileChangedType,
|
|
|
|
user_repo.HumanEmailChangedType,
|
|
|
|
user_repo.HumanEmailVerifiedType,
|
|
|
|
user_repo.HumanAvatarAddedType,
|
|
|
|
user_repo.HumanAvatarRemovedType,
|
|
|
|
user_repo.HumanPhoneChangedType,
|
|
|
|
user_repo.HumanPhoneVerifiedType,
|
|
|
|
user_repo.HumanPhoneRemovedType,
|
|
|
|
user_repo.HumanAddressChangedType,
|
|
|
|
user_repo.HumanMFAOTPAddedType,
|
|
|
|
user_repo.HumanMFAOTPVerifiedType,
|
|
|
|
user_repo.HumanMFAOTPRemovedType,
|
|
|
|
user_repo.HumanU2FTokenAddedType,
|
|
|
|
user_repo.HumanU2FTokenVerifiedType,
|
|
|
|
user_repo.HumanU2FTokenRemovedType,
|
|
|
|
user_repo.HumanPasswordlessTokenAddedType,
|
|
|
|
user_repo.HumanPasswordlessTokenVerifiedType,
|
|
|
|
user_repo.HumanPasswordlessTokenRemovedType,
|
|
|
|
user_repo.HumanMFAInitSkippedType,
|
|
|
|
user_repo.MachineChangedEventType,
|
|
|
|
user_repo.HumanPasswordChangedType,
|
|
|
|
user_repo.HumanPasswordlessInitCodeAddedType,
|
|
|
|
user_repo.HumanPasswordlessInitCodeRequestedType:
|
2022-04-19 06:26:12 +00:00
|
|
|
user, err = u.view.UserByID(event.AggregateID, event.InstanceID)
|
2020-05-18 10:06:36 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = user.AppendEvent(event)
|
2022-03-31 09:36:26 +00:00
|
|
|
case user_repo.UserDomainClaimedType,
|
|
|
|
user_repo.UserUserNameChangedType:
|
2022-04-19 06:26:12 +00:00
|
|
|
user, err = u.view.UserByID(event.AggregateID, event.InstanceID)
|
2020-08-18 06:57:16 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = user.AppendEvent(event)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
err = u.fillLoginNames(user)
|
2022-03-31 09:36:26 +00:00
|
|
|
case user_repo.UserRemovedType:
|
2022-04-19 06:26:12 +00:00
|
|
|
return u.view.DeleteUser(event.AggregateID, event.InstanceID, event)
|
2020-05-18 10:06:36 +00:00
|
|
|
default:
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserSequence(event)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.PutUser(user, event)
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (u *User) fillLoginNames(user *view_model.UserView) (err error) {
|
2022-05-16 13:10:10 +00:00
|
|
|
userLoginMustBeDomain, primaryDomain, domains, err := u.loginNameInformation(context.Background(), user.ResourceOwner, user.InstanceID)
|
2020-06-16 09:40:18 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-03-24 13:00:24 +00:00
|
|
|
user.SetLoginNames(userLoginMustBeDomain, domains)
|
|
|
|
user.PreferredLoginName = user.GenerateLoginName(primaryDomain, userLoginMustBeDomain)
|
2020-06-16 09:40:18 +00:00
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) ProcessOrg(event *es_models.Event) (err error) {
|
2022-03-31 09:36:26 +00:00
|
|
|
switch eventstore.EventType(event.Type) {
|
|
|
|
case org.OrgDomainVerifiedEventType,
|
|
|
|
org.OrgDomainRemovedEventType,
|
|
|
|
org.DomainPolicyAddedEventType,
|
|
|
|
org.DomainPolicyChangedEventType,
|
|
|
|
org.DomainPolicyRemovedEventType:
|
2020-06-16 09:40:18 +00:00
|
|
|
return u.fillLoginNamesOnOrgUsers(event)
|
2022-03-31 09:36:26 +00:00
|
|
|
case org.OrgDomainPrimarySetEventType:
|
2020-06-17 05:25:04 +00:00
|
|
|
return u.fillPreferredLoginNamesOnOrgUsers(event)
|
2020-06-16 09:40:18 +00:00
|
|
|
default:
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.ProcessedUserSequence(event)
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
}
|
2020-06-17 05:25:04 +00:00
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) fillLoginNamesOnOrgUsers(event *es_models.Event) error {
|
2022-05-16 13:10:10 +00:00
|
|
|
userLoginMustBeDomain, _, domains, err := u.loginNameInformation(context.Background(), event.ResourceOwner, event.InstanceID)
|
2020-06-16 09:40:18 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-04-19 06:26:12 +00:00
|
|
|
users, err := u.view.UsersByOrgID(event.AggregateID, event.InstanceID)
|
2020-06-16 09:40:18 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, user := range users {
|
2022-03-24 13:00:24 +00:00
|
|
|
user.SetLoginNames(userLoginMustBeDomain, domains)
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.PutUsers(users, event)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) fillPreferredLoginNamesOnOrgUsers(event *es_models.Event) error {
|
2022-05-16 13:10:10 +00:00
|
|
|
userLoginMustBeDomain, primaryDomain, _, err := u.loginNameInformation(context.Background(), event.ResourceOwner, event.InstanceID)
|
2020-06-17 05:25:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-03-24 13:00:24 +00:00
|
|
|
if !userLoginMustBeDomain {
|
2020-06-17 05:25:04 +00:00
|
|
|
return nil
|
|
|
|
}
|
2022-04-19 06:26:12 +00:00
|
|
|
users, err := u.view.UsersByOrgID(event.AggregateID, event.InstanceID)
|
2020-06-17 05:25:04 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, user := range users {
|
2022-03-24 13:00:24 +00:00
|
|
|
user.PreferredLoginName = user.GenerateLoginName(primaryDomain, userLoginMustBeDomain)
|
2020-06-17 05:25:04 +00:00
|
|
|
}
|
2020-12-18 15:47:45 +00:00
|
|
|
return u.view.PutUsers(users, event)
|
2020-06-17 05:25:04 +00:00
|
|
|
}
|
|
|
|
|
2021-02-23 14:13:04 +00:00
|
|
|
func (u *User) OnError(event *es_models.Event, err error) error {
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
logging.LogWithFields("SPOOL-is8aAWima", "id", event.AggregateID).WithError(err).Warn("something went wrong in user handler")
|
2020-08-18 06:57:16 +00:00
|
|
|
return spooler.HandleError(event, err, u.view.GetLatestUserFailedEvent, u.view.ProcessedUserFailedEvent, u.view.ProcessedUserSequence, u.errorCountUntilSkip)
|
2020-05-18 10:06:36 +00:00
|
|
|
}
|
2020-12-02 07:50:59 +00:00
|
|
|
|
|
|
|
func (u *User) OnSuccess() error {
|
|
|
|
return spooler.HandleSuccess(u.view.UpdateUserSpoolerRunTimestamp)
|
|
|
|
}
|
2021-02-22 13:08:47 +00:00
|
|
|
|
2022-05-16 13:10:10 +00:00
|
|
|
func (u *User) getOrgByID(ctx context.Context, orgID, instanceID string) (*org_model.Org, error) {
|
|
|
|
query, err := view.OrgByIDQuery(orgID, instanceID, 0)
|
2021-02-22 13:08:47 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
esOrg := &org_es_model.Org{
|
2021-02-23 14:13:04 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
2021-02-22 13:08:47 +00:00
|
|
|
AggregateID: orgID,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
err = es_sdk.Filter(ctx, u.Eventstore().FilterEvents, esOrg.AppendEvents, query)
|
|
|
|
if err != nil && !errors.IsNotFound(err) {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if esOrg.Sequence == 0 {
|
|
|
|
return nil, errors.ThrowNotFound(nil, "EVENT-3m9vs", "Errors.Org.NotFound")
|
|
|
|
}
|
|
|
|
|
|
|
|
return org_es_model.OrgToModel(esOrg), nil
|
|
|
|
}
|
|
|
|
|
2022-05-16 13:10:10 +00:00
|
|
|
func (u *User) loginNameInformation(ctx context.Context, orgID string, instanceID string) (userLoginMustBeDomain bool, primaryDomain string, domains []*org_model.OrgDomain, err error) {
|
|
|
|
org, err := u.getOrgByID(ctx, orgID, instanceID)
|
2022-03-24 13:00:24 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
2022-03-24 16:21:34 +00:00
|
|
|
if org.DomainPolicy == nil {
|
2022-03-28 08:05:09 +00:00
|
|
|
policy, err := u.queries.DefaultDomainPolicy(withInstanceID(ctx, org.InstanceID))
|
2022-03-24 13:00:24 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, "", nil, err
|
|
|
|
}
|
|
|
|
userLoginMustBeDomain = policy.UserLoginMustBeDomain
|
|
|
|
}
|
|
|
|
return userLoginMustBeDomain, org.GetPrimaryDomain().Domain, org.Domains, nil
|
2021-02-22 13:08:47 +00:00
|
|
|
}
|