From 0c2bcfcf640f8aeba448261bec0382399d9f8b08 Mon Sep 17 00:00:00 2001
From: aeneasr <3372410+aeneasr@users.noreply.github.com>
Date: Mon, 13 May 2024 12:17:55 +0200
Subject: [PATCH] chore: synchronize workspaces

---
 persistence/sql/persister_consent.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/persistence/sql/persister_consent.go b/persistence/sql/persister_consent.go
index af086e373d6..e6987ea77e7 100644
--- a/persistence/sql/persister_consent.go
+++ b/persistence/sql/persister_consent.go
@@ -59,18 +59,16 @@ func (p *Persister) revokeConsentSession(whereStmt string, whereArgs ...interfac
 
 		var args []string
 		var ids []interface{}
+		nid := p.NetworkID(ctx)
 
 		for _, f := range fs {
 			args = append(args, "?")
 			ids = append(ids, f.ConsentChallengeID.String())
 		}
 
-		params := strings.Join(args, ", ")
 		if err := p.QueryWithNetwork(ctx).
-			Where(
-				fmt.Sprintf("request_id IN (%s)", params),
-				ids...,
-			).
+			Where("nid = ?", nid).
+			Where("request_id IN (?)", ids...).
 			Delete(&OAuth2RequestSQL{Table: sqlTableAccess}); errors.Is(err, fosite.ErrNotFound) {
 			// do nothing
 		} else if err != nil {
@@ -78,10 +76,8 @@ func (p *Persister) revokeConsentSession(whereStmt string, whereArgs ...interfac
 		}
 
 		if err := p.QueryWithNetwork(ctx).
-			Where(
-				fmt.Sprintf("request_id IN (%s)", params),
-				ids...,
-			).
+			Where("nid = ?", nid).
+			Where("request_id IN (?)", ids...).
 			Delete(&OAuth2RequestSQL{Table: sqlTableRefresh}); errors.Is(err, fosite.ErrNotFound) {
 			// do nothing
 		} else if err != nil {
@@ -89,7 +85,7 @@ func (p *Persister) revokeConsentSession(whereStmt string, whereArgs ...interfac
 		}
 
 		count, err := c.RawQuery(
-			fmt.Sprintf("DELETE FROM hydra_oauth2_flow WHERE nid = ? AND consent_challenge_id IN (%s)", params),
+			fmt.Sprintf("DELETE FROM hydra_oauth2_flow WHERE nid = ? AND consent_challenge_id IN (%s)", strings.Join(args, "?")),
 			append(
 				[]interface{}{p.NetworkID(ctx)},
 				ids...,