bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-19 17:53:48 +00:00
Code Issues Releases Wiki Activity

Simplify check of url for null and whitespace

Browse Source
This commit is contained in:
Daniel James Smith
2021-12-06 20:05:09 +01:00
parent 1e9419747a
commit 492030da4d
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/misc/utils.ts
View File

@@ -188,14 +188,12 @@ export class Utils {
} }
static getHostname(uriString: string): string { static getHostname(uriString: string): string {
if (uriString == null) { if (Utils.isNullOrWhitespace(uriString)) {
return null; return null;
} }
uriString = uriString.trim(); uriString = uriString.trim();
if (uriString === '') {
return null;
}
// Does uriString contain invalid characters // Does uriString contain invalid characters
// TODO Needs to possibly be extended, although '!' is a reserved character // TODO Needs to possibly be extended, although '!' is a reserved character
if (uriString.indexOf('!') > 0) { if (uriString.indexOf('!') > 0) {
@@ -220,14 +218,11 @@ export class Utils {
} }
static getDomain(uriString: string): string { static getDomain(uriString: string): string {
if (uriString == null) { if (Utils.isNullOrWhitespace(uriString)) {
return null; return null;
} }
uriString = uriString.trim(); uriString = uriString.trim();
if (uriString === '') {
return null;
}
if (uriString.startsWith('data:')) { if (uriString.startsWith('data:')) {
return null; return null;
@@ -308,14 +303,11 @@ export class Utils {
static getUrl(uriString: string): URL { static getUrl(uriString: string): URL {
if (uriString == null) { if (this.isNullOrWhitespace(uriString)) {
return null; return null;
} }
uriString = uriString.trim(); uriString = uriString.trim();
if (uriString === '') {
return null;
}
let url = Utils.getUrlObject(uriString); let url = Utils.getUrlObject(uriString);
if (url == null) { if (url == null) {