vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Added new _host property for consumption.

This commit is contained in:
Matt Smith 2020-07-14 10:02:07 -05:00
parent 8223011248
commit b53046d0d9
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/models/view/loginUriView.ts
View File

@ -26,6 +26,7 @@ export class LoginUriView implements View {
private _uri: string = null; private _uri: string = null;
private _domain: string = null; private _domain: string = null;
private _hostname: string = null; private _hostname: string = null;
private _host: string = null;
private _canLaunch: boolean = null; private _canLaunch: boolean = null;
// tslint:enable // tslint:enable
@ -62,7 +63,7 @@ export class LoginUriView implements View {
return null; return null;
} }
if (this._hostname == null && this.uri != null) { if (this._hostname == null && this.uri != null) {
this._hostname = Utils.getHost(this.uri); this._hostname = Utils.getHostname(this.uri);
if (this._hostname === '') { if (this._hostname === '') {
this._hostname = null; this._hostname = null;
} }
@ -71,10 +72,28 @@ export class LoginUriView implements View {
return this._hostname; return this._hostname;
} }
get host(): string {
if (this.match === UriMatchType.RegularExpression) {
return null;
}
if (this._host == null && this.uri != null) {
this._host = Utils.getHost(this.uri);
if (this._host === '') {
this._host = null;
}
}
return this._host;
}
get hostnameOrUri(): string { get hostnameOrUri(): string {
return this.hostname != null ? this.hostname : this.uri; return this.hostname != null ? this.hostname : this.uri;
} }
get hostOrUri(): string {
return this.host != null ? this.host : this.uri;
}
get isWebsite(): boolean { get isWebsite(): boolean {
return this.uri != null && (this.uri.indexOf('http://') === 0 || this.uri.indexOf('https://') === 0 || return this.uri != null && (this.uri.indexOf('http://') === 0 || this.uri.indexOf('https://') === 0 ||
(this.uri.indexOf('://') < 0 && Utils.tldEndingRegex.test(this.uri))); (this.uri.indexOf('://') < 0 && Utils.tldEndingRegex.test(this.uri)));