fix: fixed error handling in persister

ory · Nov 16, 2021 · 8760dff · 8760dff
1 parent ef11adf
commit 8760dff
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/persistence/sql/persister_oauth2.go b/persistence/sql/persister_oauth2.go
@@ -378,7 +378,9 @@ func (p *Persister) FlushInactiveAccessTokens(ctx context.Context, notAfter time
 		notAfter,
 	)
 	if err := q.All(&signatures); err == sql.ErrNoRows {
-		return errors.Wrap(fosite.ErrNotFound, "")
+		return errorsx.WithStack(fosite.ErrNotFound)
+	} else if err != nil {
+		return errorsx.WithStack(err)
 	}
 
 	// Delete tokens in batch
@@ -394,6 +396,9 @@ func (p *Persister) FlushInactiveAccessTokens(ctx context.Context, notAfter time
 				fmt.Sprintf("DELETE FROM %s WHERE signature in (?)", OAuth2RequestSQL{Table: sqlTableAccess}.TableName()),
 				signatures[i:j],
 			).Exec()
+			if err != nil {
+				break
+			}
 		}
 	}
 	return sqlcon.HandleError(err)
@@ -416,7 +421,9 @@ func (p *Persister) FlushInactiveRefreshTokens(ctx context.Context, notAfter tim
 		notAfter,
 	)
 	if err := q.All(&signatures); err == sql.ErrNoRows {
-		return errors.Wrap(fosite.ErrNotFound, "")
+		return errorsx.WithStack(fosite.ErrNotFound)
+	} else if err != nil {
+		return errorsx.WithStack(err)
 	}
 
 	// Delete tokens in batch
@@ -432,6 +439,9 @@ func (p *Persister) FlushInactiveRefreshTokens(ctx context.Context, notAfter tim
 				fmt.Sprintf("DELETE FROM %s WHERE signature in (?)", OAuth2RequestSQL{Table: sqlTableRefresh}.TableName()),
 				signatures[i:j],
 			).Exec()
+			if err != nil {
+				break
+			}
 		}
 	}
 	return sqlcon.HandleError(err)