From 4073fd05ffb3e82b11b244e82f4d2f7aae953b55 Mon Sep 17 00:00:00 2001 From: Afra Hussaindeen Date: Mon, 28 Oct 2024 19:27:38 +0530 Subject: [PATCH 1/3] Remove support for saving idvp logo url per idvp instance. --- .../provider/v1/model/IdVProviderRequest.java | 23 +------------------ .../provider/v1/core/IdVProviderService.java | 2 -- .../src/main/resources/idv-provider.yaml | 3 --- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java index 3d27c24daf..8f72097d52 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java @@ -39,7 +39,6 @@ public class IdVProviderRequest { private String type; private String name; private String description; - private String image; private Boolean isEnabled; private List claims = null; @@ -104,24 +103,6 @@ public void setDescription(String description) { this.description = description; } - /** - **/ - public IdVProviderRequest image(String image) { - - this.image = image; - return this; - } - - @ApiModelProperty(example = "onfido-logo-url", value = "") - @JsonProperty("image") - @Valid - public String getImage() { - return image; - } - public void setImage(String image) { - this.image = image; - } - /** **/ public IdVProviderRequest isEnabled(Boolean isEnabled) { @@ -209,7 +190,6 @@ public boolean equals(java.lang.Object o) { return Objects.equals(this.type, idVProviderRequest.type) && Objects.equals(this.name, idVProviderRequest.name) && Objects.equals(this.description, idVProviderRequest.description) && - Objects.equals(this.image, idVProviderRequest.image) && Objects.equals(this.isEnabled, idVProviderRequest.isEnabled) && Objects.equals(this.claims, idVProviderRequest.claims) && Objects.equals(this.configProperties, idVProviderRequest.configProperties); @@ -217,7 +197,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(type, name, description, image, isEnabled, claims, configProperties); + return Objects.hash(type, name, description, isEnabled, claims, configProperties); } @Override @@ -229,7 +209,6 @@ public String toString() { sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); - sb.append(" image: ").append(toIndentedString(image)).append("\n"); sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n"); sb.append(" claims: ").append(toIndentedString(claims)).append("\n"); sb.append(" configProperties: ").append(toIndentedString(configProperties)).append("\n"); diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/java/org/wso2/carbon/identity/api/server/idv/provider/v1/core/IdVProviderService.java b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/java/org/wso2/carbon/identity/api/server/idv/provider/v1/core/IdVProviderService.java index 294085e73b..8915672eb4 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/java/org/wso2/carbon/identity/api/server/idv/provider/v1/core/IdVProviderService.java +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/java/org/wso2/carbon/identity/api/server/idv/provider/v1/core/IdVProviderService.java @@ -256,7 +256,6 @@ private IdVProvider createIdVProvider(IdVProviderRequest idVProviderRequest) { idVProvider.setIdVProviderName(idVProviderRequest.getName()); idVProvider.setIdVProviderDescription(idVProviderRequest.getDescription()); idVProvider.setEnabled(idVProviderRequest.getIsEnabled()); - idVProvider.setImageUrl(idVProviderRequest.getImage()); if (idVProviderRequest.getClaims() != null) { idVProvider.setClaimMappings(getClaimMap(idVProviderRequest.getClaims())); } @@ -277,7 +276,6 @@ private IdVProvider createUpdatedIdVProvider(IdVProvider oldIdVProvider, idVProvider.setIdVProviderName(idVProviderRequest.getName()); idVProvider.setIdVProviderDescription(idVProviderRequest.getDescription()); idVProvider.setEnabled(idVProviderRequest.getIsEnabled()); - idVProvider.setImageUrl(idVProviderRequest.getImage()); if (idVProviderRequest.getClaims() != null) { idVProvider.setClaimMappings(getClaimMap(idVProviderRequest.getClaims())); } diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml index c8ea63eb70..cec5a4c8b2 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml @@ -409,9 +409,6 @@ components: description: type: string example: identity verification provider - image: - type: string - example: "onfido-logo-url" isEnabled: type: boolean example: true From e9b7e9e19d804ed4feb255a7cecd3c717f401784 Mon Sep 17 00:00:00 2001 From: Afra Hussaindeen Date: Sat, 23 Nov 2024 10:56:57 +0530 Subject: [PATCH 2/3] Restore image in request body and make it optional --- .../provider/v1/model/IdVProviderRequest.java | 23 ++++++++++++++++++- .../src/main/resources/idv-provider.yaml | 3 +++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java index 8f72097d52..3d27c24daf 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/gen/java/org/wso2/carbon/identity/api/server/idv/provider/v1/model/IdVProviderRequest.java @@ -39,6 +39,7 @@ public class IdVProviderRequest { private String type; private String name; private String description; + private String image; private Boolean isEnabled; private List claims = null; @@ -103,6 +104,24 @@ public void setDescription(String description) { this.description = description; } + /** + **/ + public IdVProviderRequest image(String image) { + + this.image = image; + return this; + } + + @ApiModelProperty(example = "onfido-logo-url", value = "") + @JsonProperty("image") + @Valid + public String getImage() { + return image; + } + public void setImage(String image) { + this.image = image; + } + /** **/ public IdVProviderRequest isEnabled(Boolean isEnabled) { @@ -190,6 +209,7 @@ public boolean equals(java.lang.Object o) { return Objects.equals(this.type, idVProviderRequest.type) && Objects.equals(this.name, idVProviderRequest.name) && Objects.equals(this.description, idVProviderRequest.description) && + Objects.equals(this.image, idVProviderRequest.image) && Objects.equals(this.isEnabled, idVProviderRequest.isEnabled) && Objects.equals(this.claims, idVProviderRequest.claims) && Objects.equals(this.configProperties, idVProviderRequest.configProperties); @@ -197,7 +217,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(type, name, description, isEnabled, claims, configProperties); + return Objects.hash(type, name, description, image, isEnabled, claims, configProperties); } @Override @@ -209,6 +229,7 @@ public String toString() { sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); + sb.append(" image: ").append(toIndentedString(image)).append("\n"); sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n"); sb.append(" claims: ").append(toIndentedString(claims)).append("\n"); sb.append(" configProperties: ").append(toIndentedString(configProperties)).append("\n"); diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml index cec5a4c8b2..c8ea63eb70 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/src/main/resources/idv-provider.yaml @@ -409,6 +409,9 @@ components: description: type: string example: identity verification provider + image: + type: string + example: "onfido-logo-url" isEnabled: type: boolean example: true From 89b802101c43ac1dbebff10399147dd5ee2441fa Mon Sep 17 00:00:00 2001 From: Afra Hussaindeen Date: Mon, 25 Nov 2024 11:57:36 +0530 Subject: [PATCH 3/3] Bump identity verification version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56a54ad225..22a3459508 100644 --- a/pom.xml +++ b/pom.xml @@ -830,7 +830,7 @@ 1.5.55 - 1.0.12 + 1.0.15 1.1.12