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

fix: actions (#2547)

Browse Source 
* fix: external login

* fix: query flow types correct

* fix: queries of action statements

Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
This commit is contained in:
Livio Amstutz
2021-10-21 14:30:09 +02:00
committed by GitHub
parent b204ad2aca
commit b0bcefd202
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/query/action_flow.go
View File

@@ -54,9 +54,7 @@ func (q *Queries) GetFlow(ctx context.Context, flowType domain.FlowType, orgID s
query, scan := q.prepareFlowQuery()
stmt, args, err := query.Where(
sq.Eq{
FlowsTriggersColumnFlowType.identifier(): flowType,
},
sq.Eq{
FlowsTriggersColumnFlowType.identifier(): flowType,
FlowsTriggersColumnResourceOwner.identifier(): orgID,
}).ToSql()
if err != nil {
@@ -74,14 +72,11 @@ func (q *Queries) GetActionsByFlowAndTriggerType(ctx context.Context, flowType d
stmt, scan := q.prepareTriggerActionsQuery()
query, args, err := stmt.Where(
sq.Eq{
FlowsTriggersColumnFlowType.identifier(): flowType,
},
sq.Eq{
FlowsTriggersColumnTriggerType.identifier(): triggerType,
},
sq.Eq{
FlowsTriggersColumnFlowType.identifier(): flowType,
FlowsTriggersColumnTriggerType.identifier(): triggerType,
FlowsTriggersColumnResourceOwner.identifier(): orgID,
}).ToSql()
},
).ToSql()
if err != nil {
return nil, errors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement")
}