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
597 setStartingOAuth(true);597 setStartingOAuth(true);
598 const connectionId = openApiOAuthConnectionId(resolvedSourceId, selectedOAuth2Preset.flow);598 const connectionId = openApiOAuthConnectionId(resolvedSourceId, selectedOAuth2Preset.flow);
599 const exit = await doStartOAuth({599 const exit = await doStartOAuth({
600 params: { scopeId },600 params: { scopeId: oauthTokenTargetScope },
601 payload: {601 payload: {
602 endpoint: tokenUrl,602 endpoint: tokenUrl,
603 redirectUrl: tokenUrl,603 redirectUrl: tokenUrl,
@@ -642,7 +642,7 @@ export default function AddOpenApiSource(props: { · 38 unmodified lines
642 tokenScope: oauthTokenTargetScope,642 tokenScope: oauthTokenTargetScope,
643 run: async () => {643 run: async () => {
644 const exit = await doStartOAuth({644 const exit = await doStartOAuth({
645 params: { scopeId },645 params: { scopeId: oauthTokenTargetScope },
646 payload: {646 payload: {
647 endpoint: authorizationUrl,647 endpoint: authorizationUrl,
648 connectionId: openApiOAuthConnectionId(resolvedSourceId, selectedOAuth2Preset.flow),648 connectionId: openApiOAuthConnectionId(resolvedSourceId, selectedOAuth2Preset.flow),
@@ -696,7 +696,6 @@ export default function AddOpenApiSource(props: { · 47 unmodified lines
696 resolvedBaseUrl,696 resolvedBaseUrl,
697 preview,697 preview,
698 doStartOAuth,698 doStartOAuth,
699 scopeId,
700 identity.name,699 identity.name,
701 resolvedSourceId,700 resolvedSourceId,
702 selectedOAuth2Fingerprint,701 selectedOAuth2Fingerprint,
packages/plugins/openapi/src/react/EditOpenApiSource.tsx+2−2
@@ -447,7 +447,7 @@ export default function EditOpenApiSource(props: { · 446 unmodified lines
447 const tokenUrl = resolveOAuthUrl(oauth2.tokenUrl, source.config.baseUrl ?? "");447 const tokenUrl = resolveOAuthUrl(oauth2.tokenUrl, source.config.baseUrl ?? "");
448 if (oauth2.flow === "clientCredentials") {448 if (oauth2.flow === "clientCredentials") {
449 const startOAuthExit = await doStartOAuth({449 const startOAuthExit = await doStartOAuth({
450 params: { scopeId: displayScope },450 params: { scopeId: targetScope },
451 payload: {451 payload: {
452 endpoint: tokenUrl,452 endpoint: tokenUrl,
453 redirectUrl: tokenUrl,453 redirectUrl: tokenUrl,
@@ -502,7 +502,7 @@ export default function EditOpenApiSource(props: { · 48 unmodified lines
502 );502 );
503 const issuerUrl = oauth2.issuerUrl ?? inferOAuthIssuerUrl(authorizationUrl);503 const issuerUrl = oauth2.issuerUrl ?? inferOAuthIssuerUrl(authorizationUrl);
504 const startOAuthExit = await doStartOAuth({504 const startOAuthExit = await doStartOAuth({
505 params: { scopeId: displayScope },505 params: { scopeId: targetScope },
506 payload: {506 payload: {
507 endpoint: authorizationUrl,507 endpoint: authorizationUrl,
508 connectionId,508 connectionId,