2020-07-08 11:56:37 +00:00
|
|
|
package management
|
2020-05-13 12:22:29 +00:00
|
|
|
|
|
|
|
import (
|
2021-01-18 10:24:15 +00:00
|
|
|
"context"
|
2020-06-15 14:50:09 +00:00
|
|
|
"encoding/json"
|
2021-01-18 10:24:15 +00:00
|
|
|
|
|
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
|
|
|
|
"github.com/caos/zitadel/internal/api/authz"
|
|
|
|
"github.com/caos/zitadel/internal/eventstore/models"
|
feat: policies on aggregates (#799)
* feat: move pw policy
* feat: default pw complexity policy
* fix: org password complexity policy
* fix: org password complexity policy
* fix: pw complexity policy with setup
* fix: age and lockout policies on aggregates
* fix: migration
* fix: org iam policy
* fix: org iam policy
* fix: org iam policy
* fix: tests
* fix: policy request
* fix: merge master
* fix(console): policies frontend (#817)
* fix policy build
* fix: age, complexity, lockout policies
* fix: ready return err of setup not done
* fix: fix remove policies in spoolers
* fix: fix remove policies in spoolers
* feat(console): policy settings for iam and org (#824)
* fix policy build
* fix: age, complexity, lockout policies
* fix pwd complexity
* policy remove action
* add imports
* fix accounts card, enable mgmt login policy
* lint
* add iam policy to admin
* toasts, i18n, show default
* routing, i18n
* reset policy, toast i18n, cleanup, routing
* policy delete permission
* lint style
* delete iam policy
* delete non project from grid list, i18n
* lint ts, style
* fix: remove instead delete
* feat(console): delete external idp from user (#835)
* dialog i18n, delete column and function
* dialog i18n
* fix rm button
* Update console/src/assets/i18n/de.json
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update console/src/assets/i18n/de.json
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: revert env, rename policy, remove comments
* fix: lowercase sich
* fix: pr requests
* Update internal/iam/repository/eventsourcing/eventstore_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: tests
* fix: tests
* fix(console): policies (#839)
* fix: nil pointer on get userdata (#815)
* fix: external login (#818)
* fix: external login
* fix: external login
* feat(console): delete user (#819)
* add action col to user table, i18n
* delete user from detail component
* lint
* fix(console): cleanup user detail and member components, user/me redirect, permission guards, filter, org policy guard, user table, scss cleanup (#808)
* fix: remove user.write guard for filtering
* border color
* fix user routing from member tables
* idp detail layout
* generic contact component
* fix redirect to auth user, user grant disable
* disable policy action without permission, i18n
* user-create flex fix, contact ng-content
* rm unused styles
* sidenav divider
* lint
* chore(deps-dev): bump @angular/cli from 10.1.3 to 10.1.4 in /console (#806)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump @angular/cli from 10.1.3 to 10.1.4 in /console
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.1.3 to 10.1.4.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.1.3...v10.1.4)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular/language-service from 10.1.3 to 10.1.4 in /console (#805)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump @angular/language-service in /console
Bumps [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) from 10.1.3 to 10.1.4.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/10.1.4/packages/language-service)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump codelyzer from 6.0.0 to 6.0.1 in /console (#804)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump codelyzer from 6.0.0 to 6.0.1 in /console
Bumps [codelyzer](https://github.com/mgechev/codelyzer) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/mgechev/codelyzer/releases)
- [Changelog](https://github.com/mgechev/codelyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mgechev/codelyzer/commits/6.0.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular from 0.1000.8 to 0.1001.4 in /console (#803)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump @angular-devkit/build-angular in /console
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.8 to 0.1001.4.
- [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: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps): bump uuid from 8.3.0 to 8.3.1 in /console (#802)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps): bump uuid from 8.3.0 to 8.3.1 in /console
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.0 to 8.3.1.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.3.0...v8.3.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* create memberstable as common component
* iam member cleanup
* iam + org m table, user table service user avatar
* toast config
* fix selection emitter
* fix project grant table width
* project grant members refactor
* theme optimizations
* member table col delete
* lint
* fix table row color
* refactor grey color
* lint scss
* org list redirect on click, fix user table undef
* refresh table after grant add
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix(console): intercept navigator.language, set browser lang as default for user without explicit setting, user table outline, member create dialog import (#820)
* i18n interceptor, set language to browser lang
* nullcheck
* rm external idp log
* fix module imports, rm user displayname from i18n
* Update console/src/assets/i18n/de.json
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: delete external idps from users (#822)
* fix(console): permission regex, account switcher null check, restrict app and member create access (#821)
* fix member table disable, gerneal regexp
* fix user session card, app disable
* memberships max count
* fix policy permissions
* permission check for member add dialog
* lint
* rm accounts log
* rm id regex
* fix: handle usermemberships on project and project grant delete (#825)
* fix: go handler
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: tests
* fix: not needed error handling
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
2020-10-15 08:27:13 +00:00
|
|
|
iam_model "github.com/caos/zitadel/internal/iam/model"
|
2021-01-18 10:24:15 +00:00
|
|
|
"github.com/caos/zitadel/internal/v2/domain"
|
2020-06-15 14:50:09 +00:00
|
|
|
|
2020-05-13 12:22:29 +00:00
|
|
|
"github.com/caos/logging"
|
|
|
|
"github.com/golang/protobuf/ptypes"
|
2020-06-15 14:50:09 +00:00
|
|
|
"google.golang.org/protobuf/encoding/protojson"
|
|
|
|
"google.golang.org/protobuf/types/known/structpb"
|
2020-07-08 11:56:37 +00:00
|
|
|
|
|
|
|
org_model "github.com/caos/zitadel/internal/org/model"
|
|
|
|
"github.com/caos/zitadel/pkg/grpc/management"
|
|
|
|
"github.com/caos/zitadel/pkg/grpc/message"
|
2020-05-13 12:22:29 +00:00
|
|
|
)
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func orgFromDomain(org *domain.Org) *management.Org {
|
2020-07-08 11:56:37 +00:00
|
|
|
return &management.Org{
|
2021-01-20 10:06:52 +00:00
|
|
|
ChangeDate: timestamppb.New(org.ChangeDate),
|
|
|
|
Id: org.AggregateID,
|
|
|
|
Name: org.Name,
|
|
|
|
State: orgStateFromDomain(org.State),
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgViewFromModel(org *org_model.OrgView) *management.OrgView {
|
2020-05-26 14:46:16 +00:00
|
|
|
creationDate, err := ptypes.TimestampProto(org.CreationDate)
|
|
|
|
logging.Log("GRPC-GTHsZ").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
|
|
|
|
changeDate, err := ptypes.TimestampProto(org.ChangeDate)
|
|
|
|
logging.Log("GRPC-dVnoj").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
return &management.OrgView{
|
2020-05-26 14:46:16 +00:00
|
|
|
ChangeDate: changeDate,
|
|
|
|
CreationDate: creationDate,
|
|
|
|
Id: org.ID,
|
|
|
|
Name: org.Name,
|
|
|
|
State: orgStateFromModel(org.State),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func orgStateFromDomain(state domain.OrgState) management.OrgState {
|
|
|
|
switch state {
|
|
|
|
case domain.OrgStateActive:
|
|
|
|
return management.OrgState_ORGSTATE_ACTIVE
|
|
|
|
case domain.OrgStateInactive:
|
|
|
|
return management.OrgState_ORGSTATE_INACTIVE
|
|
|
|
default:
|
|
|
|
return management.OrgState_ORGSTATE_UNSPECIFIED
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgStateFromModel(state org_model.OrgState) management.OrgState {
|
2020-05-13 12:22:29 +00:00
|
|
|
switch state {
|
2020-06-23 12:47:47 +00:00
|
|
|
case org_model.OrgStateActive:
|
2020-07-08 11:56:37 +00:00
|
|
|
return management.OrgState_ORGSTATE_ACTIVE
|
2020-06-23 12:47:47 +00:00
|
|
|
case org_model.OrgStateInactive:
|
2020-07-08 11:56:37 +00:00
|
|
|
return management.OrgState_ORGSTATE_INACTIVE
|
2020-05-13 12:22:29 +00:00
|
|
|
default:
|
2020-07-08 11:56:37 +00:00
|
|
|
return management.OrgState_ORGSTATE_UNSPECIFIED
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
}
|
2020-06-15 14:50:09 +00:00
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func addOrgDomainToDomain(ctx context.Context, orgDomain *management.AddOrgDomainRequest) *domain.OrgDomain {
|
|
|
|
return &domain.OrgDomain{
|
|
|
|
ObjectRoot: models.ObjectRoot{
|
|
|
|
AggregateID: authz.GetCtxData(ctx).OrgID,
|
|
|
|
},
|
|
|
|
Domain: orgDomain.Domain,
|
|
|
|
}
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func orgDomainValidationToDomain(ctx context.Context, orgDomain *management.OrgDomainValidationRequest) *domain.OrgDomain {
|
|
|
|
return &domain.OrgDomain{
|
|
|
|
ObjectRoot: models.ObjectRoot{
|
|
|
|
AggregateID: authz.GetCtxData(ctx).OrgID,
|
|
|
|
},
|
|
|
|
Domain: orgDomain.Domain,
|
|
|
|
ValidationType: orgDomainValidationTypeToDomain(orgDomain.Type),
|
2020-08-06 13:03:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func validateOrgDomainToDomain(ctx context.Context, orgDomain *management.ValidateOrgDomainRequest) *domain.OrgDomain {
|
|
|
|
return &domain.OrgDomain{
|
|
|
|
ObjectRoot: models.ObjectRoot{
|
|
|
|
AggregateID: authz.GetCtxData(ctx).OrgID,
|
|
|
|
},
|
|
|
|
Domain: orgDomain.Domain,
|
|
|
|
}
|
2020-08-06 13:03:03 +00:00
|
|
|
}
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func orgDomainValidationTypeToDomain(validationType management.OrgDomainValidationType) domain.OrgDomainValidationType {
|
|
|
|
switch validationType {
|
2020-08-06 13:03:03 +00:00
|
|
|
case management.OrgDomainValidationType_ORGDOMAINVALIDATIONTYPE_HTTP:
|
2021-01-18 10:24:15 +00:00
|
|
|
return domain.OrgDomainValidationTypeHTTP
|
2020-08-06 13:03:03 +00:00
|
|
|
case management.OrgDomainValidationType_ORGDOMAINVALIDATIONTYPE_DNS:
|
2021-01-18 10:24:15 +00:00
|
|
|
return domain.OrgDomainValidationTypeDNS
|
2020-08-06 13:03:03 +00:00
|
|
|
default:
|
2021-01-18 10:24:15 +00:00
|
|
|
return domain.OrgDomainValidationTypeUnspecified
|
2020-08-06 13:03:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-18 06:57:16 +00:00
|
|
|
func orgDomainValidationTypeFromModel(key org_model.OrgDomainValidationType) management.OrgDomainValidationType {
|
|
|
|
switch key {
|
|
|
|
case org_model.OrgDomainValidationTypeHTTP:
|
|
|
|
return management.OrgDomainValidationType_ORGDOMAINVALIDATIONTYPE_HTTP
|
|
|
|
case org_model.OrgDomainValidationTypeDNS:
|
|
|
|
return management.OrgDomainValidationType_ORGDOMAINVALIDATIONTYPE_DNS
|
|
|
|
default:
|
|
|
|
return management.OrgDomainValidationType_ORGDOMAINVALIDATIONTYPE_UNSPECIFIED
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func primaryOrgDomainToDomain(ctx context.Context, ordDomain *management.PrimaryOrgDomainRequest) *domain.OrgDomain {
|
|
|
|
return &domain.OrgDomain{
|
|
|
|
ObjectRoot: models.ObjectRoot{
|
|
|
|
AggregateID: authz.GetCtxData(ctx).OrgID,
|
|
|
|
},
|
|
|
|
Domain: ordDomain.Domain,
|
|
|
|
}
|
2020-08-06 13:03:03 +00:00
|
|
|
}
|
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func removeOrgDomainToDomain(ctx context.Context, ordDomain *management.RemoveOrgDomainRequest) *domain.OrgDomain {
|
|
|
|
return &domain.OrgDomain{
|
|
|
|
ObjectRoot: models.ObjectRoot{
|
|
|
|
AggregateID: authz.GetCtxData(ctx).OrgID,
|
|
|
|
},
|
|
|
|
Domain: ordDomain.Domain,
|
|
|
|
}
|
|
|
|
}
|
2020-06-16 09:40:18 +00:00
|
|
|
|
2021-01-18 10:24:15 +00:00
|
|
|
func orgDomainFromDomain(orgDomain *domain.OrgDomain) *management.OrgDomain {
|
2020-07-08 11:56:37 +00:00
|
|
|
return &management.OrgDomain{
|
2021-01-20 10:06:52 +00:00
|
|
|
ChangeDate: timestamppb.New(orgDomain.ChangeDate),
|
|
|
|
OrgId: orgDomain.AggregateID,
|
|
|
|
Domain: orgDomain.Domain,
|
|
|
|
Verified: orgDomain.Verified,
|
|
|
|
Primary: orgDomain.Primary,
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainViewFromModel(domain *org_model.OrgDomainView) *management.OrgDomainView {
|
2020-06-16 09:40:18 +00:00
|
|
|
creationDate, err := ptypes.TimestampProto(domain.CreationDate)
|
|
|
|
logging.Log("GRPC-7sjDs").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
|
|
|
|
changeDate, err := ptypes.TimestampProto(domain.ChangeDate)
|
|
|
|
logging.Log("GRPC-8iSji").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
return &management.OrgDomainView{
|
2020-08-18 06:57:16 +00:00
|
|
|
ChangeDate: changeDate,
|
|
|
|
CreationDate: creationDate,
|
|
|
|
OrgId: domain.OrgID,
|
|
|
|
Domain: domain.Domain,
|
|
|
|
Verified: domain.Verified,
|
|
|
|
Primary: domain.Primary,
|
|
|
|
ValidationType: orgDomainValidationTypeFromModel(domain.ValidationType),
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainSearchRequestToModel(request *management.OrgDomainSearchRequest) *org_model.OrgDomainSearchRequest {
|
2020-06-16 09:40:18 +00:00
|
|
|
return &org_model.OrgDomainSearchRequest{
|
|
|
|
Limit: request.Limit,
|
|
|
|
Offset: request.Offset,
|
|
|
|
Queries: orgDomainSearchQueriesToModel(request.Queries),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainSearchQueriesToModel(queries []*management.OrgDomainSearchQuery) []*org_model.OrgDomainSearchQuery {
|
2020-06-16 09:40:18 +00:00
|
|
|
modelQueries := make([]*org_model.OrgDomainSearchQuery, len(queries))
|
|
|
|
|
|
|
|
for i, query := range queries {
|
|
|
|
modelQueries[i] = orgDomainSearchQueryToModel(query)
|
|
|
|
}
|
|
|
|
|
|
|
|
return modelQueries
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainSearchQueryToModel(query *management.OrgDomainSearchQuery) *org_model.OrgDomainSearchQuery {
|
2020-06-16 09:40:18 +00:00
|
|
|
return &org_model.OrgDomainSearchQuery{
|
|
|
|
Key: orgDomainSearchKeyToModel(query.Key),
|
|
|
|
Method: searchMethodToModel(query.Method),
|
|
|
|
Value: query.Value,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainSearchKeyToModel(key management.OrgDomainSearchKey) org_model.OrgDomainSearchKey {
|
2020-06-16 09:40:18 +00:00
|
|
|
switch key {
|
2020-07-08 11:56:37 +00:00
|
|
|
case management.OrgDomainSearchKey_ORGDOMAINSEARCHKEY_DOMAIN:
|
2020-06-23 12:47:47 +00:00
|
|
|
return org_model.OrgDomainSearchKeyDomain
|
2020-06-16 09:40:18 +00:00
|
|
|
default:
|
2020-06-23 12:47:47 +00:00
|
|
|
return org_model.OrgDomainSearchKeyUnspecified
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainSearchResponseFromModel(resp *org_model.OrgDomainSearchResponse) *management.OrgDomainSearchResponse {
|
2020-07-15 11:24:36 +00:00
|
|
|
timestamp, err := ptypes.TimestampProto(resp.Timestamp)
|
|
|
|
logging.Log("GRPC-Mxi9w").OnError(err).Debug("unable to get timestamp from time")
|
2020-07-08 11:56:37 +00:00
|
|
|
return &management.OrgDomainSearchResponse{
|
2020-07-15 11:24:36 +00:00
|
|
|
Limit: resp.Limit,
|
|
|
|
Offset: resp.Offset,
|
|
|
|
TotalResult: resp.TotalResult,
|
|
|
|
Result: orgDomainsFromModel(resp.Result),
|
|
|
|
ProcessedSequence: resp.Sequence,
|
|
|
|
ViewTimestamp: timestamp,
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
}
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgDomainsFromModel(viewDomains []*org_model.OrgDomainView) []*management.OrgDomainView {
|
|
|
|
domains := make([]*management.OrgDomainView, len(viewDomains))
|
2020-06-16 09:40:18 +00:00
|
|
|
|
|
|
|
for i, domain := range viewDomains {
|
|
|
|
domains[i] = orgDomainViewFromModel(domain)
|
|
|
|
}
|
|
|
|
|
|
|
|
return domains
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgChangesToResponse(response *org_model.OrgChanges, offset uint64, limit uint64) (_ *management.Changes) {
|
|
|
|
return &management.Changes{
|
2020-06-15 14:50:09 +00:00
|
|
|
Limit: limit,
|
|
|
|
Offset: offset,
|
|
|
|
Changes: orgChangesToMgtAPI(response),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
func orgChangesToMgtAPI(changes *org_model.OrgChanges) (_ []*management.Change) {
|
|
|
|
result := make([]*management.Change, len(changes.Changes))
|
2020-06-15 14:50:09 +00:00
|
|
|
|
|
|
|
for i, change := range changes.Changes {
|
|
|
|
b, err := json.Marshal(change.Data)
|
|
|
|
data := &structpb.Struct{}
|
|
|
|
err = protojson.Unmarshal(b, data)
|
|
|
|
if err != nil {
|
|
|
|
}
|
2020-07-08 11:56:37 +00:00
|
|
|
result[i] = &management.Change{
|
2020-06-15 14:50:09 +00:00
|
|
|
ChangeDate: change.ChangeDate,
|
2020-07-08 07:48:11 +00:00
|
|
|
EventType: message.NewLocalizedEventType(change.EventType),
|
2020-06-15 14:50:09 +00:00
|
|
|
Sequence: change.Sequence,
|
|
|
|
Data: data,
|
2020-06-29 07:37:10 +00:00
|
|
|
Editor: change.ModifierName,
|
|
|
|
EditorId: change.ModifierId,
|
2020-06-15 14:50:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result
|
|
|
|
}
|
2020-06-19 05:27:16 +00:00
|
|
|
|
feat: policies on aggregates (#799)
* feat: move pw policy
* feat: default pw complexity policy
* fix: org password complexity policy
* fix: org password complexity policy
* fix: pw complexity policy with setup
* fix: age and lockout policies on aggregates
* fix: migration
* fix: org iam policy
* fix: org iam policy
* fix: org iam policy
* fix: tests
* fix: policy request
* fix: merge master
* fix(console): policies frontend (#817)
* fix policy build
* fix: age, complexity, lockout policies
* fix: ready return err of setup not done
* fix: fix remove policies in spoolers
* fix: fix remove policies in spoolers
* feat(console): policy settings for iam and org (#824)
* fix policy build
* fix: age, complexity, lockout policies
* fix pwd complexity
* policy remove action
* add imports
* fix accounts card, enable mgmt login policy
* lint
* add iam policy to admin
* toasts, i18n, show default
* routing, i18n
* reset policy, toast i18n, cleanup, routing
* policy delete permission
* lint style
* delete iam policy
* delete non project from grid list, i18n
* lint ts, style
* fix: remove instead delete
* feat(console): delete external idp from user (#835)
* dialog i18n, delete column and function
* dialog i18n
* fix rm button
* Update console/src/assets/i18n/de.json
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update console/src/assets/i18n/de.json
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: revert env, rename policy, remove comments
* fix: lowercase sich
* fix: pr requests
* Update internal/iam/repository/eventsourcing/eventstore_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: tests
* fix: tests
* fix(console): policies (#839)
* fix: nil pointer on get userdata (#815)
* fix: external login (#818)
* fix: external login
* fix: external login
* feat(console): delete user (#819)
* add action col to user table, i18n
* delete user from detail component
* lint
* fix(console): cleanup user detail and member components, user/me redirect, permission guards, filter, org policy guard, user table, scss cleanup (#808)
* fix: remove user.write guard for filtering
* border color
* fix user routing from member tables
* idp detail layout
* generic contact component
* fix redirect to auth user, user grant disable
* disable policy action without permission, i18n
* user-create flex fix, contact ng-content
* rm unused styles
* sidenav divider
* lint
* chore(deps-dev): bump @angular/cli from 10.1.3 to 10.1.4 in /console (#806)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump @angular/cli from 10.1.3 to 10.1.4 in /console
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.1.3 to 10.1.4.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.1.3...v10.1.4)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular/language-service from 10.1.3 to 10.1.4 in /console (#805)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump @angular/language-service in /console
Bumps [@angular/language-service](https://github.com/angular/angular/tree/HEAD/packages/language-service) from 10.1.3 to 10.1.4.
- [Release notes](https://github.com/angular/angular/releases)
- [Changelog](https://github.com/angular/angular/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular/commits/10.1.4/packages/language-service)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump codelyzer from 6.0.0 to 6.0.1 in /console (#804)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump codelyzer from 6.0.0 to 6.0.1 in /console
Bumps [codelyzer](https://github.com/mgechev/codelyzer) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/mgechev/codelyzer/releases)
- [Changelog](https://github.com/mgechev/codelyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mgechev/codelyzer/commits/6.0.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular from 0.1000.8 to 0.1001.4 in /console (#803)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps-dev): bump @angular-devkit/build-angular in /console
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.8 to 0.1001.4.
- [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: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps): bump uuid from 8.3.0 to 8.3.1 in /console (#802)
* fix: user session with external login (#797)
* fix: user session with external login
* fix: tests
* fix: tests
* fix: change idp config name
* fix(container): stop copying / and instead only copy zitadel (#691)
* chore: stop copying / and instead only copy zitadel
* Update Dockerfile
* Update release.yml
* enable anchors debug
* fix(container): don't copy alpine content into scratch execpt pwd
* chore: remove need step
* merge master
* chore(deps): bump uuid from 8.3.0 to 8.3.1 in /console
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.0 to 8.3.1.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.3.0...v8.3.1)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* create memberstable as common component
* iam member cleanup
* iam + org m table, user table service user avatar
* toast config
* fix selection emitter
* fix project grant table width
* project grant members refactor
* theme optimizations
* member table col delete
* lint
* fix table row color
* refactor grey color
* lint scss
* org list redirect on click, fix user table undef
* refresh table after grant add
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix(console): intercept navigator.language, set browser lang as default for user without explicit setting, user table outline, member create dialog import (#820)
* i18n interceptor, set language to browser lang
* nullcheck
* rm external idp log
* fix module imports, rm user displayname from i18n
* Update console/src/assets/i18n/de.json
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: delete external idps from users (#822)
* fix(console): permission regex, account switcher null check, restrict app and member create access (#821)
* fix member table disable, gerneal regexp
* fix user session card, app disable
* memberships max count
* fix policy permissions
* permission check for member add dialog
* lint
* rm accounts log
* rm id regex
* fix: handle usermemberships on project and project grant delete (#825)
* fix: go handler
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: tests
* fix: not needed error handling
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Florian Forster <florian@caos.ch>
2020-10-15 08:27:13 +00:00
|
|
|
func orgIamPolicyViewFromModel(policy *iam_model.OrgIAMPolicyView) *management.OrgIamPolicyView {
|
|
|
|
return &management.OrgIamPolicyView{
|
2020-06-19 05:27:16 +00:00
|
|
|
UserLoginMustBeDomain: policy.UserLoginMustBeDomain,
|
|
|
|
Default: policy.Default,
|
|
|
|
}
|
|
|
|
}
|