TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-11-14 15:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: port reduction (#323)

Browse Source 
* move mgmt pkg

* begin package restructure

* rename auth package to authz

* begin start api

* move auth

* move admin

* fix merge

* configs and interceptors

* interceptor

* revert generate-grpc.sh

* some cleanups

* console

* move console

* fix tests and merging

* js linting

* merge

* merging and configs

* change k8s base to current ports

* fixes

* cleanup

* regenerate proto

* remove unnecessary whitespace

* missing param

* go mod tidy

* fix merging

* move login pkg

* cleanup

* move api pkgs again

* fix pkg naming

* fix generate-static.sh for login

* update workflow

* fixes

* logging

* remove duplicate

* comment for optional gateway interfaces

* regenerate protos

* fix proto imports for grpc web

* protos

* grpc web generate

* grpc web generate

* fix changes

* add translation interceptor

* fix merging

* regenerate mgmt proto
This commit is contained in:
Livio Amstutz
2020-07-08 13:56:37 +02:00
committed by GitHub
parent 708652a655
commit 3549a8b64e
330 changed files with 30495 additions and 30809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/management/repository/eventsourcing/eventstore/org.go
View File

@@ -2,17 +2,16 @@ package eventstore
import (
"context"
usr_es "github.com/caos/zitadel/internal/user/repository/eventsourcing"
"strings"
"github.com/caos/zitadel/internal/api/auth"
global_model "github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/org/repository/view/model"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/errors"
mgmt_view "github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
global_model "github.com/caos/zitadel/internal/model"
org_model "github.com/caos/zitadel/internal/org/model"
org_es "github.com/caos/zitadel/internal/org/repository/eventsourcing"
"github.com/caos/zitadel/internal/org/repository/view/model"
usr_es "github.com/caos/zitadel/internal/user/repository/eventsourcing"
)
type OrgRepository struct {
@@ -52,12 +51,12 @@ func (repo *OrgRepository) ReactivateOrg(ctx context.Context, id string) (*org_m
}
func (repo *OrgRepository) GetMyOrgIamPolicy(ctx context.Context) (*org_model.OrgIamPolicy, error) {
return repo.OrgEventstore.GetOrgIamPolicy(ctx, auth.GetCtxData(ctx).OrgID)
return repo.OrgEventstore.GetOrgIamPolicy(ctx, authz.GetCtxData(ctx).OrgID)
}
func (repo *OrgRepository) SearchMyOrgDomains(ctx context.Context, request *org_model.OrgDomainSearchRequest) (*org_model.OrgDomainSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.Queries = append(request.Queries, &org_model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: auth.GetCtxData(ctx).OrgID})
request.Queries = append(request.Queries, &org_model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).OrgID})
domains, count, err := repo.View.SearchOrgDomains(request)
if err != nil {
return nil, err
@@ -71,12 +70,12 @@ func (repo *OrgRepository) SearchMyOrgDomains(ctx context.Context, request *org_
}
func (repo *OrgRepository) AddMyOrgDomain(ctx context.Context, domain *org_model.OrgDomain) (*org_model.OrgDomain, error) {
domain.AggregateID = auth.GetCtxData(ctx).OrgID
domain.AggregateID = authz.GetCtxData(ctx).OrgID
return repo.OrgEventstore.AddOrgDomain(ctx, domain)
}
func (repo *OrgRepository) RemoveMyOrgDomain(ctx context.Context, domain string) error {
d := org_model.NewOrgDomain(auth.GetCtxData(ctx).OrgID, domain)
d := org_model.NewOrgDomain(authz.GetCtxData(ctx).OrgID, domain)
return repo.OrgEventstore.RemoveOrgDomain(ctx, d)
}
@@ -104,23 +103,23 @@ func (repo *OrgRepository) OrgMemberByID(ctx context.Context, orgID, userID stri
}
func (repo *OrgRepository) AddMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
member.AggregateID = auth.GetCtxData(ctx).OrgID
member.AggregateID = authz.GetCtxData(ctx).OrgID
return repo.OrgEventstore.AddOrgMember(ctx, member)
}
func (repo *OrgRepository) ChangeMyOrgMember(ctx context.Context, member *org_model.OrgMember) (*org_model.OrgMember, error) {
member.AggregateID = auth.GetCtxData(ctx).OrgID
member.AggregateID = authz.GetCtxData(ctx).OrgID
return repo.OrgEventstore.ChangeOrgMember(ctx, member)
}
func (repo *OrgRepository) RemoveMyOrgMember(ctx context.Context, userID string) error {
member := org_model.NewOrgMember(auth.GetCtxData(ctx).OrgID, userID)
member := org_model.NewOrgMember(authz.GetCtxData(ctx).OrgID, userID)
return repo.OrgEventstore.RemoveOrgMember(ctx, member)
}
func (repo *OrgRepository) SearchMyOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.Queries[len(request.Queries)-1] = &org_model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: auth.GetCtxData(ctx).OrgID}
request.Queries[len(request.Queries)-1] = &org_model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).OrgID}
members, count, err := repo.View.SearchOrgMembers(request)
if err != nil {
return nil, err