consider container type in PIResponse

Author: nilsbehlen

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

@@ -37,10 +37,11 @@ public class PIConstants
     public static final String HEADER_AUTHORIZATION = "Authorization";
     public static final String HEADER_USER_AGENT = "User-Agent";
 
-    // TOKEN TYPES
+    // TOKEN TYPES / CONTAINER
     public static final String TOKEN_TYPE_PUSH = "push";
     public static final String TOKEN_TYPE_WEBAUTHN = "webauthn";
     public static final String TOKEN_TYPE_PASSKEY = "passkey";
+    public static final String CONTAINER_TYPE_SMARTPHONE = "smartphone";
 
     // JSON KEYS
     public static final String USERNAME = "username";

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

@@ -24,7 +24,9 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static org.privacyidea.PIConstants.*;
+import static org.privacyidea.PIConstants.CONTAINER_TYPE_SMARTPHONE;
+import static org.privacyidea.PIConstants.TOKEN_TYPE_PUSH;
+import static org.privacyidea.PIConstants.TOKEN_TYPE_WEBAUTHN;
 
 /**
  * This class parses the JSON response of privacyIDEA into a POJO for easier access.
@@ -52,7 +54,6 @@ public class PIResponse
     public PIError error = null;
     // Passkey content is json string and can be passed to the browser as is
     public String passkeyChallenge = "";
-    public String passkeyMessage = "";
     public String passkeyRegistration = "";
     public String username = "";
     public String enrollmentLink = "";
@@ -79,7 +80,11 @@ public boolean authenticationSuccessful()
      */
     public boolean pushAvailable()
     {
-        return multiChallenge.stream().anyMatch(c -> TOKEN_TYPE_PUSH.equals(c.getType()));
+        return multiChallenge.stream().anyMatch(c -> isPushOrSmartphoneContainer(c.getType()));
+    }
+
+    private boolean isPushOrSmartphoneContainer(String type) {
+        return TOKEN_TYPE_PUSH.equals(type) || CONTAINER_TYPE_SMARTPHONE.equals(type);
     }
 
     /**
@@ -89,14 +94,14 @@ public boolean pushAvailable()
      */
     public String pushMessage()
     {
-        return reduceChallengeMessagesWhere(c -> TOKEN_TYPE_PUSH.equals(c.getType()));
+        return reduceChallengeMessagesWhere(c -> isPushOrSmartphoneContainer(c.getType()));
     }
 
     public String otpTransactionId()
     {
         for (Challenge challenge : multiChallenge)
         {
-            if (!TOKEN_TYPE_PUSH.equals(challenge.getType()) && !TOKEN_TYPE_WEBAUTHN.equals(challenge.getType()))
+            if (!isPushOrSmartphoneContainer(challenge.getType()) && !TOKEN_TYPE_WEBAUTHN.equals(challenge.getType()))
             {
                 return challenge.transactionID;
             }
@@ -107,7 +112,7 @@ public String otpTransactionId()
     public String pushTransactionId() {
         for (Challenge challenge : multiChallenge)
         {
-            if (TOKEN_TYPE_PUSH.equals(challenge.getType()))
+            if (isPushOrSmartphoneContainer(challenge.getType()))
             {
                 return challenge.transactionID;
             }
@@ -122,7 +127,7 @@ public String pushTransactionId() {
      */
     public String otpMessage()
     {
-        return reduceChallengeMessagesWhere(c -> !(TOKEN_TYPE_PUSH.equals(c.getType())));
+        return reduceChallengeMessagesWhere(c -> !(isPushOrSmartphoneContainer(c.getType())));
     }
 
     private String reduceChallengeMessagesWhere(Predicate<Challenge> predicate)