Add error messages

swiss-ssi-group · Jul 6, 2023 · 2fa8d05 · 2fa8d05
1 parent 58976b6
commit 2fa8d05
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/EmployeePaycheck/Pages/Paycheck/PaycheckVerifyEmployeeS2.cshtml b/EmployeePaycheck/Pages/Paycheck/PaycheckVerifyEmployeeS2.cshtml
@@ -19,6 +19,17 @@
         <p>Generating presentation request</p>
     </div>
 
+    <div id="message-error" style="display: none">
+        <div class="alert alert-danger" role="alert">
+            <div class="text-danger h4 validation-summary-errors" data-valmsg-summary="true">
+                <ul>
+                    <li id="messageError">ERROR</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+
     <div id="message-wrapper" style="display: none">
         <div id="message-wrapper-icon" style="display: none">
             <i class="fas fa-user-check green icon-text-large"></i>

diff --git a/EmployeePaycheck/wwwroot/verifier.js b/EmployeePaycheck/wwwroot/verifier.js
@@ -37,13 +37,22 @@ function displayPresentationVerified() {
     document.getElementById("buttonVerifyEmployeePaycheck").style.display = 'block';
 }
 
+function displayError(error) {
+    console.log(error);
+    document.getElementById('message-error').style.display = "block";
+    document.getElementById('messageError').innerHTML = error;
+    document.getElementById('message-wrapper').style.display = "none";
+    document.getElementById('qrText').style.display = "none";
+    document.getElementById('qrcode').style.display = "none";  
+}
+
 window.addEventListener('load', () => {
 
     fetch('/api/verifier/presentation-request')
         .then(function (response) {
             displayInit();
             response.text()
-                .catch(error => document.getElementById('messageDisplay').innerHTML = error)
+                .catch(error => { displayError(error.message); })
                 .then(function (message) {
                     respPresentationReq = JSON.parse(message);
                     if (/Android/i.test(navigator.userAgent)) {
@@ -59,14 +68,14 @@ window.addEventListener('load', () => {
                         displayGenerateQRCode();
                         qrcode.makeCode(respPresentationReq.url);
                     }
-                }).catch(error => { console.log(error.message); })
-        }).catch(error => { console.log(error.message); })
+                }).catch(error => { displayError(error.message); })
+        }).catch(error => { displayError(error.message); })
 
     var checkStatus = setInterval(function () {
         if(respPresentationReq){
             fetch('api/verifier/presentation-response?id=' + respPresentationReq.id)
                 .then(response => response.text())
-                .catch(error => document.getElementById("messageDisplay").innerHTML = error)
+                .catch(error => { displayError(error.message); })
                 .then(response => {
                     if (response.length > 0) {
                         console.log(response)