summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-02-21 11:07:33 -0500
committerPliable Pixels <pliablepixels@gmail.com>2019-02-21 11:07:33 -0500
commita7eb5ec2141c585c7d4eba7a49290d5cf1abe560 (patch)
tree4548eb1ed1c49487131545d036d8e2a31525337d /www
parentbdb68568d403220a381406a28fa5efe9389d636b (diff)
basic auth was invoking cordova in desktop build
Diffstat (limited to 'www')
-rw-r--r--www/js/WizardCtrl.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js
index d60e3c76..688fa18c 100644
--- a/www/js/WizardCtrl.js
+++ b/www/js/WizardCtrl.js
@@ -348,6 +348,12 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
// this was fixed in a PR dated Oct 18
cordova.plugin.http.clearCookies();
+ if ($scope.wizard.useauth && $scope.wizard.usebasicauth) {
+ NVR.debug ("setting basic auth with "+$scope.wizard.basicuser+":"+$scope.wizard.basicpassword);
+ cordova.plugin.http.useBasicAuth($scope.wizard.basicuser, $scope.wizard.basicpassword);
+
+ }
+
}
else {
angular.forEach($cookies, function (v, k) {
@@ -355,12 +361,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
});
}
- if ($scope.wizard.useauth && $scope.wizard.usebasicauth) {
- NVR.debug ("setting basic auth with "+$scope.wizard.basicuser+":"+$scope.wizard.basicpassword);
- cordova.plugin.http.useBasicAuth($scope.wizard.basicuser, $scope.wizard.basicpassword);
-
- }
-
+
$http({