From 299a10fd77c12a2585abdd3010b93c9cd36ec863 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 13 Sep 2018 12:13:38 -0400
Subject: #704 more fixes for basic auth profiles

---
 www/js/MenuController.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'www/js/MenuController.js')

diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index 254c73c9..abe2e80c 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -50,6 +50,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
     $rootScope.alarmCount = 0;
     $rootScope.isAlarm = false;
     
+    
    
     // First lets kill current stuf
     NVRDataModel.debug ("** Resetting existing server");
@@ -62,11 +63,22 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
     NVRDataModel.debug ("**Switching to new server...");
 
+    NVRDataModel.clearZmsMultiPortSupport();
     var zmServers = NVRDataModel.getServerGroups();
     var loginData = zmServers[s];
     NVRDataModel.debug("Retrieved state for this profile:" + JSON.stringify(loginData));
     NVRDataModel.setLogin(loginData);
 
+    if (!loginData.isUseBasicAuth) {
+      $rootScope.basicAuthHeader = '';
+      $rootScope.basicAuthToken = '';
+      // console.log ("CLEARING AUTH");
+    } else {
+      $rootScope.basicAuthToken = btoa(loginData.basicAuthUser + ':' + loginData.basicAuthPassword);
+      $rootScope.basicAuthHeader = 'Basic ' + $rootScope.basicAuthToken;
+
+    }
+
     if (loginData.isUseEventServer) {
       EventServer.init();
       if ($rootScope.apnsToken && loginData.disablePush != true) {
-- 
cgit v1.2.3