v1.1.0.10 (#136)

* Preferred MFA: field auth_type -> type  + biometric_type

gradle.properties

@@ -1 +1 @@
-currentVersion=1.1.0.9
+currentVersion=1.1.0.10

src/main/java/org/secureauth/sarestapi/data/PreferredMFA.java

@@ -10,21 +10,23 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class PreferredMFA {
+
+	@JsonProperty("factor_id")
+	private String factorId;
 
 	@JsonProperty("type")
 	private String type;
 
-	@JsonProperty("mode")
-	private String mode;
-
-	@JsonProperty("available_choosen_mode")
-	private String availableChoosenMode;
-
-	@JsonProperty("factor_id")
-	private String factorId;
+	@JsonProperty("biometric_type")
+	private String biometricType;
 
-	@JsonProperty("auth_type")
-	private String authType;
+	public String getFactorId() {
+		return factorId;
+	}
+
+	public void setFactorId(String factorId) {
+		this.factorId = factorId;
+	}
 
 	public String getType() {
 		return type;
@@ -34,36 +36,12 @@ public void setType(String type) {
 		this.type = type;
 	}
 
-	public String getMode() {
-		return mode;
-	}
-
-	public void setMode(String mode) {
-		this.mode = mode;
-	}
-
-	public String getAvailableChoosenMode() {
-		return availableChoosenMode;
-	}
-
-	public void setAvailableChoosenMode(String availableChoosenMode) {
-		this.availableChoosenMode = availableChoosenMode;
-	}
-
-	public String getFactorId() {
-		return factorId;
-	}
-
-	public void setFactorId(String factorId) {
-		this.factorId = factorId;
-	}
-
-	public String getAuthType() {
-		return authType;
+	public String getBiometricType() {
+		return biometricType;
 	}
 
-	public void setAuthType(String authType) {
-		this.authType = authType;
+	public void setBiometricType(String biometricType) {
+		this.biometricType = biometricType;
 	}
 
 	@Override

src/main/java/org/secureauth/sarestapi/data/Requests/PushToAcceptRequestsFactory.java

@@ -1,15 +1,14 @@
 package org.secureauth.sarestapi.data.Requests;
 
 import org.secureauth.sarestapi.data.PushAcceptDetails;
+import org.secureauth.sarestapi.resources.Resource;
 
 public class PushToAcceptRequestsFactory {
 
-    private static final String BIOMETRIC_TO_ACCEPT = "push_accept_biometric";
-
     public static PushToAcceptBiometricsRequest createPushToAcceptBiometricRequest(String biometricType, String userId, String factorId, String endUserIP, String clientCompany, String clientDescription) {
         PushToAcceptBiometricsRequest req = new PushToAcceptBiometricsRequest();
         req.setUser_id(userId);
-        req.setType(BIOMETRIC_TO_ACCEPT);
+        req.setType(Resource.PUSH_ACCEPT_BIOMETRIC);
         req.setFactor_id(factorId);
         req.setBiometricType( biometricType );
         PushAcceptDetails pad = new PushAcceptDetails();

src/main/java/org/secureauth/sarestapi/data/Response/FactorsResponse.java

@@ -27,7 +27,7 @@ public class FactorsResponse extends BaseResponse {
     private ArrayList<Factors> factors = new ArrayList<Factors>();
 
 	  @JsonProperty("preferred_mfa")
-    public PreferredMFA preferred_mfa = new PreferredMFA();
+    public PreferredMFA preferredMfa = new PreferredMFA();
 
     public ArrayList<Factors> getFactors() {
         return factors;

src/main/java/org/secureauth/sarestapi/resources/Resource.java

@@ -113,5 +113,10 @@ public class Resource {
     public static final String KBA = "kba";
     public static final String CALL = "call";
     public static final String HELP_DESK = "help_desk";
+
+
+    public static final String PUSH_ACCEPT_BIOMETRIC = "push_accept_biometric";
+    public static final String FINGERPRINT = "fingerprint";
+    public static final String FACE = "face";
 
 }