TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 21:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(system): search for existing domain globally (#3822)

Browse Source
This commit is contained in:
Silvan 2022-06-14 15:45:19 +02:00 committed by GitHub
parent dd2f31683c
commit 72b696ccb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/grpc/system/instance.go
View File

@ -67,7 +67,7 @@ func (s *Server) ExistsDomain(ctx context.Context, req *system_pb.ExistsDomainRe
domainQuery, domainQuery,
}, },
} }
domains, err := s.query.SearchInstanceDomains(ctx, query) domains, err := s.query.SearchInstanceDomainsGlobal(ctx, query)
if err != nil { if err != nil {
return nil, err return nil, err
} }

16
internal/query/instance_domain.go
View File

@ -66,9 +66,23 @@ func (q *Queries) SearchInstanceDomains(ctx context.Context, queries *InstanceDo
return nil, errors.ThrowInvalidArgument(err, "QUERY-inlsF", "Errors.Query.SQLStatement") return nil, errors.ThrowInvalidArgument(err, "QUERY-inlsF", "Errors.Query.SQLStatement")
} }
return q.queryInstanceDomains(ctx, stmt, scan, args...)
}
func (q *Queries) SearchInstanceDomainsGlobal(ctx context.Context, queries *InstanceDomainSearchQueries) (domains *InstanceDomains, err error) {
query, scan := prepareInstanceDomainsQuery()
stmt, args, err := queries.toQuery(query).ToSql()
if err != nil {
return nil, errors.ThrowInvalidArgument(err, "QUERY-IHhLR", "Errors.Query.SQLStatement")
}
return q.queryInstanceDomains(ctx, stmt, scan, args...)
}
func (q *Queries) queryInstanceDomains(ctx context.Context, stmt string, scan func(*sql.Rows) (*InstanceDomains, error), args ...interface{}) (domains *InstanceDomains, err error) {
rows, err := q.client.QueryContext(ctx, stmt, args...) rows, err := q.client.QueryContext(ctx, stmt, args...)
if err != nil { if err != nil {
return nil, errors.ThrowInternal(err, "QUERY-38Fni", "Errors.Internal") return nil, errors.ThrowInternal(err, "QUERY-Dh9Ap", "Errors.Internal")
} }
domains, err = scan(rows) domains, err = scan(rows)
if err != nil { if err != nil {