TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 01:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: join on instanceIDs in queries (#4612)

Browse Source
This commit is contained in:
Livio Spring
2022-10-27 08:08:36 +02:00
committed by GitHub
parent d721f725fd
commit 441f215513
61 changed files with 555 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/query/idp.go
View File

@@ -59,7 +59,8 @@ type JWTIDP struct {
var (
idpTable = table{
name: projection.IDPTable,
name: projection.IDPTable,
instanceIDCol: projection.IDPInstanceIDCol,
}
IDPIDCol = Column{
name: projection.IDPIDCol,
@@ -113,7 +114,8 @@ var (
var (
oidcIDPTable = table{
name: projection.IDPOIDCTable,
name: projection.IDPOIDCTable,
instanceIDCol: projection.OIDCConfigInstanceIDCol,
}
OIDCIDPColIDPID = Column{
name: projection.OIDCConfigIDPIDCol,
@@ -155,7 +157,8 @@ var (
var (
jwtIDPTable = table{
name: projection.IDPJWTTable,
name: projection.IDPJWTTable,
instanceIDCol: projection.JWTConfigInstanceIDCol,
}
JWTIDPColIDPID = Column{
name: projection.JWTConfigIDPIDCol,
@@ -179,7 +182,7 @@ var (
}
)
//IDPByIDAndResourceOwner searches for the requested id in the context of the resource owner and IAM
// IDPByIDAndResourceOwner searches for the requested id in the context of the resource owner and IAM
func (q *Queries) IDPByIDAndResourceOwner(ctx context.Context, shouldTriggerBulk bool, id, resourceOwner string) (*IDP, error) {
if shouldTriggerBulk {
projection.IDPProjection.Trigger(ctx)
@@ -210,7 +213,7 @@ func (q *Queries) IDPByIDAndResourceOwner(ctx context.Context, shouldTriggerBulk
return scan(row)
}
//IDPs searches idps matching the query
// IDPs searches idps matching the query
func (q *Queries) IDPs(ctx context.Context, queries *IDPSearchQueries) (idps *IDPs, err error) {
query, scan := prepareIDPsQuery()
stmt, args, err := queries.toQuery(query).