From b1c54f0c753b0d8b9d11bac5c7b7bcbfcb291a05 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 15 Nov 2022 09:39:50 -0700 Subject: [PATCH 1/2] SHIBUI-2393 Added missing "name" value to the Dynamic Registration --- .../domain/frontend/DynamicRegistrationRepresentation.java | 4 ++++ .../admin/ui/domain/oidc/DynamicRegistrationInfo.java | 1 + backend/src/main/resources/dynamic-registration.schema.json | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java index b69c5142f..47986f9e7 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java @@ -24,6 +24,7 @@ public class DynamicRegistrationRepresentation { private String idOfOwner; private String jwks; private String logoUri; + private String name; private LocalDateTime modifiedDate; private String policyUri; private String redirectUris; @@ -45,6 +46,7 @@ public DynamicRegistrationRepresentation(DynamicRegistrationInfo dri) { idOfOwner = dri.getIdOfOwner(); jwks = dri.getJwks(); logoUri = dri.getLogoUri(); + name = dri.setName(); modifiedDate = dri.getModifiedDate(); policyUri = dri.getPolicyUri(); redirectUris = dri.getRedirectUris(); @@ -69,6 +71,7 @@ public DynamicRegistrationInfo buildDynamicRegistrationInfo() { // dri.setIdOfOwner(idOfOwner); dri.setJwks(jwks); dri.setLogoUri(logoUri); + dri.setName(name); dri.setPolicyUri(policyUri); dri.setRedirectUris(redirectUris); dri.setResourceId(resourceId); @@ -98,6 +101,7 @@ public DynamicRegistrationInfo updateExistingWithRepValues(DynamicRegistrationIn dri.setGrantType(grantType); dri.setJwks(jwks); dri.setLogoUri(logoUri); + dri.setName(name); dri.setPolicyUri(policyUri); dri.setRedirectUris(redirectUris); dri.setResourceId(resourceId); diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/oidc/DynamicRegistrationInfo.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/oidc/DynamicRegistrationInfo.java index 7ad3198dc..207d9e1a2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/oidc/DynamicRegistrationInfo.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/oidc/DynamicRegistrationInfo.java @@ -30,6 +30,7 @@ public class DynamicRegistrationInfo extends AbstractAuditable implements Ownabl private String idOfOwner; private String jwks; private String logoUri; + private String name; private String policyUri; private String redirectUris; private String resourceId; diff --git a/backend/src/main/resources/dynamic-registration.schema.json b/backend/src/main/resources/dynamic-registration.schema.json index 1a0ca9305..2ff19e746 100644 --- a/backend/src/main/resources/dynamic-registration.schema.json +++ b/backend/src/main/resources/dynamic-registration.schema.json @@ -55,6 +55,11 @@ "description": "tooltip.logo-uri", "type": "string" }, + "name": { + "title": "label.name", + "description": "tooltip.name", + "type": "string" + }, "policyUri": { "title": "label.policy-uri", "description": "tooltip.policy-uri", From 56db66ed1a11ee356cd99610b22a0d067ba4d1d3 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 15 Nov 2022 09:46:15 -0700 Subject: [PATCH 2/2] SHIBUI-2393 Added missing "name" value to the Dynamic Registration --- .../ui/domain/frontend/DynamicRegistrationRepresentation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java index 47986f9e7..133bac4d2 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java @@ -46,7 +46,7 @@ public DynamicRegistrationRepresentation(DynamicRegistrationInfo dri) { idOfOwner = dri.getIdOfOwner(); jwks = dri.getJwks(); logoUri = dri.getLogoUri(); - name = dri.setName(); + name = dri.getName(); modifiedDate = dri.getModifiedDate(); policyUri = dri.getPolicyUri(); redirectUris = dri.getRedirectUris();