From b585a5916357cdb7efa062aa395229107f0944c9 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Wed, 28 Jul 2021 11:23:57 +0200 Subject: [PATCH] Make `parseEnsLabel` stricter --- src/base/resolver/Query.svelte | 2 +- src/utils.ts | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/base/resolver/Query.svelte b/src/base/resolver/Query.svelte index d43665976..4effa4be6 100644 --- a/src/base/resolver/Query.svelte +++ b/src/base/resolver/Query.svelte @@ -26,7 +26,7 @@ alert("Radicle IDs are not yet supported"); } else { let label = utils.parseEnsLabel(query, config); - if (label?.includes(".")) { + if (label.includes(".")) { error = true; } else { // Jump straight to org, if the ENS entry points to an org. Otherwise it checks if the diff --git a/src/utils.ts b/src/utils.ts index 351779ff7..36b295bd7 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -73,13 +73,11 @@ export function capitalize(s: string): string { // Takes a domain name, eg. 'cloudhead.radicle.eth' and // returns the label, eg. 'cloudhead', otherwise `undefined`. -export function parseEnsLabel(name: string | undefined, config: Config): string | undefined { - if (name) { - const domain = config.registrar.domain.replace(".", "\\."); - const label = name.replace(new RegExp(`\\.${domain}$`), ""); +export function parseEnsLabel(name: string, config: Config): string { + const domain = config.registrar.domain.replace(".", "\\."); + const label = name.replace(new RegExp(`\\.${domain}$`), ""); - return label; - } + return label; } // Takes a URL, eg. "https://twitter.com/cloudhead", and return "cloudhead". @@ -172,8 +170,7 @@ export async function querySubgraph( // Format a name. export function formatName(input: string, config: Config): string { - const name = parseEnsLabel(input, config); - return name || input; + return parseEnsLabel(input, config); } // Create a Radicle ID from a root hash.