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.

Sign up for GitHub

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

Jump to bottom

Allow subdomain resolution #17

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow subdomain resolution #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 15 additions & 23 deletions src/tools/name-tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,11 @@ export class NameTools {
else if (detailedName.type === NameType.SECOND_LEVEL_DOMAIN || detailedName.type === NameType.SUB_DOMAINED_DOMAIN) {
const nameSplitted = detailedName.name.split(".");
const asciiNameSplitted = detailedName.asciiName.split(".");
if (nameSplitted.length === 2 && asciiNameSplitted.length === 2) {
tld = nameSplitted[nameSplitted.length - 1];
secondLevelDomain = nameSplitted[nameSplitted.length - 2];
tld = nameSplitted[nameSplitted.length - 1];
secondLevelDomain = nameSplitted[nameSplitted.length - 2];

tldAsciiName = asciiNameSplitted[asciiNameSplitted.length - 1];
secondLevelDomainAsciiName = asciiNameSplitted[asciiNameSplitted.length - 2];
}
tldAsciiName = asciiNameSplitted[asciiNameSplitted.length - 1];
secondLevelDomainAsciiName = asciiNameSplitted[asciiNameSplitted.length - 2];
}

return {
Expand Down Expand Up @@ -73,8 +71,7 @@ export class NameTools {
}

//Check if the search input name has a repeated dot (es. app..cryptotld)
const dotCount = asciiString.split(".").length - 1;
if (dotCount > 1) {
if (name.includes("..")) {
errors.push("REPETED_DOT");
foundError = true;
}
Expand All @@ -83,23 +80,18 @@ export class NameTools {
let asciiName = asciiString;
const itemType = this.getItemTypeFromString(asciiString);

if (itemType == NameType.SUB_DOMAINED_DOMAIN) {
//The search input name is a sub domained domain (es. freename.app.cryptotld)
errors.push("SUB_DOMAINS_NOT_ALLOWED");
} else {
if (itemType == NameType.TLD) {
//remove the "." from the start of the tld (es .freename becomes freename)
if (name.includes(".")) {
name = name.replace(/\./g, "");
asciiName = asciiName.replace(/\./g, "");
}
if (itemType == NameType.TLD) {
//remove the "." from the start of the tld (es .freename becomes freename)
if (name.includes(".")) {
name = name.replace(/\./g, "");
asciiName = asciiName.replace(/\./g, "");
}
return {
asciiName,
name,
type: itemType,
};
}
return {
asciiName,
name,
type: itemType,
};
}
}

Expand Down