mirror of
https://github.com/zitadel/zitadel.git
synced 2025-01-07 13:37:41 +00:00
f3e6f3b23b
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
174 lines
5.0 KiB
Go
174 lines
5.0 KiB
Go
package org
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/api/grpc/object"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
org_pb "github.com/zitadel/zitadel/pkg/grpc/org"
|
|
)
|
|
|
|
func OrgQueriesToModel(queries []*org_pb.OrgQuery) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = OrgQueryToModel(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func OrgQueryToModel(apiQuery *org_pb.OrgQuery) (query.SearchQuery, error) {
|
|
switch q := apiQuery.Query.(type) {
|
|
case *org_pb.OrgQuery_DomainQuery:
|
|
return query.NewOrgDomainSearchQuery(object.TextMethodToQuery(q.DomainQuery.Method), q.DomainQuery.Domain)
|
|
case *org_pb.OrgQuery_NameQuery:
|
|
return query.NewOrgNameSearchQuery(object.TextMethodToQuery(q.NameQuery.Method), q.NameQuery.Name)
|
|
default:
|
|
return nil, errors.ThrowInvalidArgument(nil, "ORG-vR9nC", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func OrgQueriesToQuery(queries []*org_pb.OrgQuery) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = OrgQueryToQuery(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func OrgQueryToQuery(search *org_pb.OrgQuery) (query.SearchQuery, error) {
|
|
switch q := search.Query.(type) {
|
|
case *org_pb.OrgQuery_DomainQuery:
|
|
return query.NewOrgDomainSearchQuery(object.TextMethodToQuery(q.DomainQuery.Method), q.DomainQuery.Domain)
|
|
case *org_pb.OrgQuery_NameQuery:
|
|
return query.NewOrgNameSearchQuery(object.TextMethodToQuery(q.NameQuery.Method), q.NameQuery.Name)
|
|
default:
|
|
return nil, errors.ThrowInvalidArgument(nil, "ADMIN-ADvsd", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func OrgViewsToPb(orgs []*query.Org) []*org_pb.Org {
|
|
o := make([]*org_pb.Org, len(orgs))
|
|
for i, org := range orgs {
|
|
o[i] = OrgViewToPb(org)
|
|
}
|
|
return o
|
|
}
|
|
|
|
func OrgViewToPb(org *query.Org) *org_pb.Org {
|
|
return &org_pb.Org{
|
|
Id: org.ID,
|
|
State: OrgStateToPb(org.State),
|
|
Name: org.Name,
|
|
PrimaryDomain: org.Domain,
|
|
Details: object.ToViewDetailsPb(
|
|
org.Sequence,
|
|
org.CreationDate,
|
|
org.ChangeDate,
|
|
org.ResourceOwner,
|
|
),
|
|
}
|
|
}
|
|
|
|
func OrgsToPb(orgs []*query.Org) []*org_pb.Org {
|
|
o := make([]*org_pb.Org, len(orgs))
|
|
for i, org := range orgs {
|
|
o[i] = OrgToPb(org)
|
|
}
|
|
return o
|
|
}
|
|
|
|
func OrgToPb(org *query.Org) *org_pb.Org {
|
|
return &org_pb.Org{
|
|
Id: org.ID,
|
|
Name: org.Name,
|
|
PrimaryDomain: org.Domain,
|
|
Details: object.ToViewDetailsPb(org.Sequence, org.CreationDate, org.ChangeDate, org.ResourceOwner),
|
|
State: OrgStateToPb(org.State),
|
|
}
|
|
}
|
|
|
|
func OrgStateToPb(state domain.OrgState) org_pb.OrgState {
|
|
switch state {
|
|
case domain.OrgStateActive:
|
|
return org_pb.OrgState_ORG_STATE_ACTIVE
|
|
case domain.OrgStateInactive:
|
|
return org_pb.OrgState_ORG_STATE_INACTIVE
|
|
case domain.OrgStateRemoved:
|
|
return org_pb.OrgState_ORG_STATE_REMOVED
|
|
default:
|
|
return org_pb.OrgState_ORG_STATE_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func DomainQueriesToModel(queries []*org_pb.DomainSearchQuery) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = DomainQueryToModel(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func DomainQueryToModel(searchQuery *org_pb.DomainSearchQuery) (query.SearchQuery, error) {
|
|
switch q := searchQuery.Query.(type) {
|
|
case *org_pb.DomainSearchQuery_DomainNameQuery:
|
|
return query.NewOrgDomainDomainSearchQuery(object.TextMethodToQuery(q.DomainNameQuery.Method), q.DomainNameQuery.Name)
|
|
default:
|
|
return nil, errors.ThrowInvalidArgument(nil, "ORG-Ags42", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func DomainsToPb(domains []*query.Domain) []*org_pb.Domain {
|
|
d := make([]*org_pb.Domain, len(domains))
|
|
for i, domain := range domains {
|
|
d[i] = DomainToPb(domain)
|
|
}
|
|
return d
|
|
}
|
|
|
|
func DomainToPb(d *query.Domain) *org_pb.Domain {
|
|
return &org_pb.Domain{
|
|
OrgId: d.OrgID,
|
|
DomainName: d.Domain,
|
|
IsVerified: d.IsVerified,
|
|
IsPrimary: d.IsPrimary,
|
|
ValidationType: DomainValidationTypeFromModel(d.ValidationType),
|
|
Details: object.ToViewDetailsPb(
|
|
d.Sequence,
|
|
d.CreationDate,
|
|
d.ChangeDate,
|
|
d.OrgID,
|
|
),
|
|
}
|
|
}
|
|
|
|
func DomainValidationTypeToDomain(validationType org_pb.DomainValidationType) domain.OrgDomainValidationType {
|
|
switch validationType {
|
|
case org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_HTTP:
|
|
return domain.OrgDomainValidationTypeHTTP
|
|
case org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_DNS:
|
|
return domain.OrgDomainValidationTypeDNS
|
|
default:
|
|
return domain.OrgDomainValidationTypeUnspecified
|
|
}
|
|
}
|
|
|
|
func DomainValidationTypeFromModel(validationType domain.OrgDomainValidationType) org_pb.DomainValidationType {
|
|
switch validationType {
|
|
case domain.OrgDomainValidationTypeDNS:
|
|
return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_DNS
|
|
case domain.OrgDomainValidationTypeHTTP:
|
|
return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_HTTP
|
|
default:
|
|
return org_pb.DomainValidationType_DOMAIN_VALIDATION_TYPE_UNSPECIFIED
|
|
}
|
|
}
|