NFC-118 Switch request/response JSON fields to camelCase and unify mobile auth error layout

Signed-off-by: Sander Kondratjev <sander.kondratjev@nortal.com>

Author: SanderKondratjevNortal

example/src/main/java/eu/webeid/example/security/WebEidMobileAuthInitFilter.java

@@ -23,11 +23,8 @@
 package eu.webeid.example.security;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import eu.webeid.example.config.WebEidMobileProperties;
 import eu.webeid.security.challenge.ChallengeNonceGenerator;
 import jakarta.servlet.FilterChain;
@@ -97,15 +94,13 @@ private String getAuthUri(String encodedPayload) {
         return builder.fragment(encodedPayload).toUriString();
     }
 
-    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     record AuthPayload(
         String challenge,
         String loginUri,
         Boolean getSigningCertificate) {
     }
 
-    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-    record AuthUri(@JsonProperty("auth_uri") String authUri) {
+    record AuthUri(String authUri) {
     }
 }

example/src/main/java/eu/webeid/example/service/MobileSigningService.java

@@ -25,8 +25,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import eu.webeid.example.config.WebEidMobileProperties;
 import eu.webeid.example.security.WebEidAuthentication;
 import eu.webeid.example.service.dto.CertificateDTO;
@@ -131,13 +129,11 @@ private List<SignatureAlgorithmDTO> mapSupportedAlgorithms(List<SupportedSignatu
         }).toList();
     }
 
-    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     public record MobileInitRequest(
         String requestUri
     ) {
     }
 
-    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
     @JsonInclude(JsonInclude.Include.NON_NULL)
     record RequestObject(
         String responseUri,

example/src/main/java/eu/webeid/example/service/SigningService.java

@@ -116,7 +116,7 @@ public DigestDTO prepareContainer(CertificateDTO certificateDTO, WebEidAuthentic
 
         final DataToSign dataToSign = SignatureBuilder
                 .aSignature(containerToSign)
-                .withSignatureProfile(SignatureProfile.LT) // AIA OCSP is supported for signatures with LT or LTA profile.
+                .withSignatureProfile(SignatureProfile.T) // AIA OCSP is supported for signatures with LT or LTA profile.
                 .withSigningCertificate(certificate)
                 .withSignatureDigestAlgorithm(signatureDigestAlgorithm)
                 .buildDataToSign();

example/src/main/resources/templates/index.html

@@ -527,8 +527,8 @@ <h4 class="accordion-header" id="headingDocumentationMobile">
                     });
 
                     await checkHttpError(resp);
-                    const { auth_uri } = await resp.json();
-                    window.location.href = auth_uri;
+                    const { authUri } = await resp.json();
+                    window.location.href = authUri;
                 } catch (error) {
                     showErrorMessage(error);
                     throw error;

example/src/main/resources/templates/webeid-callback.html

@@ -57,8 +57,8 @@ <h2>Completing signing…</h2>
 
                 const result = await response.json();
                 if (endpoint.endsWith("/certificate")) {
-                    const { request_uri } = result;
-                    window.location.replace(request_uri);
+                    const { requestUri } = result;
+                    window.location.replace(requestUri);
                     return;
                 }
 

example/src/main/resources/templates/webeid-login.html

@@ -2,16 +2,26 @@
 <html lang="en">
     <head>
         <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Signing you in…</title>
         <link rel="stylesheet" href="/css/bootstrap.min.css" />
         <link rel="stylesheet" href="/css/main.css" />
     </head>
-    <body>
+    <body class="loading-page">
+        <div id="spinner-message">
+            <h2>Signing you in…</h2>
+            <div class="spinner"></div>
+        </div>
+
         <div id="error-message" class="alert alert-danger" style="display: none" role="alert">
             <div class="message"></div>
             <pre class="details"></pre>
         </div>
 
+        <p class="text-center p-4" style="display: none" id="error-actions">
+            <button id="back-button" class="btn btn-primary">Back</button>
+        </p>
+
         <script type="module" th:inline="javascript">
             import { showErrorMessage, checkHttpError } from "/js/errors.js";
             import { parsePayload } from "/js/payload.js";
@@ -20,7 +30,7 @@
             // top-level await is not supported in some mobile browsers/WebViews.
             (async function () {
                 const payload = parsePayload("Authentication");
-                const authToken = payload["auth_token"];
+                const authToken = payload["authToken"];
                 const response = await fetch(/*[[${loginProcessingPath}]]*/, {
                     method: "POST",
                     headers: {
@@ -36,6 +46,14 @@
             })().catch((error) => {
                 console.error(error);
                 showErrorMessage(error);
+                document.getElementById("spinner-message").style.display = "none";
+
+                const actions = document.getElementById("error-actions");
+                actions.style.display = "block";
+
+                document.getElementById("back-button").addEventListener("click", () => {
+                    window.location.replace("/");
+                });
             });
         </script>
     </body>

example/src/main/resources/templates/welcome.html

@@ -95,8 +95,8 @@ <h2 class="adding-signature">Digital signing</h2>
                         });
 
                         await checkHttpError(initMobileSignResponse);
-                        const { request_uri } = await initMobileSignResponse.json();
-                        window.location.href = request_uri;
+                        const { requestUri } = await initMobileSignResponse.json();
+                        window.location.href = requestUri;
                     } else {
                         const { certificate, supportedSignatureAlgorithms } = await webeid.getSigningCertificate({
                             lang