fix(jans-fido2): #9248

JanssenProject · Sep 25, 2024 · db48843 · db48843
1 parent d8628e8
commit db48843
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 37 deletions.
diff --git a/jans-orm/model/src/main/java/io/jans/orm/model/fido2/Fido2AuthenticationData.java b/jans-orm/model/src/main/java/io/jans/orm/model/fido2/Fido2AuthenticationData.java
@@ -15,7 +15,7 @@ public class Fido2AuthenticationData extends Fido2Data {
 
     private String id;
     private String username;
-    private String domain;
+    private String origin;
     private String userId;
     private String challenge;
 
@@ -26,7 +26,7 @@ public class Fido2AuthenticationData extends Fido2Data {
 
     private Fido2AuthenticationStatus status;
 
-    private String applicationId;
+    private String rpId;
 
     public String getId() {
         return id;
@@ -44,15 +44,25 @@ public void setUsername(String username) {
         this.username = username;
     }
 
-    public String getDomain() {
-        return domain;
-    }
+
 
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
+    public String getOrigin() {
+		return origin;
+	}
+
+	public void setOrigin(String origin) {
+		this.origin = origin;
+	}
+
+	public String getRpId() {
+		return rpId;
+	}
 
-    public String getUserId() {
+	public void setRpId(String rpId) {
+		this.rpId = rpId;
+	}
+
+	public String getUserId() {
         return userId;
     }
 
@@ -100,20 +110,16 @@ public void setStatus(Fido2AuthenticationStatus status) {
         this.status = status;
     }
 
-	public String getApplicationId() {
-		return applicationId;
-	}
-
-	public void setApplicationId(String applicationId) {
-		this.applicationId = applicationId;
-	}
-
 	@Override
 	public String toString() {
-		return "Fido2AuthenticationData [id=" + id + ", username=" + username + ", domain=" + domain + ", userId="
+		return "Fido2AuthenticationData [id=" + id + ", username=" + username + ", origin=" + origin + ", userId="
 				+ userId + ", challenge=" + challenge + ", assertionRequest=" + assertionRequest
 				+ ", assertionResponse=" + assertionResponse + ", userVerificationOption=" + userVerificationOption
-				+ ", status=" + status + ", applicationId=" + applicationId + "]";
+				+ ", status=" + status + ", rpId=" + rpId + "]";
 	}
 
+
+
+
+
 }
diff --git a/jans-orm/model/src/main/java/io/jans/orm/model/fido2/Fido2RegistrationData.java b/jans-orm/model/src/main/java/io/jans/orm/model/fido2/Fido2RegistrationData.java
@@ -14,7 +14,7 @@ public class Fido2RegistrationData extends Fido2Data {
     private static final long serialVersionUID = 4599467930864459334L;
 
     private String username;
-    private String domain;
+    private String origin;
     private String userId;
     private String challenge;
 
@@ -34,7 +34,7 @@ public class Fido2RegistrationData extends Fido2Data {
 
     private int signatureAlgorithm;
 
-    private String applicationId;
+    private String rpId;
     //Credential backup eligibility and current backup state is conveyed by the backupStateFlag and backupEligibilityFlag flags in the authenticator data. See https://w3c.github.io/webauthn/#sctn-authenticator-data
     private boolean backupStateFlag;
 
@@ -48,13 +48,7 @@ public void setUsername(String username) {
         this.username = username;
     }
 
-    public String getDomain() {
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
+
 
     public String getUserId() {
         return userId;
@@ -144,13 +138,7 @@ public void setSignatureAlgorithm(int signatureAlgorithm) {
         this.signatureAlgorithm = signatureAlgorithm;
     }
 
-    public String getApplicationId() {
-		return applicationId;
-	}
-
-	public void setApplicationId(String applicationId) {
-		this.applicationId = applicationId;
-	}
+
 
     public boolean getBackupStateFlag() {
         return this.backupStateFlag;
@@ -169,10 +157,10 @@ public void setBackupEligibilityFlag(boolean backupEligibilityFlag) {
     }
 	@Override
 	public String toString() {
-		return "Fido2RegistrationData [username=" + username + ", domain=" + domain + ", userId=" + userId + ", challenge=" + challenge
+		return "Fido2RegistrationData [username=" + username + ", origin=" + origin + ", userId=" + userId + ", challenge=" + challenge
 				+ ", attestationRequest=" + attestationRequest + ", attestationResponse=" + attestationResponse
 				+ ", uncompressedECPoint=" + uncompressedECPoint + ", publicKeyId=" + publicKeyId + ", type=" + type + ", status=" + status
 				+ ", counter=" + counter + ", attestationType=" + attestationType + ", signatureAlgorithm=" + signatureAlgorithm
-				+ ", applicationId=" + applicationId + "]";
+				+ ", rpId=" + rpId + "]";
 	}
 }