Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(console): fix jwt test context code editor bug #5563

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions packages/console/src/pages/JwtClaims/SettingsSection/TestTab.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { type JsonObject, LogtoJwtTokenPath, type RequestErrorBody } from '@logto/schemas';
import { LogtoJwtTokenPath, type JsonObject, type RequestErrorBody } from '@logto/schemas';
import { conditional } from '@silverhand/essentials';
import classNames from 'classnames';
import { HTTPError } from 'ky';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { useFormContext, Controller, type ControllerRenderProps } from 'react-hook-form';
import { Controller, useFormContext, type ControllerRenderProps } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { z } from 'zod';

import Button from '@/ds-components/Button';
import Card from '@/ds-components/Card';
import useApi from '@/hooks/use-api';

import MonacoCodeEditor, { type ModelControl } from '../MonacoCodeEditor';
import MonacoCodeEditor, { type ModelControl, type ModelSettings } from '../MonacoCodeEditor';
import { type JwtClaimsFormType } from '../type';
import {
accessTokenPayloadTestModel,
Expand All @@ -30,6 +31,13 @@ const accessTokenModelSettings = [accessTokenPayloadTestModel, userContextTestMo
const clientCredentialsModelSettings = [clientCredentialsPayloadTestModel];
const testEndpointPath = 'api/configs/jwt-customizer/test';
const jwtCustomizerGeneralErrorCode = 'jwt_customizer.general';
/**
* SampleCode form filed value update formatter.
* Reset the field to undefined if the value is the same as the default value
*/
const updateSampleCodeValue = (model: ModelSettings, newValue: string | undefined) => {
return newValue === model.defaultValue ? undefined : newValue;
};

function TestTab({ isActive }: Props) {
const { t } = useTranslation(undefined, { keyPrefix: 'admin_console.jwt_claims' });
Expand Down Expand Up @@ -92,27 +100,32 @@ function TestTab({ isActive }: Props) {

const getModelControllerProps = useCallback(
({ value, onChange }: ControllerRenderProps<JwtClaimsFormType, 'testSample'>): ModelControl => {
// User access token context test model (user data)
if (activeModelName === userContextTestModel.name) {
return {
value: value?.contextSample,
onChange: (newValue: string | undefined) => {
onChange({
...value,
contextSample: newValue,
});
},
};
}

// Token payload test model (user and machine to machine)
return {
value: value?.tokenSample,
value:
activeModelName === userContextTestModel.name ? value?.contextSample : value?.tokenSample,
onChange: (newValue: string | undefined) => {
onChange({
// Form value is a object we need to update the specific field
const updatedValue: JwtClaimsFormType['testSample'] = {
...value,
tokenSample: newValue,
});
...conditional(
activeModelName === userContextTestModel.name && {
contextSample: updateSampleCodeValue(userContextTestModel, newValue),
}
),
...conditional(
activeModelName === accessTokenPayloadTestModel.name && {
tokenSample: updateSampleCodeValue(accessTokenPayloadTestModel, newValue),
}
),
...conditional(
activeModelName === clientCredentialsPayloadTestModel.name && {
// Reset the field to undefined if the value is the same as the default value
tokenSample: updateSampleCodeValue(clientCredentialsPayloadTestModel, newValue),
}
),
};

onChange(updatedValue);
},
};
},
Expand Down
2 changes: 1 addition & 1 deletion packages/console/src/pages/JwtClaims/utils/config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const standardTokenPayloadData = {
jti: 'f1d3d2d1-1f2d-3d4e-5d6f-7d8a9d0e1d2',
iat: 1_516_235_022,
exp: 1_516_235_022 + 3600,
client_id: 'my_app',
clientId: 'my_app',
scope: 'read write',
aud: 'http://localhost:3000/api/test',
};
Expand Down
Loading