1
0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-17 10:45:41 +01:00

catch security error when setting env urls

This commit is contained in:
Kyle Spearrin 2017-09-03 12:58:42 -04:00
parent d433d9c4fc
commit 1f8e30b5cd

View File

@ -11,20 +11,26 @@ function ApiService(tokenService, appIdService, utilsService, constantsService,
function initApiService() {
ApiService.prototype.setUrls = function () {
var storedBaseUrl = window.localStorage.getItem(this.constantsService.baseUrlKey);
try {
var storedBaseUrl = window.localStorage.getItem(this.constantsService.baseUrlKey);
if (storedBaseUrl) {
this.baseUrl = storedBaseUrl + '/api';
this.identityBaseUrl = storedBaseUrl + '/identity';
return;
if (storedBaseUrl) {
this.baseUrl = storedBaseUrl + '/api';
this.identityBaseUrl = storedBaseUrl + '/identity';
return;
}
var storedApiUrl = window.localStorage.getItem(this.constantsService.apiUrlKey);
var storedIdentityUrl = window.localStorage.getItem(this.constantsService.identityUrlKey);
if (storedApiUrl && storedIdentityUrl) {
this.baseUrl = storedApiUrl;
this.identityBaseUrl = storedIdentityUrl;
return;
}
}
var storedApiUrl = window.localStorage.getItem(this.constantsService.apiUrlKey);
var storedIdentityUrl = window.localStorage.getItem(this.constantsService.identityUrlKey);
if (storedApiUrl && storedIdentityUrl) {
this.baseUrl = storedApiUrl;
this.identityBaseUrl = storedIdentityUrl;
return;
catch (e) {
console.log('Unable to set custom environment URLs:');
console.log(e);
}
// Desktop