diff options
| author | Sebastian <sebasjm@gmail.com> | 2021-07-20 11:44:53 -0300 |
|---|---|---|
| committer | Sebastian <sebasjm@gmail.com> | 2021-07-20 11:45:42 -0300 |
| commit | e42a7c6cce2a327a8169fba7143c9d229c3c92b9 (patch) | |
| tree | 3925fd08505414f201980d3ede75a5875fe4292f | |
| parent | 6a55ff52c9fc224595475e3a6fb39326cc42c920 (diff) | |
| download | merchant-backoffice-e42a7c6cce2a327a8169fba7143c9d229c3c92b9.tar.gz merchant-backoffice-e42a7c6cce2a327a8169fba7143c9d229c3c92b9.tar.bz2 merchant-backoffice-e42a7c6cce2a327a8169fba7143c9d229c3c92b9.zip | |
adding regex to instance id
| -rw-r--r-- | packages/frontend/src/paths/admin/create/CreatePage.tsx | 4 | ||||
| -rw-r--r-- | packages/frontend/src/utils/constants.ts | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/frontend/src/paths/admin/create/CreatePage.tsx b/packages/frontend/src/paths/admin/create/CreatePage.tsx index dd65069..b2e6088 100644 --- a/packages/frontend/src/paths/admin/create/CreatePage.tsx +++ b/packages/frontend/src/paths/admin/create/CreatePage.tsx @@ -28,7 +28,7 @@ import { SetTokenNewInstanceModal } from "../../../components/modal"; import { MerchantBackend } from "../../../declaration"; import { Translate, useTranslator } from "../../../i18n"; import { DefaultInstanceFormFields } from "../../../components/instance/DefaultInstanceFormFields"; -import { PAYTO_REGEX } from "../../../utils/constants"; +import { INSTANCE_ID_REGEX, PAYTO_REGEX } from "../../../utils/constants"; import { Amounts } from "@gnu-taler/taler-util"; export type Entity = MerchantBackend.Instances.InstanceConfigurationMessage & { auth_token?: string } @@ -60,7 +60,7 @@ export function CreatePage({ onCreate, onBack, forceId }: Props): VNode { const i18n = useTranslator() const errors: FormErrors<Entity> = { - id: !value.id ? i18n`required` : undefined, + id: !value.id ? i18n`required` : ( !INSTANCE_ID_REGEX.test(value.id) ? i18n`is not valid` : undefined), name: !value.name ? i18n`required` : undefined, payto_uris: !value.payto_uris || !value.payto_uris.length ? i18n`required` : ( diff --git a/packages/frontend/src/utils/constants.ts b/packages/frontend/src/utils/constants.ts index 403adb9..37c46e4 100644 --- a/packages/frontend/src/utils/constants.ts +++ b/packages/frontend/src/utils/constants.ts @@ -42,4 +42,6 @@ export const MAX_RESULT_SIZE = PAGE_SIZE * 2 - 1; // how much we will wait for all request, in seconds export const DEFAULT_REQUEST_TIMEOUT = 10; -export const MAX_IMAGE_SIZE = 1024 * 1024;
\ No newline at end of file +export const MAX_IMAGE_SIZE = 1024 * 1024; + +export const INSTANCE_ID_REGEX = /^[a-zA-Z0-9][a-zA-Z0-9_.@-]+$/ |