History

Route OpenAPI OAuth starts through token scope

Rhys Sullivan committed 6 months ago

Commit f5eb6161 parent 1d97f032 files · +4 −5Browse files

Unified · Split

2 files
  1. packages/plugins/openapi/src/react/AddOpenApiSource.tsx +2 −3
  2. packages/plugins/openapi/src/react/EditOpenApiSource.tsx +2 −2
packages/plugins/openapi/src/react/AddOpenApiSource.tsx+2−3
@@ -597,7 +597,7 @@ export default function AddOpenApiSource(props: { · 596 unmodified lines
597597 setStartingOAuth(true);
598598 const connectionId = openApiOAuthConnectionId(resolvedSourceId, selectedOAuth2Preset.flow);
599599 const exit = await doStartOAuth({
600− params: { scopeId },
600+ params: { scopeId: oauthTokenTargetScope },
601601 payload: {
602602 endpoint: tokenUrl,
603603 redirectUrl: tokenUrl,
@@ -642,7 +642,7 @@ export default function AddOpenApiSource(props: { · 38 unmodified lines
642642 tokenScope: oauthTokenTargetScope,
643643 run: async () => {
644644 const exit = await doStartOAuth({
645− params: { scopeId },
645+ params: { scopeId: oauthTokenTargetScope },
646646 payload: {
647647 endpoint: authorizationUrl,
648648 connectionId: openApiOAuthConnectionId(resolvedSourceId, selectedOAuth2Preset.flow),
@@ -696,7 +696,6 @@ export default function AddOpenApiSource(props: { · 47 unmodified lines
696696 resolvedBaseUrl,
697697 preview,
698698 doStartOAuth,
699− scopeId,
700699 identity.name,
701700 resolvedSourceId,
702701 selectedOAuth2Fingerprint,
packages/plugins/openapi/src/react/EditOpenApiSource.tsx+2−2
@@ -447,7 +447,7 @@ export default function EditOpenApiSource(props: { · 446 unmodified lines
447447 const tokenUrl = resolveOAuthUrl(oauth2.tokenUrl, source.config.baseUrl ?? "");
448448 if (oauth2.flow === "clientCredentials") {
449449 const startOAuthExit = await doStartOAuth({
450− params: { scopeId: displayScope },
450+ params: { scopeId: targetScope },
451451 payload: {
452452 endpoint: tokenUrl,
453453 redirectUrl: tokenUrl,
@@ -502,7 +502,7 @@ export default function EditOpenApiSource(props: { · 48 unmodified lines
502502 );
503503 const issuerUrl = oauth2.issuerUrl ?? inferOAuthIssuerUrl(authorizationUrl);
504504 const startOAuthExit = await doStartOAuth({
505− params: { scopeId: displayScope },
505+ params: { scopeId: targetScope },
506506 payload: {
507507 endpoint: authorizationUrl,
508508 connectionId,