From fdd596233ee5da05c6176542f2537d748a0fe78d Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Sun, 20 Apr 2025 21:32:13 -0700 Subject: [PATCH] Fix continue ignored Signed-off-by: Bryan Frimin --- apps/console/src/pages/organizations/SettingsView.tsx | 8 +++++++- pkg/connector/oauth2.go | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/console/src/pages/organizations/SettingsView.tsx b/apps/console/src/pages/organizations/SettingsView.tsx index 4e0a47b35..b2ab3a632 100644 --- a/apps/console/src/pages/organizations/SettingsView.tsx +++ b/apps/console/src/pages/organizations/SettingsView.tsx @@ -540,7 +540,13 @@ function SettingsViewContent({
{ + const url = new URL(`${process.env.API_SERVER_HOST}/api/console/v1/connectors/initiate`); + url.searchParams.append('organization_id', organization.id); + url.searchParams.append('connector_id', connector.id); + url.searchParams.append('continue', window.location.href); + return url.toString(); + })()} className="inline-flex items-center justify-center h-9 px-3 text-sm font-medium rounded-md border border-input bg-background hover:bg-accent hover:text-accent-foreground" > Connect diff --git a/pkg/connector/oauth2.go b/pkg/connector/oauth2.go index 80dfef9a0..5081e6f4c 100644 --- a/pkg/connector/oauth2.go +++ b/pkg/connector/oauth2.go @@ -81,6 +81,9 @@ func (c *OAuth2Connector) Initiate(ctx context.Context, connectorID string, orga redirectQuery := url.Values{} redirectQuery.Set("organization_id", organizationID.String()) redirectQuery.Set("connector_id", connectorID) + redirectQuery.Set("continue", r.URL.Query().Get("continue")) + + fmt.Printf("\n\n\n%s\n\n\n", r.URL.Query().Get("continue")) redirectURI.RawQuery = redirectQuery.Encode()