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

Ignore regex URI when launching (#28) 

* Do not launch regex URI

* Fix incorrect check

* More null checks
This commit is contained in:
ShirokaiLon 2019-02-08 13:01:08 +00:00 committed by Kyle Spearrin
parent 93244b5c90
commit 4aaf452883
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ export class LoginUriView implements View {
if (this._canLaunch != null) {
return this._canLaunch;
}
if (this.uri != null) {
if (this.uri != null && this.match != UriMatchType.RegularExpression) {
const uri = this.launchUri;
for (let i = 0; i < CanLaunchWhitelist.length; i++) {
if (uri.indexOf(CanLaunchWhitelist[i]) === 0) {

11
src/models/view/loginView.ts
View File

@ -31,11 +31,18 @@ export class LoginView implements View {
}
get canLaunch(): boolean {
return this.hasUris && this.uris[0].canLaunch;
return this.hasUris && this.uris.some(uri => uri.canLaunch);
}
get launchUri(): string {
return this.canLaunch ? this.uris[0].launchUri : null;
if (this.hasUris) {
const uri = this.uris.find(uri => uri.canLaunch)
if (uri != null) {
return uri.launchUri;
}
}
return null;
}
get hasUris(): boolean {