TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-06-12 11:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct where statement for AppByOIDCClientID (#4815)

Browse Source 
Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
Stefan Benz 2022-12-02 13:15:09 +00:00 committed by GitHub
parent e7137dba60
commit add232d1dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/query/app.go
View File

@ -429,18 +429,17 @@ func (q *Queries) AppByClientID(ctx context.Context, clientID string, withOwnerR
defer func() { span.EndWithError(err) }() defer func() { span.EndWithError(err) }()
stmt, scan := prepareAppQuery() stmt, scan := prepareAppQuery()
var eq []sq.Sqlizer eq := sq.Eq{AppColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}
eq = append(eq, sq.And{ if !withOwnerRemoved {
sq.Eq{AppColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}, eq[AppColumnOwnerRemoved.identifier()] = false
}
query, args, err := stmt.Where(sq.And{
eq,
sq.Or{ sq.Or{
sq.Eq{AppOIDCConfigColumnClientID.identifier(): clientID}, sq.Eq{AppOIDCConfigColumnClientID.identifier(): clientID},
sq.Eq{AppAPIConfigColumnClientID.identifier(): clientID}, sq.Eq{AppAPIConfigColumnClientID.identifier(): clientID},
}, },
}) }).ToSql()
if !withOwnerRemoved {
eq = append(eq, sq.Eq{AppColumnOwnerRemoved.identifier(): false})
}
query, args, err := stmt.Where(eq).ToSql()
if err != nil { if err != nil {
return nil, errors.ThrowInternal(err, "QUERY-Dfge2", "Errors.Query.SQLStatement") return nil, errors.ThrowInternal(err, "QUERY-Dfge2", "Errors.Query.SQLStatement")
} }