TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-14 03:54:21 +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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/query/action.go
View File

@ -114,9 +114,7 @@ func (q *Queries) GetActionByID(ctx context.Context, id string, orgID string) (*
stmt, scan := prepareActionQuery() stmt, scan := prepareActionQuery()
query, args, err := stmt.Where( query, args, err := stmt.Where(
sq.Eq{ sq.Eq{
ActionColumnID.identifier(): id, ActionColumnID.identifier(): id,
},
sq.Eq{
ActionColumnResourceOwner.identifier(): orgID, ActionColumnResourceOwner.identifier(): orgID,
}).ToSql() }).ToSql()
if err != nil { if err != nil {

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

1
internal/ui/login/handler/external_login_handler.go
View File

@ -142,6 +142,7 @@ func (l *Login) handleExternalLoginCallback(w http.ResponseWriter, r *http.Reque
return return
} }
l.handleExternalUserAuthenticated(w, r, authReq, idpConfig, userAgentID, tokens) l.handleExternalUserAuthenticated(w, r, authReq, idpConfig, userAgentID, tokens)
return
} }
l.renderError(w, r, authReq, caos_errors.ThrowPreconditionFailed(nil, "RP-asff2", "Errors.ExternalIDP.IDPTypeNotImplemented")) l.renderError(w, r, authReq, caos_errors.ThrowPreconditionFailed(nil, "RP-asff2", "Errors.ExternalIDP.IDPTypeNotImplemented"))
return return