fix: fix custom jwt api call and add cloud connection scope

logto-io · Mar 21, 2024 · 8d5d9f2 · 8d5d9f2
1 parent 15527b6
commit 8d5d9f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/console/src/pages/JwtClaims/SettingsSection/TestTab.tsx b/packages/console/src/pages/JwtClaims/SettingsSection/TestTab.tsx
@@ -1,4 +1,4 @@
-import { type JsonObject, LogtoJwtTokenPath } from '@logto/schemas';
+import { type JsonObject, LogtoJwtTokenPath, LogtoJwtTokenKey } from '@logto/schemas';
 import classNames from 'classnames';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useFormContext, Controller, type ControllerRenderProps } from 'react-hook-form';
@@ -26,7 +26,7 @@ type Props = {
 
 const userTokenModelSettings = [accessTokenPayloadTestModel, userContextTestModel];
 const machineToMachineTokenModelSettings = [clientCredentialsPayloadTestModel];
-const testEndpointPath = 'api/config/jwt-customizer/test';
+const testEndpointPath = 'api/configs/jwt-customizer/test';
 
 function TestTab({ isActive }: Props) {
   const { t } = useTranslation(undefined, { keyPrefix: 'admin_console.jwt_claims' });
@@ -54,7 +54,13 @@ function TestTab({ isActive }: Props) {
 
     const result = await api
       .post(testEndpointPath, {
-        json: formatFormDataToTestRequestPayload(payload),
+        json: {
+          tokenType:
+            tokenType === LogtoJwtTokenPath.AccessToken
+              ? LogtoJwtTokenKey.AccessToken
+              : LogtoJwtTokenKey.ClientCredentials,
+          payload: formatFormDataToTestRequestPayload(payload),
+        },
       })
       .json<JsonObject>()
       .catch((error: unknown) => {

diff --git a/packages/console/src/pages/JwtClaims/utils/format.ts b/packages/console/src/pages/JwtClaims/utils/format.ts
@@ -99,8 +99,8 @@ export const formatFormDataToTestRequestPayload = (data: JwtClaimsFormType) => {
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- parse empty string as undefined
     script: data.script || undefined,
     envVars: formatEnvVariablesFormData(data.environmentVariables),
-    token: formatSampleCodeStringToJson(data.testSample?.tokenSample) ?? defaultTokenPayload,
-    context: formatSampleCodeStringToJson(data.testSample?.contextSample) ?? defaultContext,
+    tokenSample: formatSampleCodeStringToJson(data.testSample?.tokenSample) ?? defaultTokenPayload,
+    contextSample: formatSampleCodeStringToJson(data.testSample?.contextSample) ?? defaultContext,
   };
 };
 

diff --git a/packages/core/src/libraries/cloud-connection.ts b/packages/core/src/libraries/cloud-connection.ts
@@ -28,7 +28,7 @@ const accessTokenResponseGuard = z.object({
  * The scope here can be empty and still work, because the cloud API requests made using this client do not rely on scope verification.
  * The `CloudScope.SendEmail` is added for now because it needs to call the cloud email service API.
  */
-const scopes: string[] = [CloudScope.SendEmail];
+const scopes: string[] = [CloudScope.SendEmail, CloudScope.FetchCustomJwt];
 const accessTokenExpirationMargin = 60;
 
 /** The library for connecting to Logto Cloud service. */