#900 use token instead of auth if avaiable

ZoneMinder · Feb 11, 2020 · 95ad6e5 · 95ad6e5
1 parent 38724fe
commit 95ad6e5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js
@@ -583,8 +583,12 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$
                 $ionicLoading.hide();
                 //$rootScope.loggedIntoZm = 1;
                 $rootScope.authSession = '';
-
-                if (succ.credentials) {
+                if (succ.access_token) {
+                  NVR.debug ('Got token, using it');
+                  $rootScope.authSession = "&token=" + succ.access_token; 
+                }
+                else if (succ.credentials) {
+                  NVR.debug ('Got auth= not token, using it');
                   $rootScope.authSession = "&" + succ.credentials;
                   if (succ.append_password == '1') {
                     $rootScope.authSession = $rootScope.authSession +