From 8d51502651fdc77c579806ad67b10708422b6188 Mon Sep 17 00:00:00 2001 From: Russell Vinegar Date: Mon, 12 Feb 2024 16:13:53 -0800 Subject: [PATCH] validate product env, no template --- .../components/environment-config/environment-config.tsx | 1 + src/nextapp/components/environment-edit/authorization-flow.tsx | 2 +- src/nextapp/components/environments-list/edit-environment.tsx | 1 + src/nextapp/shared/services/utils.ts | 2 ++ src/services/workflow/validate-active-environment.ts | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nextapp/components/environment-config/environment-config.tsx b/src/nextapp/components/environment-config/environment-config.tsx index 8b5c1f22e..337dae3ce 100644 --- a/src/nextapp/components/environment-config/environment-config.tsx +++ b/src/nextapp/components/environment-config/environment-config.tsx @@ -305,4 +305,5 @@ const flowTypes: { value: string; label: string }[] = [ { value: 'kong-acl-only', label: 'Kong ACL Only' }, { value: 'kong-api-key-only', label: 'Kong API Key Only' }, { value: 'kong-api-key-acl', label: 'Kong API Key with ACL Flow' }, + { value: 'protected-externally', label: 'Protected Externally' }, ]; diff --git a/src/nextapp/components/environment-edit/authorization-flow.tsx b/src/nextapp/components/environment-edit/authorization-flow.tsx index c4a1421f0..f87345ab1 100644 --- a/src/nextapp/components/environment-edit/authorization-flow.tsx +++ b/src/nextapp/components/environment-edit/authorization-flow.tsx @@ -49,7 +49,7 @@ const AuthorizationFlow: React.FC = ({ if (flow === 'client-credentials' || flow === 'authorization-code') { return !credentialIssuer; } - return flow === 'public'; + return flow === 'public' || flow === 'protected-externally'; }, [flow, credentialIssuer]); const { data, isSuccess } = useCurrentNamespace(); diff --git a/src/nextapp/components/environments-list/edit-environment.tsx b/src/nextapp/components/environments-list/edit-environment.tsx index 5f57ea927..485272580 100644 --- a/src/nextapp/components/environments-list/edit-environment.tsx +++ b/src/nextapp/components/environments-list/edit-environment.tsx @@ -36,6 +36,7 @@ const EditEnvironment: React.FC = ({ data }) => { { value: 'kong-acl-only', label: 'Kong ACL Only' }, { value: 'kong-api-key-only', label: 'Kong API Key Only' }, { value: 'kong-api-key-acl', label: 'Kong API Key with ACL Flow' }, + { value: 'protected-externally', label: 'Protected Externally' }, ]; return ( diff --git a/src/nextapp/shared/services/utils.ts b/src/nextapp/shared/services/utils.ts index 895a59084..98dd2741f 100644 --- a/src/nextapp/shared/services/utils.ts +++ b/src/nextapp/shared/services/utils.ts @@ -28,6 +28,8 @@ export const getAuthToken = (method: string): IconType => { return FaLock; case 'client-credentials': return FaLock; + case 'protected-externally': + return FaLock; // case 'private': // return FaUserSecret; case 'public': diff --git a/src/services/workflow/validate-active-environment.ts b/src/services/workflow/validate-active-environment.ts index 77c28f30a..1476feeee 100644 --- a/src/services/workflow/validate-active-environment.ts +++ b/src/services/workflow/validate-active-environment.ts @@ -218,7 +218,7 @@ export const ValidateActiveEnvironment = async ( '] missing or incomplete oidc plugin.' ); } - } else if (flow == 'public') { + } else if (flow == 'public' || flow == 'protected-externally') { } else { addValidationError( 'Unexpected error when trying to validate the environment.'