Merged in bugfix/SHIBUI-1005 (pull request #250)

SHIBUI-1005: Fixes related to LocalDynamicMetadataProvider

Approved-by: Ryan Mathis <rmathis@unicon.net>

backend/src/main/resources/i18n/messages.properties

@@ -299,7 +299,7 @@ label.metadata-provider-type=Metadata Provider Type
 label.metadata-provider-name=Metadata Provider Name
 label.select-metadata-type=Select a metadata provider type
 label.metadata-provider-status=Metadata Provider Status
-label.enable-provider-upon-saving=Enable Metadata Provider upon saving?
+label.enable-provider-upon-saving=Enable Metadata Provider?
 label.certificate-type=Type
 
 label.metadata-file=Metadata File
@@ -319,6 +319,7 @@ label.select-metadata-provider-type=Select Metadata Provider Type
 label.filter-list=Filter List
 label.common-attributes=Common Attributes
 label.reloading-attributes=Reloading Attributes
+label.dynamic-attributes=Dynamic Attributes
 label.metadata-filter-plugins=Metadata Filter Plugins
 label.advanced-settings=Advanced Settings
 label.edit-metadata-provider=Edit Metadata Provider
@@ -458,7 +459,7 @@ tooltip.http-caching-directory=If httpCaching='file', this attribute specifies w
 tooltip.http-max-cache-entries=The maximum number of responses written to cache. This attribute is incompatible with httpClientRef.
 tooltip.max-cache-entry-size=The maximum response body size that may be cached, in bytes. This attribute is incompatible with httpClientRef.
 
-tooltip.metadata-provider-name=Metadata Provider Name
+tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
 tooltip.metadata-provider-type=Metadata Provider Type
 tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
 tooltip.metadata-url=Identifier for logging, identification for command line reload, etc.
@@ -470,7 +471,7 @@ tooltip.require-valid-metadata=Whether candidate metadata found by the resolver
 tooltip.fail-fast-init=Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
 tooltip.use-default-predicate-reg=Flag which determines whether the default CriterionPredicateRegistry will be used if a custom one is not supplied explicitly.
 tooltip.satisfy-any-predicates=Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).
-tooltip.enable-provider-upon-saving=Enable Metadata Provider upon saving?
+tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
 
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.

backend/src/main/resources/i18n/messages_en.properties

@@ -299,7 +299,7 @@ label.metadata-provider-type=Metadata Provider Type
 label.metadata-provider-name=Metadata Provider Name
 label.select-metadata-type=Select a metadata provider type
 label.metadata-provider-status=Metadata Provider Status
-label.enable-provider-upon-saving=Enable Metadata Provider upon saving?
+label.enable-provider-upon-saving=Enable Metadata Provider?
 label.certificate-type=Type
 
 label.metadata-file=Metadata File
@@ -319,6 +319,7 @@ label.select-metadata-provider-type=Select Metadata Provider Type
 label.filter-list=Filter List
 label.common-attributes=Common Attributes
 label.reloading-attributes=Reloading Attributes
+label.dynamic-attributes=Dynamic Attributes
 label.metadata-filter-plugins=Metadata Filter Plugins
 label.advanced-settings=Advanced Settings
 label.edit-metadata-provider=Edit Metadata Provider
@@ -464,7 +465,7 @@ tooltip.http-caching-directory=If httpCaching='file', this attribute specifies w
 tooltip.http-max-cache-entries=The maximum number of responses written to cache. This attribute is incompatible with httpClientRef.
 tooltip.max-cache-entry-size=The maximum response body size that may be cached, in bytes. This attribute is incompatible with httpClientRef.
 
-tooltip.metadata-provider-name=Metadata Provider Name
+tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
 tooltip.metadata-provider-type=Metadata Provider Type
 tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
 tooltip.metadata-url=Identifier for logging, identification for command line reload, etc.
@@ -476,7 +477,7 @@ tooltip.require-valid-metadata=Whether candidate metadata found by the resolver
 tooltip.fail-fast-init=Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
 tooltip.use-default-predicate-reg=Flag which determines whether the default CriterionPredicateRegistry will be used if a custom one is not supplied explicitly.
 tooltip.satisfy-any-predicates=Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).
-tooltip.enable-provider-upon-saving=Enable Metadata Provider upon saving?
+tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
 
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.

backend/src/main/resources/local-dynamic-metadata-provider.schema.json

@@ -8,7 +8,7 @@
     ],
     "properties": {
         "name": {
-            "title": "label.metadata-provider-name",
+            "title": "label.metadata-provider-name-display-only",
             "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {

backend/src/test/resources/i18n/messages_es.properties

@@ -282,7 +282,7 @@ label.metadata-provider-type=(es) Metadata Provider Type
 label.metadata-provider-name=(es) Metadata Provider Name
 label.select-metadata-type=(es) Select a metadata provider type
 label.metadata-provider-status=(es) Metadata Provider Status
-label.enable-provider-upon-saving=(es) Enable Metadata Provider upon saving?
+label.enable-provider-upon-saving=(es) Enable Metadata Provider?
 
 label.enable-filter=(es) Enable Filter?
 label.required-valid-until=(es) Required Valid Until Filter
@@ -299,6 +299,7 @@ label.select-metadata-provider-type=(es) Select Metadata Provider Type
 label.filter-list=(es) Filter List
 label.common-attributes=(es) Common Attributes
 label.reloading-attributes=(es) Reloading Attributes
+label.dynamic-attributes=(es) Dynamic Attributes
 label.metadata-filter-plugins=(es) Metadata Filter Plugins
 label.advanced-settings=(es) Advanced Settings
 label.edit-metadata-provider=(es) Edit Metadata Provider
@@ -417,7 +418,7 @@ tooltip.http-caching-directory=(es) If httpCaching=(es) 'file', this attribute s
 tooltip.http-max-cache-entries=(es) The maximum number of responses written to cache. This attribute is incompatible with httpClientRef.
 tooltip.max-cache-entry-size=(es) The maximum response body size that may be cached, in bytes. This attribute is incompatible with httpClientRef.
 
-tooltip.metadata-provider-name=(es) Metadata Provider Name
+tooltip.metadata-provider-name=(es) Metadata Provider Name (for display on the Dashboard only)
 tooltip.metadata-provider-type=(es) Metadata Provider Type
 tooltip.xml-id=(es) Identifier for logging, identification for command line reload, etc.
 tooltip.metadata-url=(es) Identifier for logging, identification for command line reload, etc.
@@ -428,7 +429,7 @@ tooltip.require-valid-metadata=(es) Whether candidate metadata found by the reso
 tooltip.fail-fast-init=(es) Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
 tooltip.use-default-predicate-reg=(es) Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
 tooltip.satisfy-any-predicates=(es) Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).
-tooltip.enable-provider-upon-saving=(es) Enable Metadata Provider upon saving?
+tooltip.enable-provider-upon-saving=(es) If checkbox is clicked, the metadata provider is enabled for integration with the IdP
 
 tooltip.max-validity-interval=(es) Defines the window within which the metadata is valid.
 tooltip.require-signed-root=(es) If true, this fails to load metadata with no signature on the root XML element.

ui/src/app/metadata/provider/model/local-dynamic.provider.form.ts

@@ -42,8 +42,8 @@ export const LocalDynamicMetadataProviderWizard: Wizard<LocalDynamicMetadataProv
             ]
         },
         {
-            id: 'reloading',
-            label: 'label.reloading-attributes',
+            id: 'dynamic',
+            label: 'label.dynamic-attributes',
             index: 3,
             initialValues: [],
             schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',
@@ -113,23 +113,23 @@ export const LocalDynamicMetadataProviderEditor: Wizard<LocalDynamicMetadataProv
                     class: ['mb-3'],
                     fields: [
                         'name',
-                        '@type',
-                        'enabled'
+                        '@type'
                     ]
                 },
                 {
                     type: 'group-lg',
                     class: ['col-12'],
                     fields: [
+                        'enabled',
                         'xmlId',
                         'sourceDirectory',
                     ]
                 }
             ]
         },
         {
-            id: 'reloading',
-            label: 'label.reloading-attributes',
+            id: 'dynamic',
+            label: 'label.dynamic-attributes',
             index: 2,
             initialValues: [],
             schema: '/api/ui/MetadataResolver/LocalDynamicMetadataResolver',

ui/src/assets/schema/provider/metadata-provider.schema.json

@@ -6,8 +6,8 @@
     },
     "properties": {
         "name": {
-            "title": "label.metadata-provider-name",
-            "description": "tooltip.metadata-provider-name",
+            "title": "label.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name-dashboard-display-only",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -29,4 +29,4 @@
         "name",
         "@type"
     ]
-}
+}