Skip to content

Commit

Permalink
1.1.0.6 release (#125)
Browse files Browse the repository at this point in the history
* Fixing javadoc compilation warnings and errors

* Updated logger versions (#120)

* Updated logger versions (#122)

* Updated logger versions (#123)

* Rad-741: Fix factors response for latest IdP Release (#124)

* Updated logger versions

* Added preferredMFA to factorsResponse

* Version UP
  • Loading branch information
mschaab-SA authored Jun 21, 2023
1 parent eec67f6 commit 3bc760f
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ dependencies {
implementation('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.7.3')
implementation('org.glassfish.jersey.core:jersey-client:2.5.1')
implementation('commons-codec:commons-codec:1.10')
implementation('org.slf4j:slf4j-api:1.7.28')
implementation('org.slf4j:slf4j-api:1.7.36')
implementation('javax.xml.bind:jaxb-api:2.3.0')
implementation('com.sun.xml.bind:jaxb-core:2.3.0')
implementation('com.sun.xml.bind:jaxb-impl:2.3.0')
implementation('javax.activation:activation:1.1')

implementation 'org.slf4j:slf4j-api:1.7.28'

implementation 'org.apache.logging.log4j:log4j-core:2.17.1'
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.17.1'
implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
annotationProcessor 'org.apache.logging.log4j:log4j-core:2.18.0'

testImplementation 'junit:junit:4.12'
testImplementation 'com.google.guava:guava:11.0.2'
Expand All @@ -67,7 +67,7 @@ dependencies {
testImplementation 'org.mockito:mockito-core:2.28.2'
testImplementation "com.github.tomakehurst:wiremock-jre8:2.21.0"

testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1'
testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'

}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
currentVersion=1.1.0.4
currentVersion=1.1.0.6
34 changes: 34 additions & 0 deletions src/main/java/org/secureauth/sarestapi/data/PreferredMFA.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package org.secureauth.sarestapi.data;

import org.secureauth.sarestapi.util.JSONUtil;

public class PreferredMFA {

private String type;
private String mode;
private String available_choosen_mode;

public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getMode() {
return mode;
}
public void setMode(String mode) {
this.mode = mode;
}
public String getAvailable_choosen_mode() {
return available_choosen_mode;
}
public void setAvailable_choosen_mode(String available_choosen_mode) {
this.available_choosen_mode = available_choosen_mode;
}
@Override
public String toString(){
return JSONUtil.convertObjectToJSON(this);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
import com.fasterxml.jackson.annotation.JsonInclude;
import org.secureauth.sarestapi.data.Factors;
import org.secureauth.sarestapi.data.PreferredMFA;
import org.secureauth.sarestapi.util.JSONUtil;


Expand All @@ -19,14 +20,19 @@
public class FactorsResponse extends BaseResponse{

private ArrayList<Factors> factors = new ArrayList<Factors>();

public PreferredMFA preferred_mfa = new PreferredMFA();
public ArrayList<Factors> getFactors() {
return factors;
}

public void setFactors(ArrayList<Factors> factors) {
this.factors = factors;
}
public PreferredMFA getPreferred_mfa() {
return preferred_mfa;
}
public void setPreferred_mfa(PreferredMFA preferred_mfa) {
this.preferred_mfa = preferred_mfa;
}

@Override
public String toString(){
Expand Down

0 comments on commit 3bc760f

Please sign in to comment.