Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #125 from bitwarden/display-port-in-vault-list

Browse Source 
Modified response to include port if exists
This commit is contained in:
Matt Smith 2020-07-14 11:16:35 -05:00 committed by GitHub
commit f820cb9186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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
@ -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)));