mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 19:14:23 +00:00
fbb30840f1
* 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>
238 lines
7.1 KiB
Go
238 lines
7.1 KiB
Go
package admin
|
|
|
|
import (
|
|
"github.com/caos/logging"
|
|
iam_model "github.com/caos/zitadel/internal/iam/model"
|
|
"github.com/golang/protobuf/ptypes"
|
|
|
|
admin_model "github.com/caos/zitadel/internal/admin/model"
|
|
"github.com/caos/zitadel/internal/eventstore/models"
|
|
"github.com/caos/zitadel/internal/model"
|
|
org_model "github.com/caos/zitadel/internal/org/model"
|
|
usr_model "github.com/caos/zitadel/internal/user/model"
|
|
"github.com/caos/zitadel/pkg/grpc/admin"
|
|
)
|
|
|
|
func setUpRequestToModel(setUp *admin.OrgSetUpRequest) *admin_model.SetupOrg {
|
|
return &admin_model.SetupOrg{
|
|
Org: orgCreateRequestToModel(setUp.Org),
|
|
User: userCreateRequestToModel(setUp.User),
|
|
}
|
|
}
|
|
|
|
func orgCreateRequestToModel(org *admin.CreateOrgRequest) *org_model.Org {
|
|
o := &org_model.Org{
|
|
Domains: []*org_model.OrgDomain{},
|
|
Name: org.Name,
|
|
}
|
|
if org.Domain != "" {
|
|
o.Domains = append(o.Domains, &org_model.OrgDomain{Domain: org.Domain})
|
|
}
|
|
|
|
return o
|
|
}
|
|
|
|
func setUpOrgResponseFromModel(setUp *admin_model.SetupOrg) *admin.OrgSetUpResponse {
|
|
return &admin.OrgSetUpResponse{
|
|
Org: orgFromModel(setUp.Org),
|
|
User: userFromModel(setUp.User),
|
|
}
|
|
}
|
|
|
|
func orgSearchResponseFromModel(request *org_model.OrgSearchResult) *admin.OrgSearchResponse {
|
|
timestamp, err := ptypes.TimestampProto(request.Timestamp)
|
|
logging.Log("GRPC-shu7s").OnError(err).Debug("unable to get timestamp from time")
|
|
return &admin.OrgSearchResponse{
|
|
Result: orgViewsFromModel(request.Result),
|
|
Limit: request.Limit,
|
|
Offset: request.Offset,
|
|
TotalResult: request.TotalResult,
|
|
ProcessedSequence: request.Sequence,
|
|
ViewTimestamp: timestamp,
|
|
}
|
|
}
|
|
|
|
func orgViewsFromModel(orgs []*org_model.OrgView) []*admin.Org {
|
|
result := make([]*admin.Org, len(orgs))
|
|
for i, org := range orgs {
|
|
result[i] = orgViewFromModel(org)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func orgFromModel(org *org_model.Org) *admin.Org {
|
|
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")
|
|
|
|
return &admin.Org{
|
|
ChangeDate: changeDate,
|
|
CreationDate: creationDate,
|
|
Id: org.AggregateID,
|
|
Name: org.Name,
|
|
State: orgStateFromModel(org.State),
|
|
}
|
|
}
|
|
|
|
func orgViewFromModel(org *org_model.OrgView) *admin.Org {
|
|
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")
|
|
|
|
return &admin.Org{
|
|
ChangeDate: changeDate,
|
|
CreationDate: creationDate,
|
|
Id: org.ID,
|
|
Name: org.Name,
|
|
State: orgStateFromModel(org.State),
|
|
}
|
|
}
|
|
|
|
func orgStateFromModel(state org_model.OrgState) admin.OrgState {
|
|
switch state {
|
|
case org_model.OrgStateActive:
|
|
return admin.OrgState_ORGSTATE_ACTIVE
|
|
case org_model.OrgStateInactive:
|
|
return admin.OrgState_ORGSTATE_INACTIVE
|
|
default:
|
|
return admin.OrgState_ORGSTATE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func genderFromModel(gender usr_model.Gender) admin.Gender {
|
|
switch gender {
|
|
case usr_model.GenderFemale:
|
|
return admin.Gender_GENDER_FEMALE
|
|
case usr_model.GenderMale:
|
|
return admin.Gender_GENDER_MALE
|
|
case usr_model.GenderDiverse:
|
|
return admin.Gender_GENDER_DIVERSE
|
|
default:
|
|
return admin.Gender_GENDER_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func genderToModel(gender admin.Gender) usr_model.Gender {
|
|
switch gender {
|
|
case admin.Gender_GENDER_FEMALE:
|
|
return usr_model.GenderFemale
|
|
case admin.Gender_GENDER_MALE:
|
|
return usr_model.GenderMale
|
|
case admin.Gender_GENDER_DIVERSE:
|
|
return usr_model.GenderDiverse
|
|
default:
|
|
return usr_model.GenderUnspecified
|
|
}
|
|
}
|
|
|
|
func userStateFromModel(state usr_model.UserState) admin.UserState {
|
|
switch state {
|
|
case usr_model.UserStateActive:
|
|
return admin.UserState_USERSTATE_ACTIVE
|
|
case usr_model.UserStateInactive:
|
|
return admin.UserState_USERSTATE_INACTIVE
|
|
case usr_model.UserStateLocked:
|
|
return admin.UserState_USERSTATE_LOCKED
|
|
default:
|
|
return admin.UserState_USERSTATE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func orgSearchRequestToModel(req *admin.OrgSearchRequest) *org_model.OrgSearchRequest {
|
|
return &org_model.OrgSearchRequest{
|
|
Limit: req.Limit,
|
|
Asc: req.Asc,
|
|
Offset: req.Offset,
|
|
Queries: orgQueriesToModel(req.Queries),
|
|
SortingColumn: orgQueryKeyToModel(req.SortingColumn),
|
|
}
|
|
}
|
|
|
|
func orgQueriesToModel(queries []*admin.OrgSearchQuery) []*org_model.OrgSearchQuery {
|
|
modelQueries := make([]*org_model.OrgSearchQuery, len(queries))
|
|
|
|
for i, query := range queries {
|
|
modelQueries[i] = orgQueryToModel(query)
|
|
}
|
|
|
|
return modelQueries
|
|
}
|
|
|
|
func orgQueryToModel(query *admin.OrgSearchQuery) *org_model.OrgSearchQuery {
|
|
return &org_model.OrgSearchQuery{
|
|
Key: orgQueryKeyToModel(query.Key),
|
|
Value: query.Value,
|
|
Method: orgQueryMethodToModel(query.Method),
|
|
}
|
|
}
|
|
|
|
func orgQueryKeyToModel(key admin.OrgSearchKey) org_model.OrgSearchKey {
|
|
switch key {
|
|
case admin.OrgSearchKey_ORGSEARCHKEY_DOMAIN:
|
|
return org_model.OrgSearchKeyOrgDomain
|
|
case admin.OrgSearchKey_ORGSEARCHKEY_NAME:
|
|
return org_model.OrgSearchKeyOrgName
|
|
case admin.OrgSearchKey_ORGSEARCHKEY_STATE:
|
|
return org_model.OrgSearchKeyState
|
|
default:
|
|
return org_model.OrgSearchKeyUnspecified
|
|
}
|
|
}
|
|
|
|
func orgQueryMethodToModel(method admin.OrgSearchMethod) model.SearchMethod {
|
|
switch method {
|
|
case admin.OrgSearchMethod_ORGSEARCHMETHOD_CONTAINS:
|
|
return model.SearchMethodContains
|
|
case admin.OrgSearchMethod_ORGSEARCHMETHOD_EQUALS:
|
|
return model.SearchMethodEquals
|
|
case admin.OrgSearchMethod_ORGSEARCHMETHOD_STARTS_WITH:
|
|
return model.SearchMethodStartsWith
|
|
default:
|
|
return 0
|
|
}
|
|
}
|
|
|
|
func orgIAMPolicyFromModel(policy *iam_model.OrgIAMPolicy) *admin.OrgIamPolicy {
|
|
creationDate, err := ptypes.TimestampProto(policy.CreationDate)
|
|
logging.Log("GRPC-ush36").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
changeDate, err := ptypes.TimestampProto(policy.ChangeDate)
|
|
logging.Log("GRPC-Ps9fW").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
return &admin.OrgIamPolicy{
|
|
OrgId: policy.AggregateID,
|
|
UserLoginMustBeDomain: policy.UserLoginMustBeDomain,
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
}
|
|
}
|
|
|
|
func orgIAMPolicyViewFromModel(policy *iam_model.OrgIAMPolicyView) *admin.OrgIamPolicyView {
|
|
creationDate, err := ptypes.TimestampProto(policy.CreationDate)
|
|
logging.Log("GRPC-ush36").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
changeDate, err := ptypes.TimestampProto(policy.ChangeDate)
|
|
logging.Log("GRPC-Ps9fW").OnError(err).Debug("unable to get timestamp from time")
|
|
|
|
return &admin.OrgIamPolicyView{
|
|
OrgId: policy.AggregateID,
|
|
UserLoginMustBeDomain: policy.UserLoginMustBeDomain,
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
}
|
|
}
|
|
|
|
func orgIAMPolicyRequestToModel(policy *admin.OrgIamPolicyRequest) *iam_model.OrgIAMPolicy {
|
|
return &iam_model.OrgIAMPolicy{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: policy.OrgId,
|
|
},
|
|
UserLoginMustBeDomain: policy.UserLoginMustBeDomain,
|
|
}
|
|
}
|