diff --git a/apps/customer-portal/webapp/src/features/settings/components/GenerateTokenModal.tsx b/apps/customer-portal/webapp/src/features/settings/components/GenerateTokenModal.tsx index 9a1d4dbf40..7c273cdf06 100644 --- a/apps/customer-portal/webapp/src/features/settings/components/GenerateTokenModal.tsx +++ b/apps/customer-portal/webapp/src/features/settings/components/GenerateTokenModal.tsx @@ -50,6 +50,7 @@ export default function GenerateTokenModal({ projectId, tokenType, isAdmin, + existingTokenNames = [], }: GenerateTokenModalProps): JSX.Element { const [robotName, setRobotName] = useState(""); const [robotNameError, setRobotNameError] = useState(null); @@ -59,6 +60,7 @@ export default function GenerateTokenModal({ const [createdForError, setCreatedForError] = useState(null); const [secret, setSecret] = useState(null); + const [fullTokenName, setFullTokenName] = useState(null); const [showSecret, setShowSecret] = useState(false); const [copiedSecret, setCopiedSecret] = useState(false); const [copiedName, setCopiedName] = useState(false); @@ -74,6 +76,8 @@ export default function GenerateTokenModal({ if (!value.trim()) return "Token name is required."; if (!REGISTRY_TOKEN_ROBOT_NAME_REGEX.test(value)) return "Only lowercase letters, numbers, and dashes are allowed."; + if (existingTokenNames.some((n) => n.toLowerCase() === value.trim().toLowerCase())) + return "A token with this name already exists."; return null; } @@ -101,6 +105,7 @@ export default function GenerateTokenModal({ { onSuccess: (data) => { setSecret(data.secret); + setFullTokenName(data.name ?? null); }, }, ); @@ -113,6 +118,7 @@ export default function GenerateTokenModal({ setSelectedUser(null); setCreatedForError(null); setSecret(null); + setFullTokenName(null); setShowSecret(false); setCopiedSecret(false); setCopiedName(false); @@ -165,14 +171,14 @@ export default function GenerateTokenModal({ handleCopy(robotName, "name")} + onClick={() => handleCopy(fullTokenName ?? robotName, "name")} color={copiedName ? "success" : "default"} aria-label="Copy token name" > @@ -243,8 +249,7 @@ export default function GenerateTokenModal({ onChange={(e) => { const value = e.target.value.toLowerCase(); setRobotName(value); - if (robotNameError) - setRobotNameError(validateRobotName(value)); + setRobotNameError(validateRobotName(value)); }} onBlur={() => setRobotNameError(validateRobotName(robotName))} error={!!robotNameError} @@ -319,7 +324,7 @@ export default function GenerateTokenModal({ variant="contained" color="warning" onClick={handleGenerate} - disabled={createMutation.isPending} + disabled={createMutation.isPending || !!robotNameError || (tokenType === RegistryTokenType.SERVICE && !selectedUser)} startIcon={ createMutation.isPending ? ( diff --git a/apps/customer-portal/webapp/src/features/settings/components/RegenerateTokenModal.tsx b/apps/customer-portal/webapp/src/features/settings/components/RegenerateTokenModal.tsx index 764a6abdb3..6163e1be5c 100644 --- a/apps/customer-portal/webapp/src/features/settings/components/RegenerateTokenModal.tsx +++ b/apps/customer-portal/webapp/src/features/settings/components/RegenerateTokenModal.tsx @@ -46,6 +46,7 @@ export default function RegenerateTokenModal({ token, }: RegenerateTokenModalProps): JSX.Element { const [secret, setSecret] = useState(null); + const [fullTokenName, setFullTokenName] = useState(null); const [showSecret, setShowSecret] = useState(false); const [copiedSecret, setCopiedSecret] = useState(false); const [copiedName, setCopiedName] = useState(false); @@ -57,12 +58,14 @@ export default function RegenerateTokenModal({ regenerateMutation.mutate(token.id, { onSuccess: (data) => { setSecret(data.secret); + setFullTokenName(data.name ?? null); }, }); } function handleClose() { setSecret(null); + setFullTokenName(null); setShowSecret(false); setCopiedSecret(false); setCopiedName(false); @@ -115,7 +118,7 @@ export default function RegenerateTokenModal({ handleCopy( - token?.displayName ?? token?.name ?? "", + fullTokenName ?? token?.name ?? "", "name", ) } diff --git a/apps/customer-portal/webapp/src/features/settings/components/SettingsRegistryTokens.tsx b/apps/customer-portal/webapp/src/features/settings/components/SettingsRegistryTokens.tsx index c2bca77e11..e9871357c9 100644 --- a/apps/customer-portal/webapp/src/features/settings/components/SettingsRegistryTokens.tsx +++ b/apps/customer-portal/webapp/src/features/settings/components/SettingsRegistryTokens.tsx @@ -570,6 +570,7 @@ export default function SettingsRegistryTokens({ : RegistryTokenType.USER } isAdmin={isAdmin} + existingTokenNames={allTokens.map((t) => t.displayName ?? t.name)} />