Merge branch 'feature/shibui-2393' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-2393-ui
TIER · Nov 15, 2022 · 070bdcd · 070bdcd
2 parents 1a41b62 + 56db66e
commit 070bdcd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/...internet2/tier/shibboleth/admin/ui/domain/frontend/DynamicRegistrationRepresentation.java b/...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.getName();
         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/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/oidc/DynamicRegistrationInfo.java b/...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
@@ -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",