Add preferred client mode (#44)

* add preferred client mode to PIResponse

* add preferred client mode to test

Author: lukasmatusiewicz

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

@@ -30,6 +30,7 @@
 import static org.privacyidea.PIConstants.MESSAGES;
 import static org.privacyidea.PIConstants.MULTI_CHALLENGE;
 import static org.privacyidea.PIConstants.OTPLEN;
+import static org.privacyidea.PIConstants.PREFERRED_CLIENT_MODE;
 import static org.privacyidea.PIConstants.REALMS;
 import static org.privacyidea.PIConstants.RESULT;
 import static org.privacyidea.PIConstants.SERIAL;
@@ -182,6 +183,7 @@ public PIResponse parsePIResponse(String serverResponse)
         if (detailElem != null && !detailElem.isJsonNull())
         {
             JsonObject detail = obj.getAsJsonObject(DETAIL);
+            response.preferredClientMode = getString(detail, PREFERRED_CLIENT_MODE);
             response.message = getString(detail, MESSAGE);
             response.serial = getString(detail, SERIAL);
             response.transactionID = getString(detail, TRANSACTION_ID);

src/main/java/org/privacyidea/PIConstants.java

@@ -62,6 +62,7 @@ private PIConstants()
     public static final String VALUE = "value";
     public static final String TOKENS = "tokens";
     public static final String TOKEN = "token";
+    public static final String PREFERRED_CLIENT_MODE = "preferred_client_mode";
     public static final String MESSAGE = "message";
     public static final String MESSAGES = "messages";
     public static final String MULTI_CHALLENGE = "multi_challenge";

src/main/java/org/privacyidea/PIResponse.java

@@ -32,6 +32,7 @@
 public class PIResponse
 {
     public String message = "";
+    public String preferredClientMode = "";
     public List<String> messages = new ArrayList<>();
     public List<Challenge> multichallenge = new ArrayList<>();
     public String transactionID = "";

src/test/java/org/privacyidea/TestWebAuthn.java

@@ -103,7 +103,7 @@ public void testTriggerWebAuthn()
                                  "            \"userVerification\": \"preferred\"\n" + "          }\n";
 
         String responseBody =
-                "{\n" + "  \"detail\": {\n" + "    \"attributes\": {\n" + "      \"hideResponseInput\": true,\n" +
+                "{\n" + "  \"detail\": {\n" + "    \"preferred_client_mode\": \"webauthn\",\n" + "    \"attributes\": {\n" + "      \"hideResponseInput\": true,\n" +
                 "      \"img\": \"static/img/FIDO-U2F-Security-Key-444x444.png\",\n" +
                 "      \"webAuthnSignRequest\": {\n" + "        \"allowCredentials\": [\n" + "          {\n" +
                 "            \"id\": \"83De8z_CNqogB6aCyKs6dWIqwpOpzVoNaJ74lgcpuYN7l-95QsD3z-qqPADqsFlPwBXCMqEPssq75kqHCMQHDA\",\n" +
@@ -142,6 +142,7 @@ public void testTriggerWebAuthn()
                                           .findFirst();
         assertTrue(opt.isPresent());
         assertEquals(AuthenticationStatus.CHALLENGE, response.authentication);
+        assertEquals("webauthn", response.preferredClientMode);
         Challenge a = opt.get();
         if (a instanceof WebAuthn)
         {