49 translate the modes (#50)

* add modes translation

* Update the tests

* Change Object.equals to string.equals

Author: lukasmatusiewicz

pom.xml

@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/org/privacyidea/JSONParser.java

@@ -12,6 +12,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static org.privacyidea.PIConstants.ASSERTIONCLIENTEXTENSIONS;
 import static org.privacyidea.PIConstants.ATTRIBUTES;
@@ -85,7 +86,7 @@ public String formatJson(String json)
         }
         catch (JsonSyntaxException e)
         {
-            privacyIDEA.error(e);
+            privacyIDEA.error(e.getMessage());
             return json;
         }
 
@@ -185,7 +186,21 @@ public PIResponse parsePIResponse(String serverResponse)
         if (detailElem != null && !detailElem.isJsonNull())
         {
             JsonObject detail = obj.getAsJsonObject(DETAIL);
-            response.preferredClientMode = getString(detail, PREFERRED_CLIENT_MODE);
+
+            // Translate some preferred client mode names
+            String modeFromResponse = getString(detail, PREFERRED_CLIENT_MODE);
+            if ("poll".equals(modeFromResponse))
+            {
+                response.preferredClientMode = "push";
+            }
+            else if ("interactive".equals(modeFromResponse))
+            {
+                response.preferredClientMode = "otp";
+            }
+            else
+            {
+                response.preferredClientMode = modeFromResponse;
+            }
             response.message = getString(detail, MESSAGE);
             response.image = getString(detail, IMAGE);
             response.serial = getString(detail, SERIAL);

src/test/java/org/privacyidea/TestPollTransaction.java

@@ -54,7 +54,7 @@ public void testPushSynchronous() throws InterruptedException
         mockServer.when(HttpRequest.request().withMethod("POST").withPath("/validate/check")
                                    .withBody("user=" + username + "&pass=")).respond(
                 HttpResponse.response().withContentType(MediaType.APPLICATION_JSON).withBody(
-                                    "{\n" + "  \"detail\": {\n" + "    \"attributes\": null,\n" +
+                                    "{\n" + "  \"detail\": {\n" + "    \"preferred_client_mode\": \"poll\",\n" + "    \"attributes\": null,\n" +
                                     "    \"message\": \"Bitte geben Sie einen OTP-Wert ein: , Please confirm the authentication on your mobile device!\",\n" +
                                     "    \"messages\": [\n" + "      \"Bitte geben Sie einen OTP-Wert ein: \",\n" +
                                     "      \"Please confirm the authentication on your mobile device!\"\n" + "    ],\n" +
@@ -90,6 +90,8 @@ public void testPushSynchronous() throws InterruptedException
         assertEquals("", hotpChallenge.getImage());
         assertTrue(hotpChallenge.getAttributes().isEmpty());
 
+        assertEquals("push", initialResponse.preferredClientMode);
+
         Challenge pushChallenge = challenges.stream().filter(c -> c.getSerial().equals("PIPU0001F75E")).findFirst()
                                             .orElse(null);
         assertNotNull(pushChallenge);

src/test/java/org/privacyidea/TestTriggerChallenge.java

@@ -48,7 +48,7 @@ public void setup()
     @Test
     public void testTriggerChallengeSuccess()
     {
-        String response = "{\"detail\":{" + "\"attributes\":null," + "\"message\":\"BittegebenSieeinenOTP-Wertein:\"," +
+        String response = "{\"detail\":{" + "\"preferred_client_mode\":\"interactive\"," + "\"attributes\":null," + "\"message\":\"BittegebenSieeinenOTP-Wertein:\"," +
                           "\"messages\":[\"BittegebenSieeinenOTP-Wertein:\"]," + "\"multi_challenge\":[{" +
                           "\"attributes\":null," + "\"message\":\"BittegebenSieeinenOTP-Wertein:\"," +
                           "\"serial\":\"TOTP00021198\"," + "\"transaction_id\":\"16734787285577957577\"," +
@@ -91,6 +91,7 @@ public void testTriggerChallengeSuccess()
         String username = "testuser";
         PIResponse responseTriggerChallenge = privacyIDEA.triggerChallenges(username);
 
+        assertEquals("otp", responseTriggerChallenge.preferredClientMode);
         assertEquals(1, responseTriggerChallenge.id);
         assertEquals("BittegebenSieeinenOTP-Wertein:", responseTriggerChallenge.message);
         assertEquals("2.0", responseTriggerChallenge.jsonRPCVersion);