From b487f5272f5403b6f19d150145f27b21fea74dd1 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 22 Sep 2022 10:06:52 +0200
Subject: [PATCH 1/5] Added verification when the ARVE credentials are or not
 defined

---
 caimira/apps/calculator/__init__.py       | 4 ++++
 caimira/apps/calculator/static/js/form.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
index 0c3505c2..bf25cee6 100644
--- a/caimira/apps/calculator/__init__.py
+++ b/caimira/apps/calculator/__init__.py
@@ -256,6 +256,10 @@ class ArveData(BaseRequestHandler):
         client_secret = self.settings['arve_client_secret']
         arve_api_key = self.settings['arve_api_key']
 
+        if (client_id == '<undefined>' or client_secret == '<undefined>' or arve_api_key == '<undefined>'):
+            # If the credentials are not defined, we skip the ARVE API connection
+            return self.finish('ARVE API credentials not defined.')
+
         http_client = AsyncHTTPClient()
 
         URL = 'https://arveapi.auth.eu-central-1.amazoncognito.com/oauth2/token'
diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js
index 6c0525fa..41536425 100644
--- a/caimira/apps/calculator/static/js/form.js
+++ b/caimira/apps/calculator/static/js/form.js
@@ -312,6 +312,7 @@ function show_sensors_data(url) {
       url: `${$('#url_prefix').data().calculator_prefix}/api/arve/v1/${HOTEL_ID}/${FLOOR_ID}`,
       type: 'GET',
       success: function (result) {
+        if (result.length == 0) return; // If the ARVE credentials were not defined, we don't have a valid result.
         DATA_FROM_SENSORS = result;
         result.map(room => {
           $("#sensors").append(`<option id=${room.RoomId} value=${room.RoomId}>Sensor ${room.RoomId}</option>`);

From ba956bc04594f3ebcd9652fa6deb0bcf63cf74ff Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 22 Sep 2022 10:39:30 +0200
Subject: [PATCH 2/5] Added verification when sensors are offline

---
 caimira/apps/calculator/static/js/form.js           | 7 +++++++
 caimira/apps/templates/cern/calculator.form.html.j2 | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js
index 41536425..1ab36325 100644
--- a/caimira/apps/calculator/static/js/form.js
+++ b/caimira/apps/calculator/static/js/form.js
@@ -315,8 +315,15 @@ function show_sensors_data(url) {
         if (result.length == 0) return; // If the ARVE credentials were not defined, we don't have a valid result.
         DATA_FROM_SENSORS = result;
         result.map(room => {
+          if (room['Details']['Online'] == false) return; // If the sensor is offline, it should not be added to the list.
           $("#sensors").append(`<option id=${room.RoomId} value=${room.RoomId}>Sensor ${room.RoomId}</option>`);
         });
+        if ($('#sensors > option').length == 0) {
+          $('#offline_sensors').show();
+          $('#DIVsensors_data').hide();
+          $('#arve_sensor_yes').prop('disabled', true)
+          return; // All sensors are offline
+        }
         populate_temp_hum_values(result, 0);
         if (url.searchParams.has('sensor_in_use')) {
           $("#sensors").val(url.searchParams.get('sensor_in_use'));
diff --git a/caimira/apps/templates/cern/calculator.form.html.j2 b/caimira/apps/templates/cern/calculator.form.html.j2
index ffc67bd2..7a2f418a 100644
--- a/caimira/apps/templates/cern/calculator.form.html.j2
+++ b/caimira/apps/templates/cern/calculator.form.html.j2
@@ -14,7 +14,8 @@
       <label for="arve_sensor_yes">Yes</label>
     </div>
   </div>
-  <div id="DIVsensors_data" style="display:none">
+  <p id="offline_sensors" class="red_text mb-2" style="display: none">All sensors are offline.</p>
+  <div id="DIVsensors_data" class="mb-1" style="display:none"> 
     <div class="form-group row mb-0">
       <div class="col-sm-4"><label class="col-form-label">Sensor:</label></div>
       <div class="col-sm-6">

From 93f09508acc808fa22cb6b34387051b3a3e9669b Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 22 Sep 2022 15:40:05 +0200
Subject: [PATCH 3/5] handled 401 errors when credentials are not provided

---
 caimira/apps/calculator/__init__.py       | 4 ++--
 caimira/apps/calculator/static/js/form.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
index bf25cee6..a2de946f 100644
--- a/caimira/apps/calculator/__init__.py
+++ b/caimira/apps/calculator/__init__.py
@@ -258,8 +258,8 @@ class ArveData(BaseRequestHandler):
 
         if (client_id == '<undefined>' or client_secret == '<undefined>' or arve_api_key == '<undefined>'):
             # If the credentials are not defined, we skip the ARVE API connection
-            return self.finish('ARVE API credentials not defined.')
-
+            return self.send_error(401)
+            
         http_client = AsyncHTTPClient()
 
         URL = 'https://arveapi.auth.eu-central-1.amazoncognito.com/oauth2/token'
diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js
index 1ab36325..cfd23c64 100644
--- a/caimira/apps/calculator/static/js/form.js
+++ b/caimira/apps/calculator/static/js/form.js
@@ -312,7 +312,6 @@ function show_sensors_data(url) {
       url: `${$('#url_prefix').data().calculator_prefix}/api/arve/v1/${HOTEL_ID}/${FLOOR_ID}`,
       type: 'GET',
       success: function (result) {
-        if (result.length == 0) return; // If the ARVE credentials were not defined, we don't have a valid result.
         DATA_FROM_SENSORS = result;
         result.map(room => {
           if (room['Details']['Online'] == false) return; // If the sensor is offline, it should not be added to the list.
@@ -332,9 +331,10 @@ function show_sensors_data(url) {
           }));
         }
       },
-      error: function() {
-        alert('Authentication Error - Something went wrong during the authentication process.');
-      },
+      error: function(_, _, errorThrown) {
+        if (errorThrown != 'Unauthorized') alert(errorThrown);
+        else alert('Unauthorized - Something went wrong during the ARVE API authentication process.');
+      }
     });
   }
 };

From 3ff35f849b5b784801806e18b2b9498b414bbd59 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Wed, 28 Sep 2022 11:18:34 +0200
Subject: [PATCH 4/5] added DOM element for ARVE API authentication error

---
 caimira/apps/calculator/static/js/form.js           | 5 +++--
 caimira/apps/templates/cern/calculator.form.html.j2 | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js
index cfd23c64..45656c78 100644
--- a/caimira/apps/calculator/static/js/form.js
+++ b/caimira/apps/calculator/static/js/form.js
@@ -332,8 +332,9 @@ function show_sensors_data(url) {
         }
       },
       error: function(_, _, errorThrown) {
-        if (errorThrown != 'Unauthorized') alert(errorThrown);
-        else alert('Unauthorized - Something went wrong during the ARVE API authentication process.');
+        $("#arve_api_error_message").val(errorThrown).show();
+        $('#DIVsensors_data').hide();
+        $('#arve_sensor_yes').prop('disabled', true)
       }
     });
   }
diff --git a/caimira/apps/templates/cern/calculator.form.html.j2 b/caimira/apps/templates/cern/calculator.form.html.j2
index 7a2f418a..4e5ae90a 100644
--- a/caimira/apps/templates/cern/calculator.form.html.j2
+++ b/caimira/apps/templates/cern/calculator.form.html.j2
@@ -15,7 +15,8 @@
     </div>
   </div>
   <p id="offline_sensors" class="red_text mb-2" style="display: none">All sensors are offline.</p>
-  <div id="DIVsensors_data" class="mb-1" style="display:none"> 
+  <p id="arve_api_error_message" class="red_text mb-2" style="display:none; max-width: 85%;">Unauthorized - Something went wrong during the ARVE API authentication process.</p> 
+  <div id="DIVsensors_data" class="mb-1" style="display:none">
     <div class="form-group row mb-0">
       <div class="col-sm-4"><label class="col-form-label">Sensor:</label></div>
       <div class="col-sm-6">

From 7dd45aa2bb85bac534b46db267a18b9293cf6f28 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Wed, 28 Sep 2022 11:27:11 +0200
Subject: [PATCH 5/5] re-defined the environment variables to be none instead
 of <undefined>

---
 caimira/apps/calculator/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py
index a2de946f..fe1898eb 100644
--- a/caimira/apps/calculator/__init__.py
+++ b/caimira/apps/calculator/__init__.py
@@ -256,7 +256,7 @@ class ArveData(BaseRequestHandler):
         client_secret = self.settings['arve_client_secret']
         arve_api_key = self.settings['arve_api_key']
 
-        if (client_id == '<undefined>' or client_secret == '<undefined>' or arve_api_key == '<undefined>'):
+        if (client_id == None or client_secret == None or arve_api_key == None):
             # If the credentials are not defined, we skip the ARVE API connection
             return self.send_error(401)
             
@@ -349,9 +349,9 @@ def make_app(
         # COOKIE_SECRET being undefined will result in no login information being
         # presented to the user.
         cookie_secret=os.environ.get('COOKIE_SECRET', '<undefined>'),
-        arve_client_id=os.environ.get('ARVE_CLIENT_ID', '<undefined>'),
-        arve_client_secret=os.environ.get('ARVE_CLIENT_SECRET', '<undefined>'),
-        arve_api_key=os.environ.get('ARVE_API_KEY', '<undefined>'),
+        arve_client_id=os.environ.get('ARVE_CLIENT_ID', None),
+        arve_client_secret=os.environ.get('ARVE_CLIENT_SECRET', None),
+        arve_api_key=os.environ.get('ARVE_API_KEY', None),
 
         # Process parallelism controls. There is a balance between serving a single report
         # requests quickly or serving multiple requests concurrently.