diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy new file mode 100644 index 000000000..aeedd07e7 --- /dev/null +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy @@ -0,0 +1,53 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller + +import com.fasterxml.jackson.databind.ObjectMapper +import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomAttributesConfiguration +import edu.internet2.tier.shibboleth.admin.ui.jsonschema.MetadataSourcesJsonSchemaResourceLocation +import org.springframework.beans.factory.BeanInitializationException +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.context.properties.ConfigurationProperties +import org.springframework.core.io.ResourceLoader +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RestController + +import javax.annotation.PostConstruct + +import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR + +/** + * Controller implementing REST resource responsible for exposing structure definition for metadata sources user + * interface in terms of JSON schema. + * + * @author Dmitriy Kopylenko + * @author Bill Smith (wsmith@unicon.net) + */ +@RestController('/api/ui/MetadataSources') +class MetadataSourcesUiDefinitionController { + + @Autowired + MetadataSourcesJsonSchemaResourceLocation jsonSchemaLocation + + @Autowired + ObjectMapper jacksonObjectMapper + + @Autowired + CustomAttributesConfiguration customAttributesConfiguration + + @GetMapping + ResponseEntity getUiDefinitionJsonSchema() { + try { + def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map) + parsedJson['properties']['attributeRelease']['widget']['data'] = + customAttributesConfiguration.getAttributes().collect { + [key: it['name'], label: it['displayName']] + } + return ResponseEntity.ok(parsedJson) + } + catch (Exception e) { + return ResponseEntity.status(INTERNAL_SERVER_ERROR) + .body([jsonParseError : e.getMessage(), + sourceUiSchemaDefinitionFile: this.jsonSchemaLocation.url]) + } + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/JsonSchemaValidationComponentsConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/JsonSchemaValidationComponentsConfiguration.java new file mode 100644 index 000000000..48fb33ede --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/JsonSchemaValidationComponentsConfiguration.java @@ -0,0 +1,30 @@ +package edu.internet2.tier.shibboleth.admin.ui.configuration; + +import com.fasterxml.jackson.databind.ObjectMapper; +import edu.internet2.tier.shibboleth.admin.ui.jsonschema.MetadataSourcesJsonSchemaResourceLocation; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ResourceLoader; + +/** + * @author Dmitriy Kopylenko + */ +@Configuration +@ConfigurationProperties("shibui") +public class JsonSchemaValidationComponentsConfiguration { + + //Configured via @ConfigurationProperties (using setter method) with 'shibui.metadata-sources-ui-schema-location' property and default + //value set here if that property is not explicitly set in application.properties + private String metadataSourcesUiSchemaLocation ="classpath:metadata-sources-ui-schema.json"; + + //This setter is used by Boot's @ConfiguratonProperties binding machinery + public void setMetadataSourcesUiSchemaLocation(String metadataSourcesUiSchemaLocation) { + this.metadataSourcesUiSchemaLocation = metadataSourcesUiSchemaLocation; + } + + @Bean + public MetadataSourcesJsonSchemaResourceLocation metadataSourcesJsonSchemaResourceLocation(ResourceLoader resourceLoader, ObjectMapper jacksonMapper) { + return new MetadataSourcesJsonSchemaResourceLocation(metadataSourcesUiSchemaLocation, resourceLoader, jacksonMapper); + } +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataSourcesJsonSchemaResourceLocation.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataSourcesJsonSchemaResourceLocation.java new file mode 100644 index 000000000..98d53cd39 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/MetadataSourcesJsonSchemaResourceLocation.java @@ -0,0 +1,77 @@ +package edu.internet2.tier.shibboleth.admin.ui.jsonschema; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.beans.factory.BeanInitializationException; +import org.springframework.core.io.ResourceLoader; + +import javax.annotation.PostConstruct; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Map; + +/** + * Encapsulates metadata sources JSON schema location. + * + * @author Dmitriy Kopylenko + */ +public class MetadataSourcesJsonSchemaResourceLocation { + + private final String metadataSourcesUiSchemaLocation; + + private URL jsonSchemaUrl; + + private final ResourceLoader resourceLoader; + + private final ObjectMapper jacksonMapper; + + private boolean detectMalformedJsonDuringInit = true; + + public MetadataSourcesJsonSchemaResourceLocation(String metadataSourcesUiSchemaLocation, ResourceLoader resourceLoader, ObjectMapper jacksonMapper) { + this.metadataSourcesUiSchemaLocation = metadataSourcesUiSchemaLocation; + this.resourceLoader = resourceLoader; + this.jacksonMapper = jacksonMapper; + } + + //This constructor is used in tests + public MetadataSourcesJsonSchemaResourceLocation(String metadataSourcesUiSchemaLocation, + ResourceLoader resourceLoader, + ObjectMapper jacksonMapper, + boolean detectMalformedJsonDuringInit) { + this.metadataSourcesUiSchemaLocation = metadataSourcesUiSchemaLocation; + this.resourceLoader = resourceLoader; + this.jacksonMapper = jacksonMapper; + this.detectMalformedJsonDuringInit = detectMalformedJsonDuringInit; + } + + public URL getUrl() { + return this.jsonSchemaUrl; + } + + public URI getUri() { + try { + return this.jsonSchemaUrl.toURI(); + } + catch (URISyntaxException ex) { + throw new RuntimeException(ex); + } + } + + @PostConstruct + public void init() { + try { + this.jsonSchemaUrl = this.resourceLoader.getResource(this.metadataSourcesUiSchemaLocation).getURL(); + if(this.detectMalformedJsonDuringInit) { + //Detect malformed JSON schema early, during application start up and fail fast with useful exception message + this.jacksonMapper.readValue(this.jsonSchemaUrl, Map.class); + } + } + catch (Exception ex) { + StringBuilder msg = + new StringBuilder(String.format("An error is detected during JSON parsing => [%s]", ex.getMessage())); + msg.append(String.format("Offending resource => [%s]", this.metadataSourcesUiSchemaLocation)); + + throw new BeanInitializationException(msg.toString(), ex); + } + } +} diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index e91e8370d..cc5a34059 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -49,6 +49,8 @@ shibui.logout-url=/dashboard #shibui.default-password= +shibui.metadata-sources-ui-schema-location=classpath:metadata-sources-ui-schema.json + #Actuator endpoints (info) # Un-comment to get full git details exposed like author, abbreviated SHA-1, commit message #management.info.git.mode=full diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 72d6e706d..83b644910 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -60,12 +60,21 @@ value.regex=Regex value.script=Script value.entity-id=Entity ID +value.support=Support +value.technical=Technical +value.administrative=Administrative +value.other=Other + +value.signing=Signing +value.encryption=Encryption +value.both=Both + value.file-backed-http-metadata-provider=FileBackedHttpMetadataProvider value.entity-attributes-filter=EntityAttributes Filter value.spdescriptor=SPSSODescriptor value.attr-auth-descriptor=AttributeAuthorityDescriptor -brand.header.title=Source Management (default) +brand.header.title=Source Management brand.logo-link-label=Shibboleth brand.logo-link-description=Link to Shibboleth Website brand.logo-alt=Shibboleth Logo - Click to be directed to www.shibboleth.net @@ -80,10 +89,6 @@ brand.footer.links-label-4=Mailing List brand.footer.links-desc-4=Shibboleth.net open-source community mailing list brand.footer.copyright=Copyright \u00A9 Internet2 -brand.unicon=Unicon -brand.unicon-logo=Unicon Logo -brand.i2=Internet 2 -brand.i2-logo=Internet 2 Logo brand.in-partnership-with=In partnership with brand.and=and @@ -101,7 +106,6 @@ label.enable-this-service=Enable this service? label.organization-name=Organization Name label.organization-display-name=Organization Display Name label.organization-url=Organization URL -label.contact-information=Contact Information: label.name=Name label.type=Type label.email-address=Email Address @@ -109,9 +113,6 @@ label.assertion-consumer-service-endpoints=Assertion Consumer Service Endpoints label.my-changes=My Changes label.their-changes=Their Changes label.new-endpoint=New Endpoint -label.default=(default) -label.assertion-consumer-services-location=Assertion Consumer Service Location -label.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding label.select-binding=Select Binding Type label.mark-as-default=Mark as Default label.attribute-name=Attribute Name @@ -121,7 +122,6 @@ label.clear-all-attributes=Clear All Attributes label.protocol-support-enumeration=Protocol Support Enumeration label.select-protocol=Select Protocol label.nameid-format=NameID Format -label.enable-this-service-opon-saving=Enable this service upon saving? label.name-and-entity-id=Name and Entity ID label.organization-information=Organization Information label.contact-information=Contact Information @@ -146,8 +146,10 @@ label.x509-certificates=X509 Certificates label.certificate-name-display-only=Certificate Name (Display Only) label.certificate=Certificate label.assertion-consumer-services=Assertion Consumer Services -label.assertion-consumer-service-locations=Assertion Consumer Service Location -label.assertion-consumer-service-location-binding=Assertion Consumer Service Binding +label.assertion-consumer-service-location=Assertion Consumer Service Location +label.assertion-consumer-service-endpoint=Assertion Consumer Service Endpoints +label.default=(default) +label.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding label.relying-party-overrides=Relying Party Overrides label.sign-the-assertion=Sign the Assertion? label.turn-off-encryption-of-response=Turn off Encryption of Response? @@ -165,19 +167,13 @@ label.privacy-statement-url=Privacy Statement URL label.contact-name=Contact Name label.select-contact-type=Select Contact Type label.contact-email-address=Contact Email Address -label.sign-the-assertion=Sign the Assertion label.dont-sign-the-response=Don\u0027t Sign the Response -label.turn-off-encryption-of-response=Turn Off Encryption of Response -label.use-sha1-signing-algorithm=Use SHA1 Signing Algorithm label.nameid-format-to-send=NameID Format to Send label.authentication-methods-to-use=Authentication Methods to Use label.auth-method-indexed=Authentication Method -label.ignore-any-sp-requested-authentication-method=Ignore any SP-Requested Authentication Method -label.omit-not-before-condition=Omit Not Before Condition -label.responder-id=ResponderID label.preview-provider=Preview XML label.search-entity-id=Search Entity Id -label.new-filter=Edit EntityAttributesFilter +label.edit-filter=Edit EntityAttributesFilter label.min-4-chars=Minimum 4 characters. label.new-filter=New Filter - EntityAttributes label.service-provider=Metadata Source Name: @@ -187,8 +183,6 @@ label.service-provider-status=Metadata Source Status: label.current-metadata-sources=Current Metadata Sources label.current-metadata-providers=Current Metadata Providers label.add-a-new-metadata-provider=Add a new metadata provider -label.name-and-entityid=Name and EntityId -label.org-info=Organization Information label.service-resolver-name-dashboard-display-only=Service Resolver Name (Dashboard Display Only) label.service-resolver-entity-id=Service Resolver Entity ID label.add-a-new-metadata-source=Add a new metadata source - Finish Summary @@ -196,7 +190,7 @@ label.name-and-entityid=Name and Entity ID. label.finish-summary-validation=Finished! label.select-entity-id-to-copy=Select the Entity ID to copy label.metadata-source-name-dashboard-display-only=Metadata Source Name (Dashboard Display Only) -label.service-resolver-entity-id=New Entity ID +label.new-entity-id=New Entity ID label.sections-to-copy=Sections to Copy? label.add-a-new-metadata-resolver=Add a new metadata source label.how-are-you-adding-the-metadata-information=How are you adding the metadata information? @@ -210,13 +204,12 @@ label.entity-ids-added=Entity Ids Added label.ui-mdui-info=User Interface / MDUI Information label.sp-sso-descriptor-info=SP SSO Descriptor Information label.security-info=Security Information -label.assertion-consumer-services=Assertion Consumer Service label.sp-org-info=SP/Organization Information label.finished=Finished! label.signing=Signing label.encryption=Encryption label.both=Both -label.sp-sso-descriptor-info=Organization Information +label.org-info=Organization Information label.security-descriptor-info=Security Descriptor Information label.entity-id=Entity ID label.service-provider-name=Service Provider Name @@ -243,17 +236,14 @@ label.name-id-format= Name ID Format label.authentication-methods=Authentication Methods label.authentication-method=Authentication Method label.x509-certificate-available=x509 Certificate Available -label.authentication-requests-signed=Authentication Requests Signed -label.want-assertions-signed=Want Assertions Signed -label.x509-certificates=x509 Certificates label.protocol-support-enum=Protocol Support Enumeration label.binding=Binding label.location-url=Location URL label.make-default=Make Default label.metadata-provider-name-dashboard-display-only=Metadata Provider Name (Dashboard Display Only) label.default-authentication-methods=Default Authentication Method(s) +label.new-of-type=New { type } -label.filter-name=Filter Name (Dashboard Display Only) label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only) label.filter-enable=Enable this Filter? label.search-criteria=Search Criteria @@ -301,6 +291,7 @@ 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.certificate-type=Type label.enable-filter=Enable Filter? label.required-valid-until=Required Valid Until Filter @@ -326,7 +317,6 @@ label.descriptor-info=SP SSO Descriptor Information label.key-info=Security Information label.assertion=Assertion Consumer Service label.relying-party=Relying Party Overrides -label.org-info=Organization Information label.attribute-eduPersonPrincipalName=eduPersonPrincipalName (EPPN) label.attribute-uid=uid @@ -375,6 +365,8 @@ message.entity-id-min-unique=You must add at least one entity id target and they message.required-for-scripts=Required for Scripts message.required-for-regex=Required for Regex +tooltip.entity-id=Entity ID +tooltip.service-provider-name=Service Provider Name (Dashboard Display Only) tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only) tooltip.service-provider-entity-id=Service Provider Entity ID @@ -404,9 +396,6 @@ tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to th tooltip.mdui-logo-url=The IdP Logo URL in metadata points to an image file on a remote server. A discovery service, for example, may rely on a visual cue (i.e., a logo) instead of or in addition to the IdP Display Name. tooltip.mdui-logo-width=The logo should have a minimum width of 100 pixels tooltip.mdui-logo-height=The logo should have a minimum height of 75 pixels and a maximum height of 150 pixels (or the application will scale it proportionally) -tooltip.organization-name=Organization Name -tooltip.organization-display-name=Organization Display Name -tooltip.organization-url=Organization Url tooltip.contact-name=Contact Name tooltip.contact-type=Contact Type tooltip.contact-email=Contact Email diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties index 964ef0e77..7ae90de03 100644 --- a/backend/src/main/resources/i18n/messages_en.properties +++ b/backend/src/main/resources/i18n/messages_en.properties @@ -1,3 +1,14 @@ +# Fill this file with key/value pairs, as follows: +# +# some.test.message=This is a test message. +# +# Then, create a copy using the name of the language code: +# +# messages_.properties +# +# Do this for each language we want to support. +# Ideally, all messages should exist for each language. + action.dashboard=Dashboard action.logout=Logout action.add=Add @@ -49,6 +60,15 @@ value.regex=Regex value.script=Script value.entity-id=Entity ID +value.support=Support +value.technical=Technical +value.administrative=Administrative +value.other=Other + +value.signing=Signing +value.encryption=Encryption +value.both=Both + value.file-backed-http-metadata-provider=FileBackedHttpMetadataProvider value.entity-attributes-filter=EntityAttributes Filter value.spdescriptor=SPSSODescriptor @@ -69,6 +89,9 @@ brand.footer.links-label-4=Mailing List brand.footer.links-desc-4=Shibboleth.net open-source community mailing list brand.footer.copyright=Copyright \u00A9 Internet2 +brand.in-partnership-with=In partnership with +brand.and=and + heading.shibboleth=Shibboleth label.metadata-source=Metadata Source @@ -83,7 +106,6 @@ label.enable-this-service=Enable this service? label.organization-name=Organization Name label.organization-display-name=Organization Display Name label.organization-url=Organization URL -label.contact-information=Contact Information: label.name=Name label.type=Type label.email-address=Email Address @@ -91,9 +113,6 @@ label.assertion-consumer-service-endpoints=Assertion Consumer Service Endpoints label.my-changes=My Changes label.their-changes=Their Changes label.new-endpoint=New Endpoint -label.default=(default) -label.assertion-consumer-services-location=Assertion Consumer Service Location -label.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding label.select-binding=Select Binding Type label.mark-as-default=Mark as Default label.attribute-name=Attribute Name @@ -103,7 +122,6 @@ label.clear-all-attributes=Clear All Attributes label.protocol-support-enumeration=Protocol Support Enumeration label.select-protocol=Select Protocol label.nameid-format=NameID Format -label.enable-this-service-opon-saving=Enable this service upon saving? label.name-and-entity-id=Name and Entity ID label.organization-information=Organization Information label.contact-information=Contact Information @@ -128,8 +146,10 @@ label.x509-certificates=X509 Certificates label.certificate-name-display-only=Certificate Name (Display Only) label.certificate=Certificate label.assertion-consumer-services=Assertion Consumer Services -label.assertion-consumer-service-locations=Assertion Consumer Service Location -label.assertion-consumer-service-location-binding=Assertion Consumer Service Binding +label.assertion-consumer-service-location=Assertion Consumer Service Location +label.assertion-consumer-service-endpoint=Assertion Consumer Service Endpoints +label.default=(default) +label.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding label.relying-party-overrides=Relying Party Overrides label.sign-the-assertion=Sign the Assertion? label.turn-off-encryption-of-response=Turn off Encryption of Response? @@ -147,19 +167,13 @@ label.privacy-statement-url=Privacy Statement URL label.contact-name=Contact Name label.select-contact-type=Select Contact Type label.contact-email-address=Contact Email Address -label.sign-the-assertion=Sign the Assertion label.dont-sign-the-response=Don\u0027t Sign the Response -label.turn-off-encryption-of-response=Turn Off Encryption of Response -label.use-sha1-signing-algorithm=Use SHA1 Signing Algorithm label.nameid-format-to-send=NameID Format to Send label.authentication-methods-to-use=Authentication Methods to Use label.auth-method-indexed=Authentication Method -label.ignore-any-sp-requested-authentication-method=Ignore any SP-Requested Authentication Method -label.omit-not-before-condition=Omit Not Before Condition -label.responder-id=ResponderID label.preview-provider=Preview XML label.search-entity-id=Search Entity Id -label.new-filter=Edit EntityAttributesFilter +label.edit-filter=Edit EntityAttributesFilter label.min-4-chars=Minimum 4 characters. label.new-filter=New Filter - EntityAttributes label.service-provider=Metadata Source Name: @@ -169,8 +183,6 @@ label.service-provider-status=Metadata Source Status: label.current-metadata-sources=Current Metadata Sources label.current-metadata-providers=Current Metadata Providers label.add-a-new-metadata-provider=Add a new metadata provider -label.name-and-entityid=Name and EntityId -label.org-info=Organization Information label.service-resolver-name-dashboard-display-only=Service Resolver Name (Dashboard Display Only) label.service-resolver-entity-id=Service Resolver Entity ID label.add-a-new-metadata-source=Add a new metadata source - Finish Summary @@ -178,7 +190,7 @@ label.name-and-entityid=Name and Entity ID. label.finish-summary-validation=Finished! label.select-entity-id-to-copy=Select the Entity ID to copy label.metadata-source-name-dashboard-display-only=Metadata Source Name (Dashboard Display Only) -label.service-resolver-entity-id=New Entity ID +label.new-entity-id=New Entity ID label.sections-to-copy=Sections to Copy? label.add-a-new-metadata-resolver=Add a new metadata source label.how-are-you-adding-the-metadata-information=How are you adding the metadata information? @@ -192,13 +204,12 @@ label.entity-ids-added=Entity Ids Added label.ui-mdui-info=User Interface / MDUI Information label.sp-sso-descriptor-info=SP SSO Descriptor Information label.security-info=Security Information -label.assertion-consumer-services=Assertion Consumer Service label.sp-org-info=SP/Organization Information label.finished=Finished! label.signing=Signing label.encryption=Encryption label.both=Both -label.sp-sso-descriptor-info=Organization Information +label.org-info=Organization Information label.security-descriptor-info=Security Descriptor Information label.entity-id=Entity ID label.service-provider-name=Service Provider Name @@ -225,17 +236,14 @@ label.name-id-format= Name ID Format label.authentication-methods=Authentication Methods label.authentication-method=Authentication Method label.x509-certificate-available=x509 Certificate Available -label.authentication-requests-signed=Authentication Requests Signed -label.want-assertions-signed=Want Assertions Signed -label.x509-certificates=x509 Certificates label.protocol-support-enum=Protocol Support Enumeration label.binding=Binding label.location-url=Location URL label.make-default=Make Default label.metadata-provider-name-dashboard-display-only=Metadata Provider Name (Dashboard Display Only) label.default-authentication-methods=Default Authentication Method(s) +label.new-of-type=New { type } -label.filter-name=Filter Name (Dashboard Display Only) label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only) label.filter-enable=Enable this Filter? label.search-criteria=Search Criteria @@ -283,6 +291,7 @@ 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.certificate-type=Type label.enable-filter=Enable Filter? label.required-valid-until=Required Valid Until Filter @@ -308,7 +317,6 @@ label.descriptor-info=SP SSO Descriptor Information label.key-info=Security Information label.assertion=Assertion Consumer Service label.relying-party=Relying Party Overrides -label.org-info=Organization Information label.attribute-eduPersonPrincipalName=eduPersonPrincipalName (EPPN) label.attribute-uid=uid @@ -357,6 +365,8 @@ message.entity-id-min-unique=You must add at least one entity id target and they message.required-for-scripts=Required for Scripts message.required-for-regex=Required for Regex +tooltip.entity-id=Entity ID +tooltip.service-provider-name=Service Provider Name (Dashboard Display Only) tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only) tooltip.service-provider-entity-id=Service Provider Entity ID @@ -386,9 +396,6 @@ tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to th tooltip.mdui-logo-url=The IdP Logo URL in metadata points to an image file on a remote server. A discovery service, for example, may rely on a visual cue (i.e., a logo) instead of or in addition to the IdP Display Name. tooltip.mdui-logo-width=The logo should have a minimum width of 100 pixels tooltip.mdui-logo-height=The logo should have a minimum height of 75 pixels and a maximum height of 150 pixels (or the application will scale it proportionally) -tooltip.organization-name=Organization Name -tooltip.organization-display-name=Organization Display Name -tooltip.organization-url=Organization Url tooltip.contact-name=Contact Name tooltip.contact-type=Contact Type tooltip.contact-email=Contact Email diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json new file mode 100644 index 000000000..c06e299a6 --- /dev/null +++ b/backend/src/main/resources/metadata-sources-ui-schema.json @@ -0,0 +1,619 @@ +{ + "type": "object", + "required": [ + "serviceProviderName", + "entityId" + ], + "properties": { + "entityId": { + "title": "label.entity-id", + "description": "tooltip.entity-id", + "type": "string", + "minLength": 1, + "maxLength": 255 + }, + "serviceProviderName": { + "title": "label.service-provider-name", + "description": "tooltip.service-provider-name", + "type": "string", + "minLength": 1, + "maxLength": 255 + }, + "serviceEnabled": { + "title": "label.enable-this-service", + "description": "tooltip.enable-this-service-upon-saving", + "type": "boolean", + "default": false + }, + "organization": { + "type": "object", + "properties": { + "name": { + "title": "label.organization-name", + "description": "tooltip.organization-name", + "type": "string" + }, + "displayName": { + "title": "label.organization-display-name", + "description": "tooltip.organization-display-name", + "type": "string" + }, + "url": { + "title": "label.organization-url", + "description": "tooltip.organization-url", + "type": "string" + } + }, + "dependencies": { + "name": [ + "displayName", + "url" + ], + "displayName": [ + "name", + "url" + ], + "url": [ + "name", + "displayName" + ] + } + }, + "contacts": { + "title": "label.contact-information", + "description": "tooltip.contact-information", + "type": "array", + "items": { + "$ref": "#/definitions/Contact" + } + }, + "mdui": { + "type": "object", + "widget": { + "id": "fieldset" + }, + "fieldsets": [ + { + "type": "group", + "fields": [ + "displayName", + "informationUrl", + "description" + ] + }, + { + "type": "group", + "fields": [ + "privacyStatementUrl", + "logoUrl", + "logoWidth", + "logoHeight" + ] + } + ], + "properties": { + "displayName": { + "title": "label.display-name", + "description": "tooltip.mdui-display-name", + "type": "string" + }, + "informationUrl": { + "title": "label.information-url", + "description": "tooltip.mdui-information-url", + "type": "string" + }, + "privacyStatementUrl": { + "title": "label.privacy-statement-url", + "description": "tooltip.mdui-privacy-statement-url", + "type": "string" + }, + "description": { + "title": "label.description", + "description": "tooltip.mdui-description", + "type": "string", + "widget": { + "id": "textarea" + } + }, + "logoUrl": { + "title": "label.logo-url", + "description": "tooltip.mdui-logo-url", + "type": "string" + }, + "logoHeight": { + "title": "label.logo-height", + "description": "tooltip.mdui-logo-height", + "min": 0, + "type": "integer", + "default": 0 + }, + "logoWidth": { + "title": "label.logo-width", + "description": "tooltip.mdui-logo-width", + "min": 0, + "type": "integer", + "default": 0 + } + } + }, + "securityInfo": { + "type": "object", + "widget": { + "id": "fieldset" + }, + "fieldsets": [ + { + "type": "group", + "fields": [ + "x509CertificateAvailable", + "authenticationRequestsSigned", + "wantAssertionsSigned" + ] + }, + { + "type": "group", + "fields": [ + "x509Certificates" + ] + } + ], + "properties": { + "x509CertificateAvailable": { + "title": "label.is-there-a-x509-certificate", + "description": "tooltip.is-there-a-x509-certificate", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": false + }, + "authenticationRequestsSigned": { + "title": "label.authentication-requests-signed", + "description": "tooltip.authentication-requests-signed", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": false + }, + "wantAssertionsSigned": { + "title": "label.want-assertions-signed", + "description": "tooltip.want-assertions-signed", + "type": "boolean", + "widget": { + "id": "boolean-radio" + }, + "oneOf": [ + { + "enum": [ + true + ], + "description": "value.true" + }, + { + "enum": [ + false + ], + "description": "value.false" + } + ], + "default": false + }, + "x509Certificates": { + "title": "label.x509-certificates", + "type": "array", + "items": { + "$ref": "#/definitions/Certificate" + } + } + } + }, + "assertionConsumerServices": { + "title": "label.assertion-consumer-service-endpoints", + "description": "", + "type": "array", + "items": { + "$ref": "#/definitions/AssertionConsumerService" + } + }, + "serviceProviderSsoDescriptor": { + "type": "object", + "widget": { + "id": "fieldset" + }, + "fieldsets": [ + { + "type": "group", + "fields": [ + "protocolSupportEnum", + "nameIdFormats" + ] + } + ], + "required": [ + "nameIdFormats" + ], + "properties": { + "protocolSupportEnum": { + "title": "label.protocol-support-enumeration", + "description": "tooltip.protocol-support-enumeration", + "type": "string", + "placeholder": "label.select-protocol", + "widget": { + "id": "select" + }, + "oneOf": [ + { + "enum": [ + "SAML 2" + ], + "description": "SAML 2" + }, + { + "enum": [ + "SAML 1.1" + ], + "description": "SAML 1.1" + } + ] + }, + "nameIdFormats": { + "$ref": "#/definitions/NameIdFormatList" + } + } + }, + "logoutEndpoints": { + "title": "label.logout-endpoints", + "description": "tooltip.logout-endpoints", + "type": "array", + "items": { + "$ref": "#/definitions/LogoutEndpoint" + } + }, + "relyingPartyOverrides": { + "type": "object", + "properties": { + "signAssertion": { + "title": "label.sign-the-assertion", + "description": "tooltip.sign-assertion", + "type": "boolean", + "default": false + }, + "dontSignResponse": { + "title": "label.dont-sign-the-response", + "description": "tooltip.dont-sign-response", + "type": "boolean", + "default": false + }, + "turnOffEncryption": { + "title": "label.turn-off-encryption-of-response", + "description": "tooltip.turn-off-encryption", + "type": "boolean", + "default": false + }, + "useSha": { + "title": "label.use-sha1-signing-algorithm", + "description": "tooltip.usa-sha-algorithm", + "type": "boolean", + "default": false + }, + "ignoreAuthenticationMethod": { + "title": "label.ignore-any-sp-requested-authentication-method", + "description": "tooltip.ignore-auth-method", + "type": "boolean", + "default": false + }, + "forceAuthn": { + "title": "label.force-authn", + "description": "tooltip.force-authn", + "type": "boolean", + "default": false + }, + "omitNotBefore": { + "title": "label.omit-not-before-condition", + "type": "boolean", + "description": "tooltip.omit-not-before-condition", + "default": false + }, + "nameIdFormats": { + "$ref": "#/definitions/NameIdFormatList" + }, + "authenticationMethods": { + "$ref": "#/definitions/AuthenticationMethodList" + }, + "responderId": { + "title": "label.responder-id", + "description": "tooltip.responder-id", + "type": "string" + } + } + }, + "attributeRelease": { + "type": "array", + "description": "Attribute release table - select the attributes you want to release (default unchecked)", + "widget": { + "id": "checklist", + "dataUrl": "/customAttributes" + }, + "items": { + "type": "string" + } + } + }, + "definitions": { + "Contact": { + "type": "object", + "required": [ + "name", + "type", + "emailAddress" + ], + "properties": { + "name": { + "title": "label.contact-name", + "description": "tooltip.contact-name", + "type": "string", + "minLength": 1, + "maxLength": 255 + }, + "type": { + "title": "label.contact-type", + "description": "tooltip.contact-type", + "type": "string", + "widget": "select", + "minLength": 1, + "oneOf": [ + { + "enum": [ + "support" + ], + "description": "value.support" + }, + { + "enum": [ + "technical" + ], + "description": "value.technical" + }, + { + "enum": [ + "administrative" + ], + "description": "value.administrative" + }, + { + "enum": [ + "other" + ], + "description": "value.other" + } + ] + }, + "emailAddress": { + "title": "label.contact-email-address", + "description": "tooltip.contact-email", + "type": "string", + "pattern": "^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$", + "minLength": 1, + "maxLength": 255 + } + } + }, + "Certificate": { + "type": "object", + "title": "label.certificate", + "required": [ + "name", + "type", + "value" + ], + "properties": { + "name": { + "title": "label.certificate-name-display-only", + "description": "tooltip.certificate-name", + "type": "string", + "minLength": 1, + "maxLength": 255 + }, + "type": { + "title": "label.certificate-type", + "description": "tooltip.certificate-type", + "type": "string", + "widget": { + "id": "radio", + "class": "form-check-inline" + }, + "oneOf": [ + { + "enum": [ + "signing" + ], + "description": "value.signing" + }, + { + "enum": [ + "encryption" + ], + "description": "value.encryption" + }, + { + "enum": [ + "both" + ], + "description": "value.both" + } + ], + "default": "both" + }, + "value": { + "title": "label.certificate", + "description": "tooltip.certificate", + "type": "string", + "widget": "textarea", + "minLength": 1 + } + } + }, + "AssertionConsumerService": { + "type": "object", + "title": "label.assertion-consumer-service-endpoint", + "properties": { + "locationUrl": { + "title": "label.assertion-consumer-service-location", + "description": "tooltip.assertion-consumer-service-location", + "type": "string", + "widget": { + "id": "string", + "help": "message.valid-url" + }, + "minLength": 1, + "maxLength": 255 + }, + "binding": { + "title": "label.assertion-consumer-service-location-binding", + "description": "tooltip.assertion-consumer-service-location-binding", + "type": "string", + "widget": "select", + "oneOf": [ + { + "enum": [ + "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + ], + "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + }, + { + "enum": [ + "urn:oasis:names:tc:SAML:1.0:profiles:browser-post" + ], + "description": "urn:oasis:names:tc:SAML:1.0:profiles:browser-post" + } + ] + }, + "makeDefault": { + "title": "label.mark-as-default", + "description": "tooltip.mark-as-default", + "type": "boolean", + "default": false + } + } + }, + "NameIdFormatList": { + "title": "label.nameid-format-to-send", + "placeholder": "label.nameid-format", + "description": "tooltip.nameid-format", + "type": "array", + "uniqueItems": true, + "items": { + "type": "string", + "minLength": 1, + "maxLength": 255, + "widget": { + "id": "datalist", + "data": [ + "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", + "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", + "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", + "urn:oasis:names:tc:SAML:2.0:nameid-format:transient" + ] + } + }, + "default": null + }, + "AuthenticationMethodList": { + "title": "label.authentication-methods-to-use", + "description": "tooltip.authentication-methods-to-use", + "type": "array", + "placeholder": "label.authentication-method", + "uniqueItems": true, + "items": { + "type": "string", + "title": "label.authentication-method", + "minLength": 1, + "maxLength": 255, + "widget": { + "id": "datalist", + "data": [ + "https://refeds.org/profile/mfa", + "urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", + "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" + ] + } + }, + "default": null + }, + "LogoutEndpoint": { + "title": "label.new-endpoint", + "description": "tooltip.new-endpoint", + "type": "object", + "fieldsets": [ + { + "fields": [ + "url", + "bindingType" + ] + } + ], + "required": [ + "url", + "bindingType" + ], + "properties": { + "url": { + "title": "label.url", + "description": "tooltip.url", + "type": "string", + "minLength": 1, + "maxLength": 255 + }, + "bindingType": { + "title": "label.binding-type", + "description": "tooltip.binding-type", + "type": "string", + "widget": "select", + "oneOf": [ + { + "enum": [ + "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + ], + "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + }, + { + "enum": [ + "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + ], + "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy new file mode 100644 index 000000000..9b6a5df54 --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy @@ -0,0 +1,46 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller + +import com.fasterxml.jackson.databind.ObjectMapper +import edu.internet2.tier.shibboleth.admin.ui.jsonschema.MetadataSourcesJsonSchemaResourceLocation +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.context.TestConfiguration +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.context.annotation.Bean +import org.springframework.core.io.ResourceLoader +import org.springframework.test.context.ActiveProfiles +import spock.lang.Specification + +/** + * @author Dmitriy Kopylenko + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("no-auth") +class BadJSONMetadataSourcesUiDefinitionControllerIntegrationTests extends Specification { + + @Autowired + private TestRestTemplate restTemplate + + static RESOURCE_URI = '/api/ui/MetadataSources' + + def "GET Malformed Metadata Sources UI definition schema"() { + when: 'GET request is made for malformed metadata source UI definition schema' + def result = this.restTemplate.getForEntity(RESOURCE_URI, Object) + + then: "Request results in HTTP 500" + result.statusCodeValue == 500 + result.body.jsonParseError + result.body.sourceUiSchemaDefinitionFile + } + + @TestConfiguration + static class Config { + @Bean + MetadataSourcesJsonSchemaResourceLocation metadataSourcesJsonSchemaResourceLocation(ResourceLoader resourceLoader, + ObjectMapper jacksonMapper) { + + new MetadataSourcesJsonSchemaResourceLocation('classpath:metadata-sources-ui-schema_MALFORMED.json', + resourceLoader, jacksonMapper, false) + } + } +} \ No newline at end of file diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy new file mode 100644 index 000000000..c673956fe --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests.groovy @@ -0,0 +1,29 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller + +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.test.context.ActiveProfiles +import spock.lang.Specification + +/** + * @author Dmitriy Kopylenko + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("no-auth") +class GoodJSONMetadataSourcesUiDefinitionControllerIntegrationTests extends Specification { + + @Autowired + private TestRestTemplate restTemplate + + static RESOURCE_URI = '/api/ui/MetadataSources' + + def "GET Metadata Sources UI definition schema"() { + when: 'GET request is made for metadata source UI definition schema' + def result = this.restTemplate.getForEntity(RESOURCE_URI, Object) + + then: "Request completed successfully" + result.statusCodeValue == 200 + result.body.properties.entityId.title == 'label.entity-id' + } +} \ No newline at end of file diff --git a/backend/src/test/resources/metadata-sources-ui-schema.json b/backend/src/test/resources/metadata-sources-ui-schema.json new file mode 100644 index 000000000..5766e298f --- /dev/null +++ b/backend/src/test/resources/metadata-sources-ui-schema.json @@ -0,0 +1,442 @@ +{ + "type": "object", + "properties": { + "entityId": { + "title": "label.entity-id", + "description": "tooltip.entity-id", + "type": "string" + }, + "serviceProviderName": { + "title": "label.service-provider-name", + "description": "tooltip.service-provider-name", + "type": "string" + }, + "serviceEnabled": { + "title": "label.enable-this-service-opon-saving", + "description": "tooltip.enable-this-service-upon-saving", + "type": "boolean" + }, + "organization": { + "type": "object", + "properties": { + "name": { + "title": "label.organization-name", + "description": "tooltip.organization-name", + "type": "string" + }, + "displayName": { + "title": "label.organization-display-name", + "description": "tooltip.organization-display-name", + "type": "string" + }, + "url": { + "title": "label.organization-display-name", + "description": "tooltip.organization-display-name", + "type": "string" + } + }, + "dependencies": { + "name": [ + "displayName", + "url" + ], + "displayName": [ + "name", + "url" + ], + "url": [ + "name", + "displayName" + ] + } + }, + "contacts": { + "title": "label.contact-information", + "description": "tooltip.contact-information", + "type": "array", + "items": { + "$ref": "#/definitions/Contact" + } + }, + "mdui": { + "type": "object", + "properties": { + "displayName": { + "title": "label.display-name", + "description": "tooltip.mdui-display-name", + "type": "string" + }, + "informationUrl": { + "title": "label.information-url", + "description": "tooltip.mdui-information-url", + "type": "string" + }, + "privacyStatementUrl": { + "title": "label.privacy-statement-url", + "description": "tooltip.mdui-privacy-statement-url", + "type": "string" + }, + "description": { + "title": "label.description", + "description": "tooltip.mdui-description", + "type": "string" + }, + "logoUrl": { + "title": "label.logo-url", + "description": "tooltip.mdui-logo-url", + "type": "string" + }, + "logoHeight": { + "title": "label.logo-height", + "description": "tooltip.mdui-logo-height", + "min": 0, + "type": "integer" + }, + "logoWidth": { + "title": "label.logo-width", + "description": "tooltip.mdui-logo-width", + "min": 0, + "type": "integer" + } + } + }, + "securityInfo": { + "type": "object", + "properties": { + "x509CertificateAvailable": { + "title": "label.is-there-a-x509-certificate", + "description": "tooltip.is-there-a-x509-certificate", + "type": "boolean", + "default": false + }, + "authenticationRequestsSigned": { + "title": "label.authentication-requests-signed", + "description": "tooltip.authentication-requests-signed", + "type": "boolean", + "default": false + }, + "wantAssertionsSigned": { + "title": "label.want-assertions-signed", + "description": "tooltip.want-assertions-signed", + "type": "boolean", + "default": false + }, + "x509Certificates": { + "title": "label.x509-certificates", + "type": "array", + "items": { + "$ref": "#/definitions/Certificate" + } + } + } + }, + "assertionConsumerServices": { + "title": "label.assertion-consumer-service-endpoints", + "description": "", + "type": "array", + "items": { + "$ref": "#/definitions/AssertionConsumerService" + } + }, + "serviceProviderSsoDescriptor": { + "type": "object", + "properties": { + "protocolSupportEnum": { + "title": "label.protocol-support-enumeration", + "description": "tooltip.protocol-support-enumeration", + "type": "string", + "placeholder": "label.select-protocol", + "oneOf": [ + { + "enum": [ + "SAML 2" + ], + "description": "SAML 2" + }, + { + "enum": [ + "SAML 1.1" + ], + "description": "SAML 1.1" + } + ] + } + }, + "nameIdFormats": { + "$ref": "#/definitions/NameIdFormatList" + } + }, + "logoutEndpoints": { + "title": "label.logout-endpoints", + "description": "tooltip.logout-endpoints", + "type": "array", + "items": { + "$ref": "#/definitions/LogoutEndpoint" + } + }, + "relyingPartyOverrides": { + "type": "object", + "properties": { + "signAssertion": { + "title": "label.sign-the-assertion", + "description": "tooltip.sign-assertion", + "type": "boolean", + "default": false + }, + "dontSignResponse": { + "title": "label.dont-sign-the-response", + "description": "tooltip.dont-sign-response", + "type": "boolean", + "default": false + }, + "turnOffEncryption": { + "title": "label.turn-off-encryption-of-response", + "description": "tooltip.turn-off-encryption", + "type": "boolean", + "default": false + }, + "useSha": { + "title": "label.use-sha1-signing-algorithm", + "description": "tooltip.usa-sha-algorithm", + "type": "boolean", + "default": false + }, + "ignoreAuthenticationMethod": { + "title": "label.ignore-any-sp-requested-authentication-method", + "description": "tooltip.ignore-auth-method", + "type": "boolean", + "default": false + }, + "forceAuthn": { + "title": "label.force-authn", + "description": "tooltip.force-authn", + "type": "boolean", + "default": false + }, + "omitNotBefore": { + "title": "label.omit-not-before-condition", + "type": "boolean", + "description": "tooltip.omit-not-before-condition", + "default": false + }, + "responderId": { + "title": "label.responder-id", + "description": "tooltip.responder-id", + "type": "string" + }, + "nameIdFormats": { + "$ref": "#/definitions/NameIdFormatList" + }, + "authenticationMethods": { + "$ref": "#/definitions/AuthenticationMethodList" + } + } + }, + "attributeRelease": { + "type": "array", + "description": "Attribute release table - select the attributes you want to release (default unchecked)", + "widget": { + "id": "checklist", + "dataUrl": "/customAttributes" + }, + "items": { + "type": "string" + } + } + }, + "definitions": { + "Contact": { + "type": "object", + "properties": { + "name": { + "title": "label.contact-name", + "description": "tooltip.contact-name", + "type": "string" + }, + "type": { + "title": "label.contact-type", + "description": "tooltip.contact-type", + "type": "string", + "oneOf": [ + { + "enum": [ + "support" + ], + "description": "value.support" + }, + { + "enum": [ + "technical" + ], + "description": "value.technical" + }, + { + "enum": [ + "administrative" + ], + "description": "value.administrative" + }, + { + "enum": [ + "other" + ], + "description": "value.other" + } + ] + }, + "emailAddress": { + "title": "label.contact-email-address", + "description": "tooltip.contact-email", + "type": "string", + "pattern": "^(?=.{1,254}$)(?=.{1,64}@)[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+(\\.[-!#$%&'*+/0-9=?A-Z^_`a-z{|}~]+)*@[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\\.[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?)*$" + } + } + }, + "Certificate": { + "name": { + "title": "label.certificate-name-display-only", + "description": "tooltip.certificate-name", + "type": "string" + }, + "type": { + "title": "label.type", + "description": "tooltip.certificate-type", + "type": "string", + "oneOf": [ + { + "enum": [ + "signing" + ], + "description": "value.signing" + }, + { + "enum": [ + "encryption" + ], + "description": "value.encryption" + }, + { + "enum": [ + "both" + ], + "description": "value.both" + } + ], + "default": "both" + }, + "value": { + "title": "label.certificate", + "description": "tooltip.certificate", + "type": "string" + } + }, + "AssertionConsumerService": { + "type": "object", + "properties": { + "locationUrl": { + "title": "label.assertion-consumer-services-location", + "description": "tooltip.assertion-consumer-service-location", + "type": "string", + "widget": { + "id": "string", + "help": "message.valid-url" + } + }, + "binding": { + "title": "label.assertion-consumer-service-location-binding", + "description": "tooltip.assertion-consumer-service-location-binding", + "type": "string", + "oneOf": [ + { + "enum": [ + "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + ], + "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + }, + { + "enum": [ + "urn:oasis:names:tc:SAML:1.0:profiles:browser-post" + ], + "description": "urn:oasis:names:tc:SAML:1.0:profiles:browser-post" + } + ] + }, + "makeDefault": { + "title": "label.mark-as-default", + "description": "tooltip.mark-as-default", + "type": "boolean" + } + } + }, + "NameIdFormatList": { + "title": "label.nameid-format-to-send", + "placeholder": "label.nameid-format", + "description": "tooltip.nameid-format", + "type": "array", + "uniqueItems": true, + "items": { + "type": "string", + "widget": "datalist", + "data": [ + "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", + "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", + "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent", + "urn:oasis:names:tc:SAML:2.0:nameid-format:transient" + ] + }, + "default": null + }, + "AuthenticationMethodList": { + "title": "label.authentication-methods-to-use", + "description": "tooltip.authentication-methods-to-use", + "type": "array", + "placeholder": "label.authentication-method", + "uniqueItems": true, + "items": { + "type": "string", + "title": "label.authentication-method", + "widget": { + "id": "datalist", + "data": [ + "https://refeds.org/profile/mfa", + "urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken", + "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" + ] + } + }, + "default": null + }, + "LogoutEndpoint": { + "title": "label.new-endpoint", + "description": "tooltip.new-endpoint", + "type": "object", + "properties": { + "url": { + "title": "label.url", + "description": "tooltip.url", + "type": "string" + }, + "bindingType": { + "title": "label.binding-type", + "description": "tooltip.binding-type", + "type": "string", + "oneOf": [ + { + "enum": [ + "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + ], + "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + }, + { + "enum": [ + "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + ], + "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + } + ] + + } + } + } + } +} \ No newline at end of file diff --git a/backend/src/test/resources/metadata-sources-ui-schema_MALFORMED.json b/backend/src/test/resources/metadata-sources-ui-schema_MALFORMED.json new file mode 100644 index 000000000..cef1eb4d9 --- /dev/null +++ b/backend/src/test/resources/metadata-sources-ui-schema_MALFORMED.json @@ -0,0 +1 @@ +This is invalid JSON \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..48e341a09 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/ui/package-lock.json b/ui/package-lock.json index 4850aa82f..f2aba6f0c 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -3456,6 +3456,11 @@ "resolved": "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz", "integrity": "sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==" }, + "deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==" + }, "default-require-extensions": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", @@ -6840,9 +6845,9 @@ } }, "jasmine-core": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.6.4.tgz", - "integrity": "sha1-3skmzQqfoof7bbXHVfpIfnTOysU=", + "version": "2.99.1", + "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz", + "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=", "dev": true }, "jasmine-marbles": { @@ -7048,9 +7053,9 @@ } }, "karma-jasmine": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.1.tgz", - "integrity": "sha1-b+hA51oRYAydkehLM8RY4cRqNSk=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz", + "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=", "dev": true }, "karma-jasmine-html-reporter": { @@ -7059,7 +7064,7 @@ "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=", "dev": true, "requires": { - "karma-jasmine": "1.1.1" + "karma-jasmine": "1.1.2" } }, "karma-phantomjs-launcher": { @@ -7956,9 +7961,9 @@ "dev": true }, "ngx-schema-form": { - "version": "2.0.0-beta.3", - "resolved": "https://registry.npmjs.org/ngx-schema-form/-/ngx-schema-form-2.0.0-beta.3.tgz", - "integrity": "sha512-t545QEm16G4kdHFq4VOfmn0ICVwE6v+WAeQ5Bw1ur21U6U6n5q1srImQtefmGdqx69kl1sNwLJLF7Zm8UhJZCg==", + "version": "2.2.0-beta.1", + "resolved": "https://registry.npmjs.org/ngx-schema-form/-/ngx-schema-form-2.2.0-beta.1.tgz", + "integrity": "sha512-tNJR/rFEU2zHAOKOl47ujqM/7y08x8slPYyozgUgKt6aJa5JATqzf2Ee0WAF0fYrJzN4diF1fpNWHYqoA3qDGg==", "requires": { "tslib": "1.9.3" }, diff --git a/ui/package.json b/ui/package.json index b02a3f394..ed5f531dc 100644 --- a/ui/package.json +++ b/ui/package.json @@ -32,9 +32,10 @@ "bootstrap": "4.1.1", "core-js": "^2.4.1", "deep-object-diff": "^1.1.0", + "deepmerge": "^2.2.1", "file-saver": "^1.3.3", "font-awesome": "^4.7.0", - "ngx-schema-form": "^2.0.0-beta.3", + "ngx-schema-form": "^2.2.0-beta.1", "rxjs": "^6.1.0", "rxjs-compat": "^6.1.0", "xml-formatter": "^1.0.1", @@ -51,7 +52,7 @@ "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", "codelyzer": "~4.2.1", - "jasmine-core": "~2.6.2", + "jasmine-core": "~2.99.0", "jasmine-marbles": "^0.3.1", "jasmine-spec-reporter": "~4.1.0", "karma": "~1.7.0", diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index cd56856e3..f09ae298a 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -85,12 +85,12 @@ diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 6d54d350a..0131b06df 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -24,7 +24,6 @@ import { SharedModule } from './shared/shared.module'; import { WizardModule } from './wizard/wizard.module'; import { FormModule } from './schema-form/schema-form.module'; import { environment } from '../environments/environment.prod'; -import { getCurrentLocale } from './shared/util'; import { I18nModule } from './i18n/i18n.module'; @NgModule({ diff --git a/ui/src/app/core/action/user.action.ts b/ui/src/app/core/action/user.action.ts index adf35f1a9..2aa273f9a 100644 --- a/ui/src/app/core/action/user.action.ts +++ b/ui/src/app/core/action/user.action.ts @@ -24,7 +24,7 @@ export class UserLoadSuccessAction implements Action { export class UserLoadErrorAction implements Action { readonly type = USER_LOAD_ERROR; - constructor(public payload: { message: string, type: string }) { } + constructor(public payload: { message: string }) { } } export class UserRedirect implements Action { diff --git a/ui/src/app/core/effect/user.effect.spec.ts b/ui/src/app/core/effect/user.effect.spec.ts new file mode 100644 index 000000000..9e67b9665 --- /dev/null +++ b/ui/src/app/core/effect/user.effect.spec.ts @@ -0,0 +1,57 @@ +import { TestBed } from '@angular/core/testing'; +import { provideMockActions } from '@ngrx/effects/testing'; +import { ReplaySubject } from 'rxjs/ReplaySubject'; + +import { UserEffects } from './user.effect'; +import { + UserLoadRequestAction, + UserLoadSuccessAction, + UserLoadErrorAction +} from '../action/user.action'; +import { Subject, of, throwError } from 'rxjs'; +import { UserService } from '../service/user.service'; +import { User } from '../model/user'; + +describe('User Effects', () => { + let effects: UserEffects; + let actions: Subject; + let userService: UserService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [], + providers: [ + UserEffects, + UserService, + provideMockActions(() => actions), + ], + }); + + effects = TestBed.get(UserEffects); + userService = TestBed.get(UserService); + }); + + it('should fire a success action', () => { + let user = {}; + spyOn(userService, 'get').and.returnValue(of(user)); + actions = new ReplaySubject(1); + + actions.next(new UserLoadRequestAction()); + + effects.loadUser$.subscribe(result => { + expect(result).toEqual(new UserLoadSuccessAction(user as User)); + }); + }); + + it('should fire an error action', () => { + let err = new Error('404'); + spyOn(userService, 'get').and.returnValue(throwError(err)); + actions = new ReplaySubject(1); + + actions.next(new UserLoadRequestAction()); + + effects.loadUser$.subscribe(result => { + expect(result).toEqual(new UserLoadErrorAction(err)); + }); + }); +}); diff --git a/ui/src/app/core/effect/version.effect.spec.ts b/ui/src/app/core/effect/version.effect.spec.ts new file mode 100644 index 000000000..df8c47f50 --- /dev/null +++ b/ui/src/app/core/effect/version.effect.spec.ts @@ -0,0 +1,59 @@ +import { TestBed } from '@angular/core/testing'; +import { provideMockActions } from '@ngrx/effects/testing'; +import { ReplaySubject } from 'rxjs/ReplaySubject'; + +import { VersionEffects } from './version.effect'; +import { + VersionInfoLoadRequestAction, + VersionInfoLoadSuccessAction, + VersionInfoLoadErrorAction +} from '../action/version.action'; +import { Subject, of, throwError } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; +import { VersionInfo } from '../model/version'; + +describe('Version Effects', () => { + let effects: VersionEffects; + let actions: Subject; + let httpClient = { + get: () => of({}) + }; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [], + providers: [ + { provide: HttpClient, useValue: httpClient }, + VersionEffects, + provideMockActions(() => actions), + ], + }); + + effects = TestBed.get(VersionEffects); + httpClient = TestBed.get(HttpClient); + }); + + it('should fire a success action', () => { + let v = {}; + spyOn(httpClient, 'get').and.returnValue(of({})); + actions = new ReplaySubject(1); + + actions.next(new VersionInfoLoadRequestAction()); + + effects.loadVersionInfo$.subscribe(result => { + expect(result).toEqual(new VersionInfoLoadSuccessAction(v as VersionInfo)); + }); + }); + + it('should fire an error action', () => { + let err = new Error('404'); + spyOn(httpClient, 'get').and.returnValue(throwError(err)); + actions = new ReplaySubject(1); + + actions.next(new VersionInfoLoadRequestAction()); + + effects.loadVersionInfo$.subscribe(result => { + expect(result).toEqual(new VersionInfoLoadErrorAction(err)); + }); + }); +}); diff --git a/ui/src/app/core/service/can-deactivate.guard.spec.ts b/ui/src/app/core/service/can-deactivate.guard.spec.ts new file mode 100644 index 000000000..a9ede461f --- /dev/null +++ b/ui/src/app/core/service/can-deactivate.guard.spec.ts @@ -0,0 +1,49 @@ +import { TestBed } from '@angular/core/testing'; +import { CanDeactivateGuard, CanComponentDeactivate } from './can-deactivate.guard'; +import { ActivatedRouteStub } from '../../../testing/activated-route.stub'; + +describe('Can Deactivate Guard Service', () => { + let service: CanDeactivateGuard; + let guarded: CanComponentDeactivate; + let notGuarded: any; + + let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub(); + let child: ActivatedRouteStub = new ActivatedRouteStub(); + child.testParamMap = { form: 'common' }; + activatedRoute.firstChild = child; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [], + providers: [ + CanDeactivateGuard + ] + }); + service = TestBed.get(CanDeactivateGuard); + + guarded = { + canDeactivate: (currentRoute, currentState, nextState) => { + return true; + } + }; + notGuarded = {}; + }); + + it('should instantiate', () => { + expect(service).toBeDefined(); + }); + + describe('canDeactivate', () => { + it('should check if the component has a canDeactivate method', () => { + spyOn(guarded, 'canDeactivate'); + expect(service.canDeactivate(notGuarded, null, null, null)).toBe(true); + service.canDeactivate(guarded, null, null, null); + expect(guarded.canDeactivate).toHaveBeenCalled(); + }); + + it('should return components result', () => { + spyOn(guarded, 'canDeactivate').and.returnValue(false); + expect(service.canDeactivate(guarded, null, null, null)).toBe(false); + }); + }); +}); diff --git a/ui/src/app/core/service/modal.service.spec.ts b/ui/src/app/core/service/modal.service.spec.ts new file mode 100644 index 000000000..6b7d8bbe2 --- /dev/null +++ b/ui/src/app/core/service/modal.service.spec.ts @@ -0,0 +1,51 @@ +import { TestBed } from '@angular/core/testing'; +import { NgbModalModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'; + +import { ModalService } from './modal.service'; + +describe('Modal Service', () => { + let service: ModalService; + let ngbModal: NgbModal; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + NgbModalModule.forRoot() + ], + providers: [ + ModalService + ] + }); + service = TestBed.get(ModalService); + ngbModal = TestBed.get(NgbModal); + }); + + it('should instantiate', () => { + expect(service).toBeDefined(); + }); + + describe('modal.open method', () => { + it('should open a new modal', () => { + spyOn(ngbModal, 'open').and.callThrough(); + service.open(`
`, {}); + expect(ngbModal.open).toHaveBeenCalled(); + }); + + it('should not add inputs to a modals scope if not provided a component', () => { + spyOn(ngbModal, 'open').and.callThrough(); + service.open(`
`, {}, { foo: 'bar' }); + expect(ngbModal.open).toHaveBeenCalled(); + }); + + it('should accept inputs to add to a new modals scope', () => { + spyOn(ngbModal, 'open').and.callFake(() => { + return { + result: Promise.resolve({}), + componentInstance: {} + }; + }); + service.open(`
`, {}, { foo: 'bar' }); + expect(ngbModal.open).toHaveBeenCalled(); + }); + }); +}); diff --git a/ui/src/app/core/service/modal.service.ts b/ui/src/app/core/service/modal.service.ts index b43e197ef..955773b89 100644 --- a/ui/src/app/core/service/modal.service.ts +++ b/ui/src/app/core/service/modal.service.ts @@ -19,7 +19,9 @@ export class ModalService { let modal = this.modal.open(content, { ...options }); - Object.keys(inputs).forEach(key => modal.componentInstance[key] = inputs[key]); + if (modal.hasOwnProperty('componentInstance')) { + Object.keys(inputs).forEach(key => modal.componentInstance[key] = inputs[key]); + } return fromPromise(modal.result); } } /* istanbul ignore next */ diff --git a/ui/src/app/i18n/action/message.action.ts b/ui/src/app/i18n/action/message.action.ts index 49b274957..4949f7357 100644 --- a/ui/src/app/i18n/action/message.action.ts +++ b/ui/src/app/i18n/action/message.action.ts @@ -23,7 +23,7 @@ export class MessagesLoadSuccessAction implements Action { export class MessagesLoadErrorAction implements Action { readonly type = MessagesActionTypes.MESSAGES_LOAD_ERROR; - constructor(public payload: { message: string, type: string }) { } + constructor(public payload: { message: string }) { } } export class SetLocale implements Action { diff --git a/ui/src/app/i18n/effect/message.effect.spec.ts b/ui/src/app/i18n/effect/message.effect.spec.ts new file mode 100644 index 000000000..b9686df16 --- /dev/null +++ b/ui/src/app/i18n/effect/message.effect.spec.ts @@ -0,0 +1,75 @@ +import { TestBed } from '@angular/core/testing'; +import { provideMockActions } from '@ngrx/effects/testing'; +import { ReplaySubject } from 'rxjs/ReplaySubject'; + +import { MessageEffects } from './message.effect'; + +import { Subject, of, throwError } from 'rxjs'; +import { MessagesLoadRequestAction, MessagesLoadSuccessAction, MessagesLoadErrorAction } from '../action/message.action'; +import { I18nService } from '../service/i18n.service'; +import { StoreModule, combineReducers, Store } from '@ngrx/store'; +import * as fromI18n from '../reducer'; + +xdescribe('I18n Message Effects', () => { + let effects: MessageEffects; + let actions: Subject; + let i18nService: I18nService; + let store: Store; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + StoreModule.forRoot({ + core: combineReducers(fromI18n.reducers, { + messages: { + fetching: false, + messages: null, + error: null, + locale: 'en-US' + } + }) + }), + ], + providers: [ + { + provide: I18nService, useValue: { + get: (locale: string) => of({}) + } + }, + MessageEffects, + provideMockActions(() => actions), + ], + }); + + effects = TestBed.get(MessageEffects); + i18nService = TestBed.get(I18nService); + store = TestBed.get(Store); + spyOn(store, 'dispatch'); + }); + + it('should fire a success action', () => { + let msgs = {}; + spyOn(i18nService, 'get').and.returnValue(of(msgs)); + spyOn(store, 'select').and.returnValue(of('en_US')); + actions = new ReplaySubject(1); + + actions.next(new MessagesLoadRequestAction()); + + effects.loadMessages$.subscribe(result => { + expect(result).toEqual(new MessagesLoadSuccessAction(msgs)); + }); + }); + + it('should fire an error action', () => { + let err = new Error('404'); + spyOn(i18nService, 'get').and.returnValue(throwError(err)); + spyOn(store, 'select').and.returnValue(of('en_US')); + actions = new ReplaySubject(1); + + actions.next(new MessagesLoadRequestAction()); + + effects.loadMessages$.subscribe(result => { + expect(result).toEqual(new MessagesLoadErrorAction(err)); + }); + }); +}); diff --git a/ui/src/app/i18n/effect/message.effect.ts b/ui/src/app/i18n/effect/message.effect.ts index 04efbe330..af34c50b6 100644 --- a/ui/src/app/i18n/effect/message.effect.ts +++ b/ui/src/app/i18n/effect/message.effect.ts @@ -15,6 +15,9 @@ import { I18nService } from '../service/i18n.service'; import * as fromCore from '../reducer'; import { Store } from '@ngrx/store'; +// The tests for this succeed but a Jasmine error is thrown in afterAll +// TODO: Research afterAll error in Jasmine + /* istanbul ignore next */ @Injectable() export class MessageEffects { @@ -25,13 +28,13 @@ export class MessageEffects { this.store.select(fromCore.getLocale) ), map(([action, locale]) => locale.replace('-', '_')), - switchMap(locale => - this.i18nService.get(locale) + switchMap(locale => { + return this.i18nService.get(locale) .pipe( map(u => new MessagesLoadSuccessAction({ ...u })), catchError(error => of(new MessagesLoadErrorAction(error))) - ) - ) + ); + }) ); @Effect() setLanguage$ = this.actions$.pipe( diff --git a/ui/src/app/metadata/provider/component/provider-editor-nav.component.html b/ui/src/app/metadata/domain/component/editor-nav.component.html similarity index 69% rename from ui/src/app/metadata/provider/component/provider-editor-nav.component.html rename to ui/src/app/metadata/domain/component/editor-nav.component.html index 8fbbccefb..9fe804c85 100644 --- a/ui/src/app/metadata/provider/component/provider-editor-nav.component.html +++ b/ui/src/app/metadata/domain/component/editor-nav.component.html @@ -20,18 +20,10 @@ [attr.aria-label]="route.label" role="button"> - +
- - Filter List - + @@ -45,20 +37,14 @@ [attr.aria-label]="route.label">
diff --git a/ui/src/app/metadata/provider/component/provider-editor-nav.component.spec.ts b/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts similarity index 83% rename from ui/src/app/metadata/provider/component/provider-editor-nav.component.spec.ts rename to ui/src/app/metadata/domain/component/editor-nav.component.spec.ts index a43fe52d3..755e61205 100644 --- a/ui/src/app/metadata/provider/component/provider-editor-nav.component.spec.ts +++ b/ui/src/app/metadata/domain/component/editor-nav.component.spec.ts @@ -5,32 +5,31 @@ import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; -import * as fromRoot from '../reducer'; import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form'; import * as fromWizard from '../../../wizard/reducer'; -import { ProviderEditorNavComponent, NAV_FORMATS } from './provider-editor-nav.component'; +import { EditorNavComponent, NAV_FORMATS } from './editor-nav.component'; import { ValidFormIconComponent } from '../../../shared/component/valid-form-icon.component'; import { WizardStep } from '../../../wizard/model'; import { MockI18nModule } from '../../../../testing/i18n.stub'; @Component({ template: ` - + ` }) class TestHostComponent { - @ViewChild(ProviderEditorNavComponent) - public componentUnderTest: ProviderEditorNavComponent; + @ViewChild(EditorNavComponent) + public componentUnderTest: EditorNavComponent; public format = NAV_FORMATS; } -describe('Provider Editor Nav Component', () => { +describe('Editor Nav Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let app: ProviderEditorNavComponent; - let store: Store; + let app: EditorNavComponent; + let store: Store; let step: WizardStep = { id: 'common', @@ -47,13 +46,12 @@ describe('Provider Editor Nav Component', () => { RouterTestingModule, SchemaFormModule.forRoot(), StoreModule.forRoot({ - provider: combineReducers(fromRoot.reducers), wizard: combineReducers(fromWizard.reducers) }), MockI18nModule ], declarations: [ - ProviderEditorNavComponent, + EditorNavComponent, ValidFormIconComponent, TestHostComponent ], diff --git a/ui/src/app/metadata/provider/component/provider-editor-nav.component.ts b/ui/src/app/metadata/domain/component/editor-nav.component.ts similarity index 68% rename from ui/src/app/metadata/provider/component/provider-editor-nav.component.ts rename to ui/src/app/metadata/domain/component/editor-nav.component.ts index b341364e2..0aa47c088 100644 --- a/ui/src/app/metadata/provider/component/provider-editor-nav.component.ts +++ b/ui/src/app/metadata/domain/component/editor-nav.component.ts @@ -4,10 +4,8 @@ import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { skipWhile, combineLatest, map } from 'rxjs/operators'; -import * as fromProvider from '../reducer'; -import { WizardStep, Wizard } from '../../../wizard/model'; +import { WizardStep } from '../../../wizard/model'; import * as fromWizard from '../../../wizard/reducer'; -import { MetadataProvider } from '../../domain/model'; export enum NAV_FORMATS { DROPDOWN = 'NAV_DROPDOWN', @@ -15,13 +13,14 @@ export enum NAV_FORMATS { } @Component({ - selector: 'provider-editor-nav', - templateUrl: './provider-editor-nav.component.html', + selector: 'editor-nav', + templateUrl: './editor-nav.component.html', styleUrls: [] }) -export class ProviderEditorNavComponent { +export class EditorNavComponent { @Input() format: string; + @Input() status: string[] = []; @Output() onPageSelect: EventEmitter = new EventEmitter(); @@ -32,26 +31,19 @@ export class ProviderEditorNavComponent { current$: Observable; index$: Observable; - invalidForms$: Observable; routes$: Observable<{ path: string, label: string }[]>; getFilterId = p => p ? p.id : 'filters'; getFilterLabel = p => p ? p.label : 'Filter List'; constructor( - private store: Store + private store: Store ) { this.index$ = this.store.select(fromWizard.getWizardIndex).pipe(skipWhile(i => !i)); this.routes$ = this.store.select(fromWizard.getRoutes); this.current$ = this.store.select(fromWizard.getCurrent); this.currentPage$ = this.current$.pipe(map(this.getFilterId)); - this.currentLabel$ = this.current$.pipe(map(this.getFilterLabel)); - this.invalidForms$ = this.store.select(fromProvider.getInvalidEditorForms); - } - - gotoPage(page: string = ''): void { - this.onPageSelect.emit(page); } } diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html deleted file mode 100644 index e7e9399bb..000000000 --- a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.html +++ /dev/null @@ -1,214 +0,0 @@ -
-
-
-
-
- - - - -
- -
-
-
- - - - -
- -
-
-
- - -
-
-
-
-
- - - - -
- -
-
-
- - - - -
- -
-
-
- - - - -
- -
-
-

- * These three fields must all be entered if any single field has a value. -

-
-
-

- Contact Information:   - -

-
- -
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts deleted file mode 100644 index 424b4d2d2..000000000 --- a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.spec.ts +++ /dev/null @@ -1,105 +0,0 @@ -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ViewChild, Component } from '@angular/core'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { Observable, of } from 'rxjs'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { AdvancedInfoFormComponent } from './advanced-info-form.component'; -import * as stubs from '../../../../../testing/resolver.stub'; -import { FileBackedHttpMetadataResolver } from '../../entity'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -@Component({ - template: `` -}) -class TestHostComponent { - - ids$: Observable = of(['foo']); - resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver, - serviceProviderSsoDescriptor: { - protocolSupportEnum: 'foo', - nameIdFormats: [] - } - }); - - @ViewChild(AdvancedInfoFormComponent) - public formUnderTest: AdvancedInfoFormComponent; - - changeProvider(opts: any): void { - this.resolver = Object.assign({}, this.resolver, opts); - } - - addFormat(value: string): void { - this.resolver.serviceProviderSsoDescriptor.nameIdFormats.push(value); - } -} - - -describe('Advanced Info Form Component', () => { - let fixture: ComponentFixture; - let instance: TestHostComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockI18nModule, - MockSharedModule - ], - declarations: [ - AdvancedInfoFormComponent, - TestHostComponent - ], - }); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('ngOnChanges method', () => { - it('should set properties on the resolver', () => { - instance.changeProvider(stubs.resolver); - fixture.detectChanges(); - expect(instance.formUnderTest.resolver.organization).toEqual({}); - expect(instance.formUnderTest.resolver.contacts).toEqual([]); - }); - }); - - describe('removeContact method', () => { - it('should remove the contact at the given index', () => { - instance.changeProvider({ - ...stubs.resolver, - contacts: [stubs.contact] - }); - fixture.detectChanges(); - instance.formUnderTest.removeContact(0); - expect(instance.formUnderTest.contacts.length).toBe(0); - }); - }); - - describe('addContact method', () => { - it('should remove the contact at the given index', () => { - instance.changeProvider({ - ...stubs.resolver, - contacts: [stubs.contact] - }); - fixture.detectChanges(); - instance.formUnderTest.addContact(); - expect(instance.formUnderTest.contacts.length).toBe(2); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts deleted file mode 100644 index d0ce28c2c..000000000 --- a/ui/src/app/metadata/domain/component/forms/advanced-info-form.component.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy, EventEmitter } from '@angular/core'; -import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms'; -import { Observable, Subscription, of } from 'rxjs'; -import { takeUntil, switchMap, map, startWith } from 'rxjs/operators'; - -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver, Contact } from '../../../domain/model'; -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { EntityValidators } from '../../../domain/service/entity-validators.service'; - -@Component({ - selector: 'adv-info-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './advanced-info-form.component.html' -}) -export class AdvancedInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - @Input() ids: Observable; - - contactTypes: string[] = [ - 'support', - 'technical', - 'administrative', - 'other' - ]; - - form: FormGroup; - - hasValue$: Observable; - totalValue$: Observable; - - private validationSubscription: Subscription; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - let orgEmitter$ = this.valueEmitter.changeEmitted$.pipe( - takeUntil(this.ngUnsubscribe), - switchMap(changes => of(changes.organization)) - ); - this.form = this.fb.group({ - entityId: ['', Validators.required], - serviceProviderName: ['', Validators.required], - serviceEnabled: [false], - organization: this.fb.group({ - name: [''], - displayName: [''], - url: [''] - }, { asyncValidator: EntityValidators.createOrgValidator() }), - contacts: this.fb.array([]) - }); - } - - ngOnInit(): void { - super.ngOnInit(); - - this.hasValue$ = this.form - .get('organization') - .valueChanges.pipe( - startWith(this.form.get('organization').value), - map(values => Object.keys(values).reduce((coll, key) => coll + (values[key] || ''), '')), - map(value => !!value) - ); - - this.form - .get('entityId') - .setAsyncValidators( - EntityValidators.createUniqueIdValidator(this.ids) - ); - } - - ngOnChanges(): void { - this.resolver.organization = this.resolver.organization || {}; - this.resolver.contacts = this.resolver.contacts || []; - this.form.reset({ - serviceProviderName: this.resolver.serviceProviderName, - serviceEnabled: this.resolver.serviceEnabled, - entityId: this.resolver.entityId, - organization: this.resolver.organization - }); - this.setContacts(this.resolver.contacts); - } - - get contacts(): FormArray { - return this.form.get('contacts') as FormArray; - } - - setContacts(contacts: Contact[] = []): void { - let fgs = contacts.map(contact => this.getContact(contact)), - list = this.fb.array(fgs); - this.form.setControl('contacts', list); - } - - addContact(): void { - this.contacts.push(this.getContact()); - } - - getContact(contact: Contact = {} as Contact): FormGroup { - return this.fb.group({ - type: [contact.type || null, Validators.required], - name: [contact.name || null, Validators.required], - emailAddress: [contact.emailAddress || null, [Validators.required, Validators.email]] - }); - } - - removeContact(index: number): void { - this.contacts.removeAt(index); - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/assertion-form.component.html b/ui/src/app/metadata/domain/component/forms/assertion-form.component.html deleted file mode 100644 index 8cf76147a..000000000 --- a/ui/src/app/metadata/domain/component/forms/assertion-form.component.html +++ /dev/null @@ -1,102 +0,0 @@ -
-
-
-

- Assertion Consumer Service Endpoints:    - -

-
- -
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts deleted file mode 100644 index fafa644c2..000000000 --- a/ui/src/app/metadata/domain/component/forms/assertion-form.component.spec.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { AssertionFormComponent } from './assertion-form.component'; -import * as stubs from '../../../../../testing/resolver.stub'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -describe('Assertion Form Component', () => { - let fixture: ComponentFixture; - let instance: AssertionFormComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - AssertionFormComponent - ], - }); - - fixture = TestBed.createComponent(AssertionFormComponent); - instance = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('ngOnChanges method', () => { - it('should set properties on the provider', () => { - instance.resolver = stubs.resolver; - fixture.detectChanges(); - instance.ngOnChanges(); - expect(instance.resolver.assertionConsumerServices).toEqual([]); - }); - }); - - describe('removeEndpoint method', () => { - it('should remove the endpoint at the given index', () => { - instance.resolver = { - ...stubs.resolver, - assertionConsumerServices: [stubs.endpoint] - }; - fixture.detectChanges(); - instance.ngOnChanges(); - instance.removeEndpoint(0); - expect(instance.assertionConsumerServices.length).toBe(0); - }); - }); - - describe('addEndpoint method', () => { - it('should remove the endpoint at the given index', () => { - instance.resolver = { - ...stubs.resolver, - assertionConsumerServices: [stubs.endpoint] - }; - fixture.detectChanges(); - instance.ngOnChanges(); - instance.addEndpoint(); - expect(instance.assertionConsumerServices.length).toBe(2); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/assertion-form.component.ts b/ui/src/app/metadata/domain/component/forms/assertion-form.component.ts deleted file mode 100644 index a3ce408b8..000000000 --- a/ui/src/app/metadata/domain/component/forms/assertion-form.component.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, FormGroup, FormArray, AbstractControl } from '@angular/forms'; - -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; - -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { SsoService, MetadataResolver } from '../../../domain/model/'; - -@Component({ - selector: 'assertion-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './assertion-form.component.html' -}) -export class AssertionFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - form: FormGroup; - - bindingTypes: string[] = [ - 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST', - 'urn:oasis:names:tc:SAML:1.0:profiles:browser-post' - ]; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - assertionConsumerServices: this.fb.array([]) - }); - } - - get assertionConsumerServices(): FormArray { - return this.form.get('assertionConsumerServices') as FormArray; - } - - setEndpoints(endpoints: SsoService[] = []): void { - let fgs = endpoints.map(ep => this.fb.group(ep)), - list = this.fb.array(fgs); - this.form.setControl('assertionConsumerServices', list); - } - - addEndpoint(): void { - this.assertionConsumerServices.push(this.fb.group({ - binding: null, - locationUrl: [''], - makeDefault: false - })); - } - - removeEndpoint(index: number): void { - this.assertionConsumerServices.removeAt(index); - } - - markAsDefault(endpoint: AbstractControl): void { - this.assertionConsumerServices.controls.forEach(element => { - element.patchValue({ - makeDefault: (endpoint === element) ? !endpoint.get('makeDefault').value : false - }); - }); - this.assertionConsumerServices.updateValueAndValidity(); - } - - ngOnChanges(): void { - this.resolver.assertionConsumerServices = this.resolver.assertionConsumerServices || []; - this.setEndpoints(this.resolver.assertionConsumerServices); - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.html b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.html deleted file mode 100644 index 9ee740517..000000000 --- a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.html +++ /dev/null @@ -1,53 +0,0 @@ -
- -
- - - - - - - - - - - - - - - - - - - - - -
Attribute NameYes
{{ attr.label }} -
-
- - -
-
-
Check All Attributes - -
Clear All Attributes - -
-
- -
\ No newline at end of file diff --git a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts deleted file mode 100644 index 9f9e3f04a..000000000 --- a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.spec.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { StoreModule, Store, combineReducers } from '@ngrx/store'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { AttributeReleaseFormComponent } from './attribute-release-form.component'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import * as stubs from '../../../../../testing/resolver.stub'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -describe('Attribute Release Form Component', () => { - let fixture: ComponentFixture; - let instance: AttributeReleaseFormComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - AttributeReleaseFormComponent - ], - }); - - fixture = TestBed.createComponent(AttributeReleaseFormComponent); - instance = fixture.componentInstance; - instance.resolver = { - ...stubs.resolver, - attributeRelease: [] - }; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('ngOnChanges method', () => { - it('should set properties on the provider', () => { - spyOn(instance, 'setAttributes'); - instance.ngOnChanges(); - expect(instance.resolver.attributeRelease).toEqual([]); - expect(instance.setAttributes).toHaveBeenCalled(); - }); - }); - - describe('onCheck method', () => { - it('should add the attribute to the list if checked', () => { - instance.onCheck({ target: { checked: true } }, 'foo'); - expect(instance.attributeRelease.length).toBe(1); - }); - it('should remove the attribute if not checked', () => { - spyOn(instance.attributeRelease, 'removeAt').and.callThrough(); - instance.onCheck({ target: { checked: false } }, 'foo'); - expect(instance.attributeRelease.removeAt).toHaveBeenCalled(); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts b/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts deleted file mode 100644 index 8a7d3a258..000000000 --- a/ui/src/app/metadata/domain/component/forms/attribute-release-form.component.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { Component, Output, Input, EventEmitter, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { Observable } from 'rxjs'; -import { last } from 'rxjs/operators'; - -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver } from '../../../domain/model'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { FormArray } from '@angular/forms/src/model'; - - -@Component({ - selector: 'attribute-release-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './attribute-release-form.component.html' -}) -export class AttributeReleaseFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - form: FormGroup; - attributesToRelease: any[]; - listOfAttributes$: Observable<{ key: string, label: string }[]>; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter, - protected listService: ListValuesService - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - attributeRelease: this.fb.array([]) - }); - } - - ngOnInit(): void { - super.ngOnInit(); - this.listOfAttributes$ = this.listService.attributesToRelease; - } - - ngOnChanges(): void { - this.resolver.attributeRelease = this.resolver.attributeRelease || []; - this.setAttributes(this.resolver.attributeRelease); - } - - get attributeRelease(): FormArray { - return this.form.get('attributeRelease') as FormArray; - } - - isChecked(attr): boolean { - return this.attributeRelease.controls.findIndex(control => control.value === attr) > -1; - } - - setAttributes(list: string[] = []): void { - let attrs = list.map(attr => this.fb.control(attr)); - const fbarray = this.fb.array(attrs); - this.form.setControl('attributeRelease', fbarray); - } - - onCheck($event, attr: string): void { - const checked = $event ? $event.target.checked : true; - if (checked) { - this.attributeRelease.push(this.fb.control(attr)); - } else { - const index = this.attributeRelease.controls.findIndex(control => control.value === attr); - this.attributeRelease.removeAt(index); - } - } - - onCheckAll(): void { - this.onCheckNone(); - this.listOfAttributes$.pipe(last()).subscribe(attrs => { - attrs.forEach(attr => this.onCheck(null, attr.key)); - }); - } - onCheckNone(event: Event | null = null): void { - if (event) { - event.preventDefault(); - } - while (this.attributeRelease.controls.length !== 0) { - this.attributeRelease.removeAt(0); - } - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.html b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.html deleted file mode 100644 index 6aac2a7b4..000000000 --- a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.html +++ /dev/null @@ -1,61 +0,0 @@ -
-
-
-
-
- - - - -
- -
-
-
- - NameID Format  - - - - - -
-
-
-
-
- - - -
-
- -
-
-
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts deleted file mode 100644 index 1481a0638..000000000 --- a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.spec.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { Component, ViewChild } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { FileBackedHttpMetadataResolver } from '../../../domain/entity'; -import { DescriptorInfoFormComponent } from './descriptor-info-form.component'; - -import * as stubs from '../../../../../testing/resolver.stub'; -import { SharedModule } from '../../../../shared/shared.module'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -@Component({ - template: `` -}) -class TestHostComponent { - resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver, - serviceProviderSsoDescriptor: { - protocolSupportEnum: 'foo', - nameIdFormats: [] - } - }); - - @ViewChild(DescriptorInfoFormComponent) - public formUnderTest: DescriptorInfoFormComponent; - - changeProvider(opts: any): void { - this.resolver = Object.assign({}, this.resolver, opts); - } - - addFormat(value: string): void { - this.resolver.serviceProviderSsoDescriptor.nameIdFormats.push(value); - } -} - -describe('Descriptor Info Form Component', () => { - let fixture: ComponentFixture; - let instance: TestHostComponent; - let form: DescriptorInfoFormComponent; - let fb: FormBuilder; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - DescriptorInfoFormComponent, - TestHostComponent - ], - }); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - form = instance.formUnderTest; - fb = TestBed.get(FormBuilder); - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('removeFormat method', () => { - it('should remove the nameid format at the given index', () => { - instance.addFormat('foo'); - fixture.detectChanges(); - form.removeFormat(0); - fixture.detectChanges(); - expect(form.nameIdFormats.length).toBe(0); - }); - }); - - describe('addFormat method', () => { - it('should add a new nameid format', () => { - form.addFormat(); - fixture.detectChanges(); - expect(form.nameIdFormats.length).toBe(1); - }); - }); - - describe('getRequiredControl method', () => { - it('should create a form control with the required validator attached', () => { - spyOn(fb, 'control').and.callThrough(); - form.getRequiredControl('foo'); - expect(fb.control).toHaveBeenCalledWith('foo', Validators.required); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts deleted file mode 100644 index 89a824bc5..000000000 --- a/ui/src/app/metadata/domain/component/forms/descriptor-info-form.component.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms'; -import { Observable, of } from 'rxjs'; - -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; - -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver } from '../../../domain/model'; -import { ListValuesService } from '../../../domain/service/list-values.service'; - -@Component({ - selector: 'descriptor-info-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './descriptor-info-form.component.html' -}) -export class DescriptorInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - form: FormGroup; - - nameIdFormatOptions: Observable = this.listValues.nameIdFormats; - - enumOptions: string[] = [ - 'SAML 2', - 'SAML 1.1' - ]; - - nameIds$: Observable = of([]); - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter, - private listValues: ListValuesService - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - serviceProviderSsoDescriptor: this.fb.group({ - protocolSupportEnum: null, - nameIdFormats: this.fb.array([]) - }) - }); - } - - ngOnChanges(): void { - let descriptor = this.resolver.serviceProviderSsoDescriptor; - this.form.reset({ - serviceProviderSsoDescriptor: descriptor || {} - }); - this.setNameIdFormats(descriptor ? descriptor.nameIdFormats : []); - } - - get nameIdFormats(): FormArray { - return this.form.get('serviceProviderSsoDescriptor.nameIdFormats') as FormArray; - } - - getRequiredControl = (name: string): FormControl => this.fb.control(name, Validators.required); - - setNameIdFormats(nameIdFormats: string[]): void { - let fcs = nameIdFormats.map(this.getRequiredControl), - list = this.fb.array(fcs), - group = this.form.get('serviceProviderSsoDescriptor') as FormGroup; - group.setControl('nameIdFormats', list); - } - - addFormat(text: string = ''): void { - this.nameIdFormats.push(this.fb.control(text, Validators.required)); - } - - removeFormat(index: number): void { - this.nameIdFormats.removeAt(index); - } - - updateOptions(query: string): void { - this.nameIds$ = this.listValues.searchFormats(of(query)); - } - -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/key-info-form.component.html b/ui/src/app/metadata/domain/component/forms/key-info-form.component.html deleted file mode 100644 index 6222434db..000000000 --- a/ui/src/app/metadata/domain/component/forms/key-info-form.component.html +++ /dev/null @@ -1,168 +0,0 @@ -
-
-
-
-
-
-   - - - -
-
-
- - -
-
- - -
-
-
-
-
-
-
-   - - - -
-
-
- - -
-
- - -
-
-
-
-
-
-
-   - - - -
-
-
- - -
-
- - -
-
-
-
-
-
-

- X509 Certificates:    - -

-
- -
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts deleted file mode 100644 index bdb50a4ed..000000000 --- a/ui/src/app/metadata/domain/component/forms/key-info-form.component.spec.ts +++ /dev/null @@ -1,135 +0,0 @@ -import { Component, ViewChild } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { KeyInfoFormComponent } from './key-info-form.component'; - -import * as stubs from '../../../../../testing/resolver.stub'; -import { FileBackedHttpMetadataResolver } from '../../entity'; -import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -@Component({ - template: `` -}) -class TestHostComponent { - resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver, - securityInfo: { - ...stubs.secInfo, - x509Certificates: [] - } - }); - - @ViewChild(KeyInfoFormComponent) - public formUnderTest: KeyInfoFormComponent; - - changeProvider(opts: any): void { - this.resolver = Object.assign({}, this.resolver, opts); - } -} - -describe('Security (Key) Info Form Component', () => { - let fixture: ComponentFixture; - let instance: TestHostComponent; - let form: KeyInfoFormComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - KeyInfoFormComponent, - TestHostComponent, - InputDefaultsDirective - ], - }).compileComponents(); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - form = instance.formUnderTest; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('removeCert method', () => { - it('should remove the certificate at the given index', () => { - instance.changeProvider({ - securityInfo: { - ...stubs.secInfo, - x509CertificateAvailable: true, - x509Certificates: [stubs.certificate] - } - }); - fixture.detectChanges(); - form.removeCert(0); - fixture.detectChanges(); - expect(form.x509Certificates.length).toBe(0); - }); - }); - - describe('addCert method', () => { - it('should remove the certificate at the given index', () => { - instance.changeProvider({ - securityInfo: { - ...stubs.secInfo, - x509CertificateAvailable: true - } - }); - fixture.detectChanges(); - form.addCert(); - fixture.detectChanges(); - expect(form.x509Certificates.length).toBe(1); - }); - }); - - describe('ngOnInit method', () => { - it('should remove certificates if there are none available', () => { - instance.changeProvider({ - securityInfo: { - ...stubs.secInfo, - x509Certificates: [stubs.certificate] - } - }); - fixture.detectChanges(); - expect(form.x509Certificates.length).toBe(0); - }); - }); - - describe('createGroup method', () => { - it('should return a FormGroup with the correct attributes', () => { - let group = form.createGroup(); - expect(Object.keys(group.controls)).toEqual(['name', 'type', 'value']); - }); - - it('should return a FormGroup with the provided attributes', () => { - let group = form.createGroup({ - name: 'foo', - type: 'signing', - value: 'bar' - }); - let controls = group.controls; - expect(controls.name.value).toEqual('foo'); - expect(controls.type.value).toEqual('signing'); - expect(controls.value.value).toEqual('bar'); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/key-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/key-info-form.component.ts deleted file mode 100644 index 882b7c330..000000000 --- a/ui/src/app/metadata/domain/component/forms/key-info-form.component.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms'; -import { Observable } from 'rxjs'; -import { distinctUntilChanged, map, takeUntil } from 'rxjs/operators'; - -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver, Certificate } from '../../../domain/model'; - -@Component({ - selector: 'key-info-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './key-info-form.component.html' -}) -export class KeyInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - hasCert$: Observable; - - form: FormGroup; - - types: string[] = [ - 'signing', - 'encryption', - 'both' - ]; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - securityInfo: this.fb.group({ - x509CertificateAvailable: [false], - authenticationRequestsSigned: [false], - wantAssertionsSigned: [false], - x509Certificates: this.fb.array([]) - }) - }); - } - - get x509Certificates(): FormArray { - return this.form.get('securityInfo.x509Certificates') as FormArray; - } - - createGroup(values: Certificate = {name: '', type: 'both', value: ''}): FormGroup { - return this.fb.group({ - name: [values.name || '', Validators.required], - type: [values.type || 'both', Validators.required], - value: [values.value || '', Validators.required] - }); - } - - setCertificates(certs: Certificate[] = []): void { - let fgs = certs.map(ep => this.createGroup(ep)), - list = this.fb.array(fgs, Validators.minLength(1)), - group = this.form.get('securityInfo') as FormGroup; - group.setControl('x509Certificates', list); - } - - addCert(): void { - this.x509Certificates.push(this.createGroup()); - } - - removeCert(index: number): void { - this.x509Certificates.removeAt(index); - } - - ngOnInit(): void { - super.ngOnInit(); - this.hasCert$ = this.form.valueChanges.pipe( - distinctUntilChanged(), - map(values => values.securityInfo.x509CertificateAvailable) - ); - - this.hasCert$.pipe( - takeUntil(this.ngUnsubscribe), - distinctUntilChanged() - ).subscribe(hasCert => { - if (hasCert && !this.x509Certificates.length) { - this.addCert(); - this.x509Certificates.setValidators(Validators.minLength(1)); - this.x509Certificates.updateValueAndValidity(); - } - if (!hasCert) { - while (this.x509Certificates.controls.length !== 0) { - this.removeCert(0); - } - } - }); - } - - ngOnChanges(): void { - this.form.reset({ - securityInfo: this.resolver.securityInfo || { - x509CertificateAvailable: false, - authenticationRequestsSigned: false, - wantAssertionsSigned: false - } - }); - if (this.resolver.securityInfo && this.resolver.securityInfo.x509CertificateAvailable) { - this.setCertificates(this.resolver.securityInfo.x509Certificates); - } - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/logout-form.component.html b/ui/src/app/metadata/domain/component/forms/logout-form.component.html deleted file mode 100644 index cf1f091ba..000000000 --- a/ui/src/app/metadata/domain/component/forms/logout-form.component.html +++ /dev/null @@ -1,65 +0,0 @@ -
-
-
-

- Logout Endpoints:   - -

-
- -
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts deleted file mode 100644 index dc13075a8..000000000 --- a/ui/src/app/metadata/domain/component/forms/logout-form.component.spec.ts +++ /dev/null @@ -1,138 +0,0 @@ -import { ViewChild, Component } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { LogoutFormComponent } from './logout-form.component'; - -import * as stubs from '../../../../../testing/resolver.stub'; -import { FileBackedHttpMetadataResolver } from '../../entity'; -import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -@Component({ - template: `` -}) -class TestHostComponent { - resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver, - logoutEndpoints: [stubs.logoutEndpoint] - }); - - @ViewChild(LogoutFormComponent) - public formUnderTest: LogoutFormComponent; - - changeProvider(opts: any): void { - this.resolver = Object.assign({}, this.resolver, opts); - } -} - -describe('Logout Endpoints Form Component', () => { - let fixture: ComponentFixture; - let instance: TestHostComponent; - let form: LogoutFormComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - LogoutFormComponent, - TestHostComponent, - InputDefaultsDirective - ], - }); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - form = instance.formUnderTest; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('ngOnInit method', () => { - it('should remove endpoints if there are none available', () => { - instance.changeProvider({ - logoutEndpoints: [] - }); - fixture.detectChanges(); - expect(form.logoutEndpoints.length).toBe(0); - }); - }); - - describe('ngOnChanges method', () => { - it('should add endpoints if provided', () => { - instance.resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver - }); - fixture.detectChanges(); - expect(form.logoutEndpoints.length).toBe(0); - }); - }); - - describe('setEndpoints method', () => { - it('should add endpoints if provided', () => { - form.setEndpoints(); - fixture.detectChanges(); - expect(form.form.get('logoutEndpoints')).toBeDefined(); - }); - }); - - describe('removeCert method', () => { - it('should remove the endpoint at the given index', () => { - instance.changeProvider({ - logoutEndpoints: [stubs.endpoint] - }); - fixture.detectChanges(); - form.removeEndpoint(0); - fixture.detectChanges(); - expect(form.logoutEndpoints.length).toBe(0); - }); - }); - - describe('addCert method', () => { - it('should remove the endpoint at the given index', () => { - instance.changeProvider({ - logoutEndpoints: [] - }); - fixture.detectChanges(); - form.addEndpoint(); - fixture.detectChanges(); - expect(form.logoutEndpoints.length).toBe(1); - }); - }); - - describe('createGroup method', () => { - it('should return a FormGroup with the correct attributes', () => { - let group = form.createGroup(); - expect(Object.keys(group.controls)).toEqual(['url', 'bindingType']); - }); - - it('should return a FormGroup with the provided attributes', () => { - let group = form.createGroup({ - url: 'foo', - bindingType: 'bar' - }); - let controls = group.controls; - expect(controls.url.value).toEqual('foo'); - expect(controls.bindingType.value).toEqual('bar'); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/logout-form.component.ts b/ui/src/app/metadata/domain/component/forms/logout-form.component.ts deleted file mode 100644 index 60b3b5f80..000000000 --- a/ui/src/app/metadata/domain/component/forms/logout-form.component.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms'; - -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver, LogoutEndpoint } from '../../../domain/model'; - -@Component({ - selector: 'logout-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './logout-form.component.html' -}) -export class LogoutFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - form: FormGroup; - - bindingTypes: string[] = [ - 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST', - 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect' - ]; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - logoutEndpoints: this.fb.array([]) - }); - } - - createGroup(ep: LogoutEndpoint = { url: '', bindingType: null }): FormGroup { - return this.fb.group({ - url: [ep.url || '', Validators.required], - bindingType: [ep.bindingType || null, Validators.required] - }); - } - - get logoutEndpoints(): FormArray { - return this.form.get('logoutEndpoints') as FormArray; - } - - setEndpoints(endpoints: LogoutEndpoint[] = []): void { - let fgs = endpoints.map(ep => this.createGroup(ep)), - list = this.fb.array(fgs); - this.form.setControl('logoutEndpoints', list); - } - - addEndpoint(): void { - this.logoutEndpoints.push(this.createGroup()); - } - - removeEndpoint(index: number): void { - this.logoutEndpoints.removeAt(index); - } - - ngOnChanges(): void { - this.resolver.logoutEndpoints = this.resolver.logoutEndpoints || []; - this.setEndpoints(this.resolver.logoutEndpoints); - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html deleted file mode 100644 index 44954aa1d..000000000 --- a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.html +++ /dev/null @@ -1,125 +0,0 @@ -
-
-
-
-
- - - - -
- -
-
-
- - - - -
- - Must be a valid URL -
-
-
- - - - -
- - - - {{ form.get('mdui.description').value ? form.get('mdui.description').value.length : '0' }} - - / - {{ descriptionMaxLength }} - -
-
-
-
-
- - - - -
- - Must be a valid URL -
-
-
- - - - -
- - Must be a valid URL -
-
-
-
-
- - - - -
- - Must be an integer equal to or greater than 0 -
-
-
-
-
- - - - -
- - Must be an integer equal to or greater than 0 -
-
-
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts deleted file mode 100644 index a09b3bd66..000000000 --- a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.spec.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { ViewChild, Component, Input } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { MetadataUiFormComponent } from './metadata-ui-form.component'; - -import * as stubs from '../../../../../testing/resolver.stub'; -import { FileBackedHttpMetadataResolver } from '../../entity'; -import { InputDefaultsDirective } from '../../../../shared/directive/input-defaults.directive'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -@Component({ - template: `` -}) -class TestHostComponent { - resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver - }); - - @ViewChild(MetadataUiFormComponent) - public formUnderTest: MetadataUiFormComponent; - - changeProvider(opts: any): void { - this.resolver = Object.assign({}, this.resolver, opts); - } -} - -describe('Metadata UI Form Component', () => { - let fixture: ComponentFixture; - let instance: TestHostComponent; - let form: MetadataUiFormComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - MetadataUiFormComponent, - TestHostComponent, - InputDefaultsDirective - ], - }); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - form = instance.formUnderTest; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('ngOnChanges lifecycle event', () => { - it('should set the mdui data with a default object when one is not provided', () => { - spyOn(form.form, 'reset'); - instance.changeProvider({}); - fixture.detectChanges(); - expect(form.form.reset).toHaveBeenCalledWith({mdui: {}}); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.ts b/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.ts deleted file mode 100644 index bde640cfc..000000000 --- a/ui/src/app/metadata/domain/component/forms/metadata-ui-form.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver } from '../../../domain/model'; -import * as patterns from '../../../../shared/regex'; - -@Component({ - selector: 'metadata-ui-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './metadata-ui-form.component.html' -}) -export class MetadataUiFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - descriptionMaxLength = this.defaultMaxLength; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - mdui: this.fb.group({ - displayName: '', - informationUrl: [''], - privacyStatementUrl: [''], - description: '', - logoUrl: [''], - logoHeight: [0, [Validators.min(0), Validators.pattern(patterns.INTEGER_REGEX)]], - logoWidth: [0, [Validators.min(0), Validators.pattern(patterns.INTEGER_REGEX)]] - }) - }); - } - - ngOnChanges(): void { - this.form.reset({ - mdui: this.resolver.mdui || {} - }); - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html deleted file mode 100644 index eab15cabf..000000000 --- a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.html +++ /dev/null @@ -1,138 +0,0 @@ -
-
-
-
-
- - - - -
- -
-
-
- - - - -
- -
-
-
- - - - -
- - Must be a valid URL -
-

- * These three fields must all be entered if any single field has a value. -

-
-
-

- Contact Information:    - -

-
- -
-
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts deleted file mode 100644 index c30c63f56..000000000 --- a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.spec.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { OrganizationInfoFormComponent } from './organization-info-form.component'; -import * as stubs from '../../../../../testing/resolver.stub'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - -describe('Organization Info Form Component', () => { - let fixture: ComponentFixture; - let instance: OrganizationInfoFormComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - OrganizationInfoFormComponent - ], - }); - - fixture = TestBed.createComponent(OrganizationInfoFormComponent); - instance = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('ngOnChanges method', () => { - it('should set properties on the provider', () => { - instance.resolver = stubs.resolver; - fixture.detectChanges(); - instance.ngOnChanges(); - expect(instance.resolver.organization).toEqual({}); - expect(instance.resolver.contacts).toEqual([]); - }); - }); - - describe('removeContact method', () => { - it('should remove the contact at the given index', () => { - instance.resolver = { - ...stubs.resolver, - contacts: [stubs.contact] - }; - fixture.detectChanges(); - instance.ngOnChanges(); - instance.removeContact(0); - expect(instance.contacts.length).toBe(0); - }); - }); - - describe('addContact method', () => { - it('should remove the contact at the given index', () => { - instance.resolver = { - ...stubs.resolver, - contacts: [stubs.contact] - }; - fixture.detectChanges(); - instance.ngOnChanges(); - instance.addContact(); - expect(instance.contacts.length).toBe(2); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts b/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts deleted file mode 100644 index 6051e4bbb..000000000 --- a/ui/src/app/metadata/domain/component/forms/organization-info-form.component.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy, EventEmitter } from '@angular/core'; -import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms'; -import { Observable, Subscription } from 'rxjs'; -import { startWith, map } from 'rxjs/operators'; - -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { MetadataResolver, Contact } from '../../../domain/model'; -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { EntityValidators } from '../../../domain/service/entity-validators.service'; - -@Component({ - selector: 'org-info-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './organization-info-form.component.html' -}) -export class OrganizationInfoFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - contactTypes: string[] = [ - 'support', - 'technical', - 'administrative', - 'other' - ]; - - form: FormGroup; - - hasValue$: Observable; - totalValue$: Observable; - - private validationSubscription: Subscription; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter - ) { - super(fb, statusEmitter, valueEmitter); - } - - createForm(): void { - this.form = this.fb.group({ - organization: this.fb.group({ - name: [''], - displayName: [''], - url: [''] - }, { asyncValidator: EntityValidators.createOrgValidator() }), - contacts: this.fb.array([]) - }); - } - - ngOnInit(): void { - super.ngOnInit(); - this.hasValue$ = this.form.get('organization').valueChanges.pipe( - startWith(this.form.get('organization').value), - map(values => Object.keys(values).reduce((coll, key) => coll + (values[key] || ''), '')), - map(value => !!value) - ); - } - - ngOnChanges(): void { - this.resolver.organization = this.resolver.organization || {}; - this.resolver.contacts = this.resolver.contacts || []; - this.form.reset({ - organization: this.resolver.organization - }); - this.setContacts(this.resolver.contacts); - } - - get contacts(): FormArray { - return this.form.get('contacts') as FormArray; - } - - setContacts(contacts: Contact[] = []): void { - let fgs = contacts.map(contact => this.getContact(contact)), - list = this.fb.array(fgs); - this.form.setControl('contacts', list); - } - - addContact(): void { - this.contacts.push(this.getContact()); - } - - getContact(contact: Contact = {} as Contact): FormGroup { - return this.fb.group({ - type: [contact.type || '', Validators.required], - name: [contact.name || '', Validators.required], - emailAddress: [contact.emailAddress || null, [Validators.required, Validators.email]] - }); - } - - removeContact(index: number): void { - this.contacts.removeAt(index); - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.html b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.html deleted file mode 100644 index 40387d505..000000000 --- a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.html +++ /dev/null @@ -1,148 +0,0 @@ -
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
- - NameID Format to Send -   - - - - - -
-
-
-
- - - -
-
- -
-
-
-
-
-
- - Authentication Methods to Use -   - - - - - -
-
-
-
- - - -
-
- -
-
-
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
- - - - -
- -
-
-
diff --git a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts deleted file mode 100644 index c12feca92..000000000 --- a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.spec.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { Component, ViewChild } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { ReactiveFormsModule, FormBuilder, Validators } from '@angular/forms'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ProviderValueEmitter, ProviderStatusEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { RelyingPartyFormComponent } from './relying-party-form.component'; -import * as stubs from '../../../../../testing/resolver.stub'; -import { SharedModule } from '../../../../shared/shared.module'; -import { FileBackedHttpMetadataResolver } from '../../entity'; -import { MockI18nModule } from '../../../../../testing/i18n.stub'; -import { MockListValueService } from '../../../../../testing/list-values.stub'; -import { MockSharedModule } from '../../../../../testing/shared.stub'; - - -@Component({ - template: `` -}) -class TestHostComponent { - resolver = new FileBackedHttpMetadataResolver({ - ...stubs.resolver, - relyingPartyOverrides: { - nameIdFormats: [], - authenticationMethods: [] - } - }); - - @ViewChild(RelyingPartyFormComponent) - public formUnderTest: RelyingPartyFormComponent; - - changeProvider(opts: any): void { - this.resolver = Object.assign({}, this.resolver, opts); - } - - addString(collection: 'nameIdFormats' | 'authenticationMethods', value: string): void { - this.resolver.relyingPartyOverrides[collection].push(value); - } -} - -describe('Relying Party Form Component', () => { - let fixture: ComponentFixture; - let instance: TestHostComponent; - let form: RelyingPartyFormComponent; - let fb: FormBuilder; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [ - ProviderValueEmitter, - ProviderStatusEmitter, - NgbPopoverConfig, - { provide: ListValuesService, useClass: MockListValueService } - ], - imports: [ - NoopAnimationsModule, - ReactiveFormsModule, - MockSharedModule, - MockI18nModule - ], - declarations: [ - RelyingPartyFormComponent, - TestHostComponent - ], - }); - - fixture = TestBed.createComponent(TestHostComponent); - fb = TestBed.get(FormBuilder); - instance = fixture.componentInstance; - form = instance.formUnderTest; - fixture.detectChanges(); - }); - - it('should compile', () => { - expect(fixture).toBeDefined(); - }); - - describe('removeFormat method', () => { - it('should remove the nameid format at the given index', () => { - instance.addString('nameIdFormats', 'foo'); - fixture.detectChanges(); - form.removeFormat(0); - fixture.detectChanges(); - expect(form.nameIdFormatList.length).toBe(0); - }); - }); - - describe('addFormat method', () => { - it('should add a new nameid format', () => { - form.addFormat(); - fixture.detectChanges(); - expect(form.nameIdFormatList.length).toBe(1); - }); - - it('should add a new nameid format with a value supplied', () => { - form.addFormat('foo'); - fixture.detectChanges(); - expect(form.nameIdFormatList.length).toBe(1); - }); - }); - - describe('removeAuthenticationMethod method', () => { - it('should remove the auth method at the given index', () => { - instance.addString('authenticationMethods', 'foo'); - fixture.detectChanges(); - form.removeAuthenticationMethod(0); - fixture.detectChanges(); - expect(form.authenticationMethodList.length).toBe(0); - }); - }); - - describe('addAuthenticationMethod method', () => { - it('should add a new auth method', () => { - form.addAuthenticationMethod(); - fixture.detectChanges(); - expect(form.authenticationMethodList.length).toBe(1); - }); - - it('should add a new auth method with provided value', () => { - form.addAuthenticationMethod('foo'); - fixture.detectChanges(); - expect(form.authenticationMethodList.length).toBe(1); - }); - }); - - describe('getRequiredControl method', () => { - it('should create a form control with the required validator attached', () => { - spyOn(fb, 'control').and.callThrough(); - form.getRequiredControl('foo'); - expect(fb.control).toHaveBeenCalledWith('foo', Validators.required); - }); - }); -}); diff --git a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.ts b/ui/src/app/metadata/domain/component/forms/relying-party-form.component.ts deleted file mode 100644 index fe4c15038..000000000 --- a/ui/src/app/metadata/domain/component/forms/relying-party-form.component.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { Component, Input, OnInit, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core'; -import { FormBuilder, FormGroup, FormControl, FormArray, Validators } from '@angular/forms'; -import { Observable, of } from 'rxjs'; - -import { ProviderFormFragmentComponent } from './provider-form-fragment.component'; -import { ProviderStatusEmitter, ProviderValueEmitter } from '../../../domain/service/provider-change-emitter.service'; -import { ListValuesService } from '../../../domain/service/list-values.service'; -import { MetadataResolver } from '../../../domain/model'; - - -@Component({ - selector: 'relying-party-form', - changeDetection: ChangeDetectionStrategy.OnPush, - templateUrl: './relying-party-form.component.html' -}) -export class RelyingPartyFormComponent extends ProviderFormFragmentComponent implements OnInit, OnChanges, OnDestroy { - @Input() resolver: MetadataResolver; - - form: FormGroup; - nameIds$: Observable = of([]); - authenticationMethods$: Observable = of([]); - - nameIdFormatList: FormArray; - authenticationMethodList: FormArray; - - constructor( - protected fb: FormBuilder, - protected statusEmitter: ProviderStatusEmitter, - protected valueEmitter: ProviderValueEmitter, - private listValues: ListValuesService - ) { - super(fb, statusEmitter, valueEmitter); - } - - ngOnInit(): void { - super.ngOnInit(); - } - - createForm(): void { - this.nameIdFormatList = this.fb.array([]); - this.authenticationMethodList = this.fb.array([]); - this.form = this.fb.group({ - relyingPartyOverrides: this.fb.group({ - signAssertion: false, - dontSignResponse: false, - turnOffEncryption: false, - useSha: false, - ignoreAuthenticationMethod: false, - forceAuthn: false, - omitNotBefore: false, - responderId: '', - nameIdFormats: this.nameIdFormatList, - authenticationMethods: this.authenticationMethodList - }) - }); - } - - getRequiredControl = (value: string): FormControl => this.fb.control(value, Validators.required); - - setNameIdFormats(nameIdFormats: string[] = []): void { - let fcs = nameIdFormats.map(this.getRequiredControl); - fcs.forEach(ctrl => this.nameIdFormatList.push(ctrl)); - } - - setAuthenticationMethods(methods: string[] = []): void { - let fcs = methods.map(this.getRequiredControl); - fcs.forEach(ctrl => this.authenticationMethodList.push(ctrl)); - } - - addFormat(text: string = ''): void { - this.nameIdFormatList.push(this.getRequiredControl(text)); - } - - addAuthenticationMethod(text: string = ''): void { - this.authenticationMethodList.push(this.getRequiredControl(text)); - } - - removeFormat(index: number): void { - this.nameIdFormatList.removeAt(index); - } - - removeAuthenticationMethod(index: number): void { - this.authenticationMethodList.removeAt(index); - } - - ngOnChanges(): void { - let overrides = this.resolver.relyingPartyOverrides || {nameIdFormats: [], authenticationMethods: []}; - this.form.reset({ - relyingPartyOverrides: overrides - }); - this.setNameIdFormats(overrides.nameIdFormats); - this.setAuthenticationMethods(overrides.authenticationMethods); - } - - searchNameIds(query: string): void { - this.nameIds$ = this.listValues.searchFormats(of(query)); - } - - searchAuthMethods(query: string): void { - this.authenticationMethods$ = this.listValues.searchAuthenticationMethods(of(query)); - } -} /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/component/index.ts b/ui/src/app/metadata/domain/component/index.ts deleted file mode 100644 index e95549109..000000000 --- a/ui/src/app/metadata/domain/component/index.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ReactiveFormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; -import { NgbPopoverModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; - -import { AdvancedInfoFormComponent } from './forms/advanced-info-form.component'; -import { OrganizationInfoFormComponent } from './forms/organization-info-form.component'; -import { MetadataUiFormComponent } from './forms/metadata-ui-form.component'; -import { KeyInfoFormComponent } from './forms/key-info-form.component'; -import { AssertionFormComponent } from './forms/assertion-form.component'; -import { DescriptorInfoFormComponent } from './forms/descriptor-info-form.component'; -import { RelyingPartyFormComponent } from './forms/relying-party-form.component'; -import { AttributeReleaseFormComponent } from './forms/attribute-release-form.component'; -import { LogoutFormComponent } from './forms/logout-form.component'; -import { FinishFormComponent } from './forms/finish-form.component'; -import { ProviderFormFragmentComponent } from './forms/provider-form-fragment.component'; - -import { SharedModule } from '../../../shared/shared.module'; -import { DomainModule } from '../../domain/domain.module'; -import { I18nModule } from '../../../i18n/i18n.module'; - -export const COMPONENTS = [ - AdvancedInfoFormComponent, - OrganizationInfoFormComponent, - MetadataUiFormComponent, - KeyInfoFormComponent, - AssertionFormComponent, - LogoutFormComponent, - DescriptorInfoFormComponent, - RelyingPartyFormComponent, - AttributeReleaseFormComponent, - FinishFormComponent, - ProviderFormFragmentComponent -]; - -export const declarations = [ - ...COMPONENTS, -]; - -@NgModule({ - declarations: declarations, - entryComponents: COMPONENTS, - exports: [ - ...declarations - ], - imports: [ - CommonModule, - DomainModule, - ReactiveFormsModule, - RouterModule, - NgbPopoverModule, - NgbModalModule, - SharedModule, - I18nModule - ], - providers: [] -}) -export class ProviderEditorFormModule {} diff --git a/ui/src/app/metadata/domain/component/preview-dialog.component.ts b/ui/src/app/metadata/domain/component/preview-dialog.component.ts index 824d5be90..7ac38f85f 100644 --- a/ui/src/app/metadata/domain/component/preview-dialog.component.ts +++ b/ui/src/app/metadata/domain/component/preview-dialog.component.ts @@ -22,4 +22,4 @@ export class PreviewDialogComponent { const blob = new Blob([xml], { type: 'text/xml;charset=utf-8' }); FileSaver.saveAs(blob, `${ this.entity.name }.xml`); } -} /* istanbul ignore next */ +} diff --git a/ui/src/app/metadata/domain/component/summary-property.component.html b/ui/src/app/metadata/domain/component/summary-property.component.html new file mode 100644 index 000000000..832f268b3 --- /dev/null +++ b/ui/src/app/metadata/domain/component/summary-property.component.html @@ -0,0 +1,86 @@ +
+ + + + {{ property.name }} + {{ property.value || property.value === false ? property.value : '-' }} + + + + + {{ property.name }} + + +

—

+ + + + + + + + + + + +
+ +
+ {{ value[prop] }} +
+ + + +

—

+
    +
  • + {{ item }} +
    • +
+ + +

—

+
    +
  • + {{ item }} +
    • +
+ + + + + + + + + + + + + + + + + +
NameTrueFalse
{{ attr.label }} + + + +
+ + + + + + {{ property.name }} + + + + + + +
diff --git a/ui/src/app/metadata/domain/component/summary-property.component.spec.ts b/ui/src/app/metadata/domain/component/summary-property.component.spec.ts new file mode 100644 index 000000000..0edfe06a4 --- /dev/null +++ b/ui/src/app/metadata/domain/component/summary-property.component.spec.ts @@ -0,0 +1,129 @@ +import { Component, ViewChild } from '@angular/core'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; + +import { SummaryPropertyComponent } from './summary-property.component'; +import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form'; +import { Property } from '../model/property'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { AttributesService } from '../service/attributes.service'; +import { of } from 'rxjs'; + +@Component({ + template: ` + + ` +}) +class TestHostComponent { + @ViewChild(SummaryPropertyComponent) + public componentUnderTest: SummaryPropertyComponent; + + private _property; + + get property(): Property { + return this._property; + } + + set property(prop: Property) { + this._property = prop; + } +} + +describe('Summary Property Component', () => { + + let fixture: ComponentFixture; + let instance: TestHostComponent; + let app: SummaryPropertyComponent; + let service: AttributesService; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + NgbDropdownModule.forRoot(), + NgbPopoverModule.forRoot(), + RouterTestingModule, + SchemaFormModule.forRoot(), + MockI18nModule + ], + declarations: [ + SummaryPropertyComponent, + TestHostComponent + ], + providers: [ + { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }, + { provide: AttributesService, useValue: { + query: (path: string) => of([]) + } } + ] + }).compileComponents(); + + fixture = TestBed.createComponent(TestHostComponent); + instance = fixture.componentInstance; + app = instance.componentUnderTest; + service = TestBed.get(AttributesService); + fixture.detectChanges(); + })); + + it('should instantiate the component', async(() => { + expect(app).toBeTruthy(); + })); + + describe('attribute list getter', () => { + it('should return the data from the property schema', async(() => { + let list = [{ key: 'foo', label: 'foo' }]; + app.property = { + type: 'array', + name: 'foo', + value: ['foo', 'bar'], + items: null, + properties: null, + widget: { + id: 'foo', + data: list + } + }; + + app.attributeList$.subscribe(l => { + expect(l).toEqual(list); + }); + })); + + it('should return fetch data from the supplied path', async(() => { + let list = [{key: 'foo', label: 'foo'}]; + spyOn(service, 'query').and.returnValue(of(list)); + app.property = { + type: 'array', + name: 'foo', + value: ['foo', 'bar'], + items: null, + properties: null, + widget: { + id: 'foo', + dataUrl: 'foo' + } + }; + + app.attributeList$.subscribe(l => { + expect(l).toEqual(list); + }); + })); + + it('should return an empty array if no data is found', async(() => { + let list = []; + spyOn(service, 'query').and.returnValue(of(list)); + app.property = { + type: 'array', + name: 'foo', + value: ['foo', 'bar'], + items: null, + properties: null + }; + + app.attributeList$.subscribe(l => { + expect(l).toEqual(list); + }); + })); + }); +}); diff --git a/ui/src/app/metadata/domain/component/summary-property.component.ts b/ui/src/app/metadata/domain/component/summary-property.component.ts new file mode 100644 index 000000000..6b8b408a8 --- /dev/null +++ b/ui/src/app/metadata/domain/component/summary-property.component.ts @@ -0,0 +1,37 @@ +import { Component, Input } from '@angular/core'; +import { Property } from '../model/property'; +import { Observable, of } from 'rxjs'; +import { AttributesService } from '../service/attributes.service'; + +@Component({ + selector: 'summary-property', + templateUrl: './summary-property.component.html', + styleUrls: [] +}) + +export class SummaryPropertyComponent { + @Input() property: Property; + + constructor( + private attrService: AttributesService + ) {} + + getKeys(schema): string[] { + return Object.keys(schema.properties); + } + + getItemType(items: Property): string { + return items.widget ? items.widget.id : 'default'; + } + + get attributeList$(): Observable<{key: string, label: string}[]> { + if (this.property.widget && this.property.widget.hasOwnProperty('data')) { + return of(this.property.widget.data); + } + if (this.property.widget && this.property.widget.hasOwnProperty('dataUrl')) { + return this.attrService.query(this.property.widget.dataUrl); + } + return of([]); + } +} + diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.html similarity index 100% rename from ui/src/app/metadata/provider/component/unsaved-provider.dialog.html rename to ui/src/app/metadata/domain/component/unsaved-entity.dialog.html diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts similarity index 74% rename from ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts rename to ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts index b5381baa6..e47af9c90 100644 --- a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts +++ b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.spec.ts @@ -1,27 +1,25 @@ import { Component, ViewChild } from '@angular/core'; import { TestBed, async, ComponentFixture} from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { SharedModule } from '../../../shared/shared.module'; -import { UnsavedProviderComponent } from './unsaved-provider.dialog'; +import { UnsavedEntityComponent } from './unsaved-entity.dialog'; import { NgbActiveModalStub } from '../../../../testing/modal.stub'; import { MockI18nModule } from '../../../../testing/i18n.stub'; @Component({ template: ` - + ` }) class TestHostComponent { - @ViewChild(UnsavedProviderComponent) - public componentUnderTest: UnsavedProviderComponent; + @ViewChild(UnsavedEntityComponent) + public componentUnderTest: UnsavedEntityComponent; } describe('Unsaved Provider Dialog Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let cmp: UnsavedProviderComponent; + let cmp: UnsavedEntityComponent; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -29,7 +27,7 @@ describe('Unsaved Provider Dialog Component', () => { MockI18nModule ], declarations: [ - UnsavedProviderComponent, + UnsavedEntityComponent, TestHostComponent ], providers: [ diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts similarity index 67% rename from ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts rename to ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts index 4b8d12da3..7efe195c8 100644 --- a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts +++ b/ui/src/app/metadata/domain/component/unsaved-entity.dialog.ts @@ -1,16 +1,13 @@ import { Component, Input } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Store, Action } from '@ngrx/store'; import { Subject } from 'rxjs/Subject'; -import * as fromEditor from '../reducer'; - @Component({ - selector: 'unsaved-provider', - templateUrl: './unsaved-provider.dialog.html' + selector: 'unsaved-entity', + templateUrl: './unsaved-entity.dialog.html' }) -export class UnsavedProviderComponent { +export class UnsavedEntityComponent { readonly subject: Subject = new Subject(); constructor( diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html b/ui/src/app/metadata/domain/component/wizard-summary.component.html similarity index 90% rename from ui/src/app/metadata/provider/component/provider-wizard-summary.component.html rename to ui/src/app/metadata/domain/component/wizard-summary.component.html index b001769f5..e1f578180 100644 --- a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.html +++ b/ui/src/app/metadata/domain/component/wizard-summary.component.html @@ -2,7 +2,7 @@
diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts similarity index 77% rename from ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts rename to ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts index 14f028bbe..208de10dc 100644 --- a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.spec.ts +++ b/ui/src/app/metadata/domain/component/wizard-summary.component.spec.ts @@ -1,29 +1,26 @@ import { Component, ViewChild } from '@angular/core'; import { TestBed, async, ComponentFixture } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { StoreModule, Store, combineReducers } from '@ngrx/store'; -import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; -import { ProviderWizardSummaryComponent, getStepProperties } from './provider-wizard-summary.component'; -import * as fromRoot from '../reducer'; +import { getStepProperties, WizardSummaryComponent } from './wizard-summary.component'; import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form'; -import * as fromWizard from '../../../wizard/reducer'; import { Wizard } from '../../../wizard/model'; import { MetadataProvider } from '../../domain/model'; import { SummaryPropertyComponent } from './summary-property.component'; import { SCHEMA } from '../../../../testing/form-schema.stub'; -import { MetadataProviderWizard } from '../model'; import { MockI18nModule } from '../../../../testing/i18n.stub'; +import { MetadataProviderWizard } from '../../provider/model'; @Component({ template: ` - + ` }) class TestHostComponent { - @ViewChild(ProviderWizardSummaryComponent) - public componentUnderTest: ProviderWizardSummaryComponent; + @ViewChild(WizardSummaryComponent) + public componentUnderTest: WizardSummaryComponent; private _summary; @@ -40,23 +37,19 @@ describe('Provider Wizard Summary Component', () => { let fixture: ComponentFixture; let instance: TestHostComponent; - let app: ProviderWizardSummaryComponent; - let store: Store; + let app: WizardSummaryComponent; beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ NgbDropdownModule.forRoot(), + NgbPopoverModule.forRoot(), RouterTestingModule, SchemaFormModule.forRoot(), - StoreModule.forRoot({ - provider: combineReducers(fromRoot.reducers), - wizard: combineReducers(fromWizard.reducers) - }), MockI18nModule ], declarations: [ - ProviderWizardSummaryComponent, + WizardSummaryComponent, SummaryPropertyComponent, TestHostComponent ], @@ -65,9 +58,6 @@ describe('Provider Wizard Summary Component', () => { ] }).compileComponents(); - store = TestBed.get(Store); - spyOn(store, 'dispatch'); - fixture = TestBed.createComponent(TestHostComponent); instance = fixture.componentInstance; app = instance.componentUnderTest; diff --git a/ui/src/app/metadata/domain/component/wizard-summary.component.ts b/ui/src/app/metadata/domain/component/wizard-summary.component.ts new file mode 100644 index 000000000..fa570a1c0 --- /dev/null +++ b/ui/src/app/metadata/domain/component/wizard-summary.component.ts @@ -0,0 +1,122 @@ +import { Component, Input, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core'; + +import { Wizard, WizardStep } from '../../../wizard/model'; +import { MetadataProvider, MetadataResolver } from '../../domain/model'; +import { Property } from '../model/property'; +import { getSplitSchema } from '../../../wizard/reducer'; +import merge from 'deepmerge'; + +interface Section { + id: string; + index: number; + label: string; + pageNumber: number; + properties: Property[]; +} + +export function getDefinition(path: string, definitions: any): any { + let def = path.split('/').pop(); + return definitions[def]; +} + +export function getPropertyItemSchema(items: any, definitions: any): any { + if (!items) { return null; } + return items.$ref ? getDefinition(items.$ref, definitions) : items; +} + +export function getStepProperty(property, model, definitions): Property { + if (!property) { return null; } + property = property.$ref ? { ...property, ...getDefinition(property.$ref, definitions) } : property; + return { + name: property.title, + value: model, + type: property.type, + items: getPropertyItemSchema(property.items, definitions), + properties: getStepProperties( + property, + model, + definitions + ), + widget: property.widget instanceof String ? { id: property.widget } : { ...property.widget } + }; +} + + +export function getStepProperties(schema: any, model: any, definitions: any = {}): Property[] { + if (!schema || !schema.properties) { return []; } + return Object + .keys(schema.properties) + .map(property => { + return getStepProperty( + schema.properties[property], + model && model.hasOwnProperty(property) ? model[property] : null, + definitions + ); + }); +} + +@Component({ + selector: 'wizard-summary', + templateUrl: './wizard-summary.component.html', + styleUrls: [] +}) + +export class WizardSummaryComponent implements OnChanges { + @Input() summary: { definition: Wizard, schema: { [id: string]: any }, model: any }; + + @Output() onPageSelect: EventEmitter = new EventEmitter(); + + sections: Section[]; + columns: Array
[]; + steps: WizardStep[]; + + constructor() {} + + ngOnChanges(changes: SimpleChanges): void { + if (changes.summary && this.summary) { + const schemas = this.summary.schema; + const model = this.summary.model; + const def = this.summary.definition; + const steps = def.steps; + + const schema = Object.keys(schemas).reduce((coll, key) => ({ + ...merge(coll, schemas[key]) + }), {} as any); + + this.sections = steps + .filter(step => step.id !== 'summary') + .map( + (step: WizardStep, num: number) => { + return ({ + id: step.id, + pageNumber: num + 1, + index: step.index, + label: step.label, + properties: getStepProperties( + getSplitSchema(schema, step), + def.formatter(model), + schema.definitions || {} + ) + }); + } + ); + + this.columns = this.sections.reduce((resultArray, item, index) => { + const chunkIndex = Math.floor(index / Math.round(this.sections.length / 2)); + + if (!resultArray[chunkIndex]) { + resultArray[chunkIndex] = []; + } + + resultArray[chunkIndex].push(item); + + return resultArray; + }, []); + } + } + + gotoPage(page: string = ''): void { + this.onPageSelect.emit(page); + } +} + diff --git a/ui/src/app/metadata/domain/domain.module.ts b/ui/src/app/metadata/domain/domain.module.ts index a9120f45d..ffee8cf1d 100644 --- a/ui/src/app/metadata/domain/domain.module.ts +++ b/ui/src/app/metadata/domain/domain.module.ts @@ -2,6 +2,7 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { HttpModule } from '@angular/http'; import { EffectsModule } from '@ngrx/effects'; import { CommonModule } from '@angular/common'; +import { NgbPopoverModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { ResolverService } from './service/resolver.service'; import { ListValuesService } from './service/list-values.service'; @@ -15,9 +16,20 @@ import { PreviewDialogComponent } from './component/preview-dialog.component'; import { MetadataFilterService } from './service/filter.service'; import { AttributesService } from './service/attributes.service'; import { I18nModule } from '../../i18n/i18n.module'; +import { WizardSummaryComponent } from './component/wizard-summary.component'; +import { SummaryPropertyComponent } from './component/summary-property.component'; + +import { UnsavedEntityComponent } from './component/unsaved-entity.dialog'; +import { EditorNavComponent } from './component/editor-nav.component'; +import { RouterModule } from '@angular/router'; +import { SharedModule } from '../../shared/shared.module'; export const COMPONENTS = [ - PreviewDialogComponent + PreviewDialogComponent, + WizardSummaryComponent, + UnsavedEntityComponent, + SummaryPropertyComponent, + EditorNavComponent ]; export const DECLARATIONS = [ @@ -30,7 +42,11 @@ export const DECLARATIONS = [ imports: [ HttpModule, CommonModule, - I18nModule + I18nModule, + NgbPopoverModule, + RouterModule, + NgbDropdownModule, + SharedModule ], exports: DECLARATIONS, providers: [] diff --git a/ui/src/app/metadata/domain/domain.util.spec.ts b/ui/src/app/metadata/domain/domain.util.spec.ts index f5e775495..d8b749098 100644 --- a/ui/src/app/metadata/domain/domain.util.spec.ts +++ b/ui/src/app/metadata/domain/domain.util.spec.ts @@ -37,9 +37,9 @@ describe('Domain Utility methods', () => { describe('mergeProviderOrderFn', () => { const providers = [ - { resourceId: 'foo', name: 'foo', '@type': 'foo', enabled: true, xmlId: 'id', sortKey: 1, metadataFilters: [] }, - { resourceId: 'bar', name: 'bar', '@type': 'bar', enabled: false, xmlId: 'id2', sortKey: 2, metadataFilters: [] }, - { resourceId: 'baz', name: 'baz', '@type': 'baz', enabled: false, xmlId: 'id3', sortKey: 3, metadataFilters: [] } + { id: 'foo', name: 'foo', '@type': 'foo', enabled: true, xmlId: 'id', sortKey: 1, metadataFilters: [] }, + { id: 'bar', name: 'bar', '@type': 'bar', enabled: false, xmlId: 'id2', sortKey: 2, metadataFilters: [] }, + { id: 'baz', name: 'baz', '@type': 'baz', enabled: false, xmlId: 'id3', sortKey: 3, metadataFilters: [] } ]; it('1 should sort the list accordingly', () => { let order = ['bar', 'foo', 'baz'], diff --git a/ui/src/app/metadata/domain/domain.util.ts b/ui/src/app/metadata/domain/domain.util.ts index 2840e9cbc..af9ab0153 100644 --- a/ui/src/app/metadata/domain/domain.util.ts +++ b/ui/src/app/metadata/domain/domain.util.ts @@ -14,8 +14,8 @@ export const getEntityIdsFn = list => list.map(entity => entity.entityId); export const mergeOrderFn = (entities: Metadata[], order: string[]): Metadata[] => { return [...entities.sort( (a: Metadata, b: Metadata) => { - const aIndex = order.indexOf(a.resourceId); - const bIndex = order.indexOf(b.resourceId); + const aIndex = order.indexOf(a.id); + const bIndex = order.indexOf(b.id); return aIndex > bIndex ? 1 : bIndex > aIndex ? -1 : 0; } )]; diff --git a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts index 982d86d35..8a59cb691 100644 --- a/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts +++ b/ui/src/app/metadata/domain/entity/resolver/file-backed-http-metadata-resolver.ts @@ -53,7 +53,7 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat } getId(): string { - return this.id ? this.id : this.entityId; + return this.id; } getDisplayId(): string { @@ -61,7 +61,7 @@ export class FileBackedHttpMetadataResolver implements MetadataResolver, Metadat } isDraft(): boolean { - return this.id ? false : true; + return this.createdDate ? false : true; } getCreationDate(): Date { diff --git a/ui/src/app/metadata/domain/model/metadata-resolver.ts b/ui/src/app/metadata/domain/model/metadata-resolver.ts index 699ab615f..9f8e0686c 100644 --- a/ui/src/app/metadata/domain/model/metadata-resolver.ts +++ b/ui/src/app/metadata/domain/model/metadata-resolver.ts @@ -11,8 +11,8 @@ import { } from '../model'; export interface MetadataResolver extends MetadataBase { - resourceId?: string; - entityId: string; + id: string; + entityId?: string; serviceProviderName: string; organization?: Organization; contacts?: Contact[]; @@ -22,6 +22,6 @@ export interface MetadataResolver extends MetadataBase { serviceProviderSsoDescriptor?: IdpSsoDescriptor; logoutEndpoints?: LogoutEndpoint[]; serviceEnabled?: boolean; - relyingPartyOverrides: RelyingPartyOverrides; - attributeRelease: string[]; + relyingPartyOverrides?: RelyingPartyOverrides; + attributeRelease?: string[]; } diff --git a/ui/src/app/metadata/provider/model/property.ts b/ui/src/app/metadata/domain/model/property.ts similarity index 53% rename from ui/src/app/metadata/provider/model/property.ts rename to ui/src/app/metadata/domain/model/property.ts index 031dce75c..f54829916 100644 --- a/ui/src/app/metadata/provider/model/property.ts +++ b/ui/src/app/metadata/domain/model/property.ts @@ -2,5 +2,10 @@ export interface Property { type: string; name: string; value: string[]; + items: Property; properties: Property[]; + widget?: { + id: string; + [propertyName: string]: any; + }; } diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-base.spec.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.spec.ts new file mode 100644 index 000000000..3386d65e4 --- /dev/null +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.spec.ts @@ -0,0 +1,47 @@ +import { MetadataSourceBase } from './metadata-source-base'; +import { MetadataResolver } from '../metadata-resolver'; + +describe('Metadata Source Base class', () => { + + let base = new MetadataSourceBase(); + const parser = base.parser; + const formatter = base.formatter; + const getValidators = base.getValidators; + + describe('parser', () => { + it('should return the provided object', () => { + let model = { + serviceProviderName: 'foo', + id: 'FileBackedHttpMetadataProvider' + }; + expect( + parser(model) + ).toEqual( + model + ); + }); + }); + + describe('formatter', () => { + it('should return the model', () => { + let model = { + serviceProviderName: 'foo', + id: 'FileBackedHttpMetadataProvider' + }; + expect( + formatter(model) + ).toEqual( + model + ); + }); + }); + + describe('getValidators method', () => { + it('should return a list of validators for the ngx-schema-form', () => { + expect(Object.keys(getValidators([]))).toEqual([ + '/', + '/entityId' + ]); + }); + }); +}); diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts new file mode 100644 index 000000000..7d29d34c5 --- /dev/null +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-base.ts @@ -0,0 +1,91 @@ +import { Wizard, WizardStep } from '../../../../wizard/model'; +import { MetadataResolver } from '../metadata-resolver'; +import { FormProperty } from 'ngx-schema-form/lib/model/formproperty'; +import { ArrayProperty } from 'ngx-schema-form/lib/model/arrayproperty'; +import { ObjectProperty } from 'ngx-schema-form/lib/model/objectproperty'; + +/*istanbul ignore next */ +export class MetadataSourceBase implements Wizard { + label = 'Metadata Source'; + type = '@MetadataProvider'; + steps: WizardStep[] = []; + + bindings = { + '/securityInfo/x509CertificateAvailable': [ + { + 'input': (event, property: FormProperty) => { + let available = !property.value, + parent = property.parent, + certs = parent.getProperty('x509Certificates'); + if (available && !certs.value.length) { + certs.setValue([ + { + name: '', + type: 'both', + value: '' + } + ], true); + } + + if (!available && certs.value.length > 0) { + certs.setValue([], true); + } + } + } + ], + '/assertionConsumerServices/*/makeDefault': [ + { + 'input': (event, property: FormProperty) => { + let parent = property.parent.parent as ArrayProperty; + let props = parent.properties as ObjectProperty[]; + props.forEach(prop => { + if (prop !== property) { + prop.setValue({ + ...prop.value, + makeDefault: false + }, false); + } + }); + } + } + ] + }; + + parser(changes: Partial, schema?: any): any { + return changes; + } + + formatter(changes: Partial, schema?: any): any { + return changes; + } + + getValidators(entityIdList: string[]): { [key: string]: any } { + const validators = { + '/': (value, property, form_current) => { + let errors; + // iterate all customer + Object.keys(value).forEach((key) => { + const item = value[key]; + const validatorKey = `/${key}`; + const validator = validators.hasOwnProperty(validatorKey) ? validators[validatorKey] : null; + const error = validator ? validator(item, { path: `/${key}` }, form_current) : null; + if (error) { + errors = errors || []; + errors.push(error); + } + }); + return errors; + }, + '/entityId': (value, property, form) => { + const err = entityIdList.indexOf(value) > -1 ? { + code: 'INVALID_ID', + path: `#${property.path}`, + message: 'message.id-unique', + params: [value] + } : null; + return err; + } + }; + return validators; + } +} diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts new file mode 100644 index 000000000..cbe98d5de --- /dev/null +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-editor.ts @@ -0,0 +1,133 @@ +import { Wizard, WizardStep } from '../../../../wizard/model'; +import { MetadataResolver } from '../metadata-resolver'; +import { MetadataSourceBase } from './metadata-source-base'; + +export class MetadataSourceEditor extends MetadataSourceBase implements Wizard { + steps: WizardStep[] = [ + { + index: 1, + id: 'common', + label: 'label.sp-org-info', + schema: '/api/ui/MetadataSources', + fields: [ + 'serviceProviderName', + 'entityId', + 'serviceEnabled', + 'organization', + 'contacts' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'serviceProviderName', + 'entityId', + 'serviceEnabled', + 'organization' + ] + }, + { + type: 'group', + fields: [ + 'contacts' + ] + } + ] + }, + { + index: 3, + id: 'metadata-ui', + label: 'label.metadata-ui', + schema: '/api/ui/MetadataSources', + fields: [ + 'mdui' + ] + }, + { + index: 4, + id: 'descriptor-info', + label: 'label.descriptor-info', + schema: '/api/ui/MetadataSources', + fields: [ + 'serviceProviderSsoDescriptor' + ] + }, + { + index: 5, + id: 'logout-endpoints', + label: 'label.logout-endpoints', + schema: '/api/ui/MetadataSources', + fields: [ + 'logoutEndpoints' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'logoutEndpoints' + ] + } + ] + }, + { + index: 6, + id: 'key-info', + label: 'label.key-info', + schema: '/api/ui/MetadataSources', + fields: [ + 'securityInfo' + ] + }, + { + index: 7, + id: 'assertion', + label: 'label.assertion', + schema: '/api/ui/MetadataSources', + fields: [ + 'assertionConsumerServices' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'assertionConsumerServices' + ] + } + ] + }, + { + index: 8, + id: 'relying-party', + label: 'label.relying-party', + schema: '/api/ui/MetadataSources', + fields: [ + 'relyingPartyOverrides' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'relyingPartyOverrides' + ] + } + ] + }, + { + index: 9, + id: 'attribute', + label: 'label.attribute-release', + schema: '/api/ui/MetadataSources', + fields: [ + 'attributeRelease' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'attributeRelease' + ] + } + ] + } + ]; +} diff --git a/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts b/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts new file mode 100644 index 000000000..bd7ad9fd9 --- /dev/null +++ b/ui/src/app/metadata/domain/model/wizards/metadata-source-wizard.ts @@ -0,0 +1,158 @@ +import { Wizard, WizardStep } from '../../../../wizard/model'; +import { MetadataResolver } from '../metadata-resolver'; +import { MetadataSourceBase } from './metadata-source-base'; + +export class MetadataSourceWizard extends MetadataSourceBase implements Wizard { + steps: WizardStep[] = [ + { + index: 1, + id: 'common', + label: 'label.name-and-entity-id', + schema: '/api/ui/MetadataSources', + fields: [ + 'serviceProviderName', + 'entityId' + ], + fieldsets: [ + { + type: 'section', + class: ['col-6'], + fields: [ + 'serviceProviderName', + 'entityId' + ] + } + ] + }, + { + index: 2, + id: 'org-info', + label: 'label.org-info', + schema: '/api/ui/MetadataSources', + fields: [ + 'organization', + 'contacts' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'organization' + ] + }, + { + type: 'group', + fields: [ + 'contacts' + ] + } + ] + }, + { + index: 3, + id: 'metadata-ui', + label: 'label.metadata-ui', + schema: '/api/ui/MetadataSources', + fields: [ + 'mdui' + ] + }, + { + index: 4, + id: 'descriptor-info', + label: 'label.descriptor-info', + schema: '/api/ui/MetadataSources', + fields: [ + 'serviceProviderSsoDescriptor' + ] + }, + { + index: 5, + id: 'logout-endpoints', + label: 'label.logout-endpoints', + schema: '/api/ui/MetadataSources', + fields: [ + 'logoutEndpoints' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'logoutEndpoints' + ] + } + ] + }, + { + index: 6, + id: 'key-info', + label: 'label.key-info', + schema: '/api/ui/MetadataSources', + fields: [ + 'securityInfo' + ] + }, + { + index: 7, + id: 'assertion', + label: 'label.assertion', + schema: '/api/ui/MetadataSources', + fields: [ + 'assertionConsumerServices' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'assertionConsumerServices' + ] + } + ] + }, + { + index: 8, + id: 'relying-party', + label: 'label.relying-party', + schema: '/api/ui/MetadataSources', + fields: [ + 'relyingPartyOverrides' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'relyingPartyOverrides' + ] + } + ] + }, + { + index: 9, + id: 'attribute', + label: 'label.attribute-release', + schema: '/api/ui/MetadataSources', + fields: [ + 'attributeRelease' + ], + fieldsets: [ + { + type: 'group', + fields: [ + 'attributeRelease' + ] + } + ] + }, + { + index: 10, + id: 'summary', + label: 'label.finished', + schema: '/api/ui/MetadataSources', + fields: [ + 'serviceEnabled' + ], + summary: true + } + ]; +} + diff --git a/ui/src/app/metadata/domain/service/attributes.service.spec.ts b/ui/src/app/metadata/domain/service/attributes.service.spec.ts index e69de29bb..76ed230b9 100644 --- a/ui/src/app/metadata/domain/service/attributes.service.spec.ts +++ b/ui/src/app/metadata/domain/service/attributes.service.spec.ts @@ -0,0 +1,42 @@ +import { TestBed, async, inject } from '@angular/core/testing'; +import { AttributesService } from './attributes.service'; +import { HttpClient, HttpClientModule, HttpRequest } from '@angular/common/http'; +import { of } from 'rxjs'; +import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; + +describe(`Attributes Service`, () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + HttpClientTestingModule + ], + providers: [ + AttributesService + ] + }); + }); + + describe('query method', () => { + it(`should call the request attributes method`, async(inject([AttributesService, HttpTestingController], + (service: AttributesService) => { + spyOn(service, 'requestAttributes').and.returnValue(of([])); + service.query().subscribe(() => { + expect(service.requestAttributes).toHaveBeenCalled(); + }); + } + ))); + }); + describe('requestAttributes method', () => { + it(`should send an expected GET request`, async(inject([AttributesService, HttpTestingController], + (service: AttributesService, backend: HttpTestingController) => { + service.requestAttributes('foo').subscribe(); + + backend.expectOne((req: HttpRequest) => { + return req.url === `${service.base}${'foo'}` + && req.method === 'GET'; + }, `GET attributes by term`); + } + ))); + }); +}); diff --git a/ui/src/app/metadata/domain/service/draft.service.spec.ts b/ui/src/app/metadata/domain/service/draft.service.spec.ts index bc88dc941..199a301d9 100644 --- a/ui/src/app/metadata/domain/service/draft.service.spec.ts +++ b/ui/src/app/metadata/domain/service/draft.service.spec.ts @@ -28,7 +28,7 @@ describe(`EntityDraftService`, () => { describe('find', () => { it(`should return an observable of the list from the store`, (done: DoneFn) => { let id = 'foo'; - let e = new FileBackedHttpMetadataResolver({ entityId: id }); + let e = new FileBackedHttpMetadataResolver({ id: id }); let list = [e]; spyOn(service.storage, 'query').and.returnValue(list); service.find(id).subscribe(entity => { diff --git a/ui/src/app/metadata/domain/service/draft.service.ts b/ui/src/app/metadata/domain/service/draft.service.ts index a31f8c798..b43713359 100644 --- a/ui/src/app/metadata/domain/service/draft.service.ts +++ b/ui/src/app/metadata/domain/service/draft.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable, of } from 'rxjs'; +import { Observable, of, throwError } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { MetadataResolver } from '../../domain/model'; @@ -18,12 +18,13 @@ export class EntityDraftService { return of(this.storage.query()); } - find(entityId: string): Observable { + find(id: string, attr: string = 'id'): Observable { + if (!id) { + return throwError(404); + } return this.query().pipe( switchMap( - list => of( - list.find(entity => entity.entityId === entityId) - ) + list => of(list.find(entity => entity[attr] === id)) ) ); } @@ -34,15 +35,19 @@ export class EntityDraftService { } remove(provider: MetadataResolver): Observable { - this.storage.removeByAttr(provider.entityId, 'entityId'); + this.storage.removeByAttr(provider.id, 'id'); return of(provider); } update(provider: MetadataResolver): Observable { - let stored = this.storage.findByAttr(provider.id, 'entityId'); - stored = Object.assign({}, stored, provider); - this.storage.removeByAttr(provider.entityId, 'entityId'); - this.storage.add(stored); - return of(stored); + let stored = this.storage.findByAttr(provider.id, 'id'); + if (stored) { + stored = { ...stored, ...provider }; + this.storage.removeByAttr(provider.id, 'id'); + this.storage.add(stored); + return of(stored); + } else { + return throwError(404); + } } } /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/service/resolver.service.ts b/ui/src/app/metadata/domain/service/resolver.service.ts index c3486de76..f0c9f4b3c 100644 --- a/ui/src/app/metadata/domain/service/resolver.service.ts +++ b/ui/src/app/metadata/domain/service/resolver.service.ts @@ -33,7 +33,8 @@ export class ResolverService { } save(provider: MetadataResolver): Observable { - return this.http.post(`${this.base}${this.endpoint}`, provider); + const { id, ...p } = provider; + return this.http.post(`${this.base}${this.endpoint}`, p); } remove(provider: MetadataResolver): Observable { diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts b/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts index b6e8595c4..b38fb4256 100644 --- a/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts +++ b/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts @@ -1,9 +1,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { ReactiveFormsModule, FormBuilder } from '@angular/forms'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; -import { NewFilterComponent } from './new-filter.component'; import * as fromFilter from '../reducer'; -import { ProviderEditorFormModule } from '../../domain/component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service'; import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; import { NavigatorService } from '../../../core/service/navigator.service'; @@ -35,7 +33,6 @@ describe('New Metadata Filter Page', () => { 'filter': combineReducers(fromFilter.reducers), }), ReactiveFormsModule, - ProviderEditorFormModule, NgbPopoverModule, SharedModule, HttpClientModule, diff --git a/ui/src/app/metadata/filter/container/new-filter.component.spec.ts b/ui/src/app/metadata/filter/container/new-filter.component.spec.ts index 44bbfecfc..b872f2f09 100644 --- a/ui/src/app/metadata/filter/container/new-filter.component.spec.ts +++ b/ui/src/app/metadata/filter/container/new-filter.component.spec.ts @@ -3,7 +3,6 @@ import { ReactiveFormsModule, FormBuilder } from '@angular/forms'; import { StoreModule, Store, combineReducers } from '@ngrx/store'; import { NewFilterComponent } from './new-filter.component'; import * as fromFilter from '../reducer'; -import { ProviderEditorFormModule } from '../../domain/component'; import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service'; import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap'; import { NavigatorService } from '../../../core/service/navigator.service'; @@ -34,7 +33,6 @@ describe('New Metadata Filter Page', () => { 'filter': combineReducers(fromFilter.reducers), }), ReactiveFormsModule, - ProviderEditorFormModule, NgbPopoverModule, SharedModule, HttpClientModule, diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts index e9673464d..4dde8f3a4 100644 --- a/ui/src/app/metadata/filter/effect/collection.effect.ts +++ b/ui/src/app/metadata/filter/effect/collection.effect.ts @@ -189,7 +189,6 @@ export class FilterCollectionEffects { withLatestFrom(this.store.select(fromFilter.getAdditionalFilterOrder)), map(([id, order]) => { const index = order.indexOf(id); - console.log(id, order); if (index > 0) { const newOrder = array_move(order, index, index - 1); return new SetOrderFilterRequest(newOrder); diff --git a/ui/src/app/metadata/filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts index 8f4d2e509..34997c563 100644 --- a/ui/src/app/metadata/filter/filter.module.ts +++ b/ui/src/app/metadata/filter/filter.module.ts @@ -8,7 +8,6 @@ import { EffectsModule } from '@ngrx/effects'; import { NewFilterComponent } from './container/new-filter.component'; import { reducers } from './reducer'; -import { ProviderEditorFormModule } from '../domain/component'; import { FilterEffects } from './effect/filter.effect'; import { NgbPopoverModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; import { SearchDialogComponent } from './component/search-dialog.component'; @@ -36,7 +35,6 @@ import { I18nModule } from '../../i18n/i18n.module'; imports: [ CommonModule, ReactiveFormsModule, - ProviderEditorFormModule, NgbPopoverModule, NgbModalModule, SharedModule, diff --git a/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts b/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts index 35ebaff95..ba27a427d 100644 --- a/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts +++ b/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts @@ -7,8 +7,8 @@ describe('Entity Attributes filter form', () => { describe('transformer', () => { it('should not modify the object', () => { - expect(EntityAttributesFilter.translate.formatter({})).toEqual({}); - expect(EntityAttributesFilter.translate.parser({})).toEqual({}); + expect(EntityAttributesFilter.formatter({})).toEqual({}); + expect(EntityAttributesFilter.parser({})).toEqual({}); }); }); }); diff --git a/ui/src/app/metadata/filter/model/entity-attributes.filter.ts b/ui/src/app/metadata/filter/model/entity-attributes.filter.ts index bf2cec9b4..fc358dece 100644 --- a/ui/src/app/metadata/filter/model/entity-attributes.filter.ts +++ b/ui/src/app/metadata/filter/model/entity-attributes.filter.ts @@ -9,8 +9,6 @@ export const EntityAttributesFilter: FormDefinition = { const validators = {}; return validators; }, - translate: { - parser: (changes: any): MetadataFilter => changes, - formatter: (changes: MetadataFilter): any => changes - } + parser: (changes: any): MetadataFilter => changes, + formatter: (changes: MetadataFilter): any => changes }; diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts index b5cbe9d8d..4ecd91c66 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts @@ -26,12 +26,14 @@ describe('Dashboard Resolvers List Page', () => { let draft = new FileBackedHttpMetadataResolver({ entityId: 'foo', - serviceProviderName: 'bar' + serviceProviderName: 'bar', + id: '1' }), resolver = new FileBackedHttpMetadataResolver({ entityId: 'foo', serviceProviderName: 'foo', - id: '1' + id: '1', + createdDate: new Date().toDateString() }); beforeEach(() => { @@ -125,7 +127,9 @@ describe('Dashboard Resolvers List Page', () => { it('should route to the wizard page', () => { spyOn(router, 'navigate'); instance.edit(draft); - expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', draft.entityId, 'wizard']); + expect(router.navigate).toHaveBeenCalledWith(['metadata', 'resolver', 'new'], { + queryParams: { id: '1' } + }); }); }); diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts index b4b5af807..8f8caca24 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts @@ -71,7 +71,15 @@ export class DashboardResolversListComponent implements OnInit { } edit(entity: MetadataEntity): void { - this.router.navigate(['metadata', 'resolver', entity.getId(), entity.isDraft() ? 'wizard' : 'edit']); + if (entity.isDraft()) { + this.router.navigate(['metadata', 'resolver', 'new'], { + queryParams: { + id: entity.getId() + } + }); + } else { + this.router.navigate(['metadata', 'resolver', entity.getId(), 'edit']); + } } toggleEntity(entity: MetadataEntity): void { diff --git a/ui/src/app/metadata/metadata.module.ts b/ui/src/app/metadata/metadata.module.ts index 9c88a04df..946c89423 100644 --- a/ui/src/app/metadata/metadata.module.ts +++ b/ui/src/app/metadata/metadata.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; - import { ResolverModule } from './resolver/resolver.module'; import { FilterModule } from './filter/filter.module'; import { DomainModule } from './domain/domain.module'; @@ -9,6 +8,8 @@ import { ManagerModule } from './manager/manager.module'; import { MetadataRoutingModule } from './metadata.routing'; import { ProviderModule } from './provider/provider.module'; import { I18nModule } from '../i18n/i18n.module'; +import { CustomWidgetRegistry } from '../schema-form/registry'; +import { WidgetRegistry } from 'ngx-schema-form'; @NgModule({ @@ -21,7 +22,9 @@ import { I18nModule } from '../i18n/i18n.module'; MetadataRoutingModule, I18nModule ], - providers: [], + providers: [ + { provide: WidgetRegistry, useClass: CustomWidgetRegistry } + ], declarations: [ MetadataPageComponent ] diff --git a/ui/src/app/metadata/provider/action/editor.action.ts b/ui/src/app/metadata/provider/action/editor.action.ts index 3c82c0c19..37a99c98b 100644 --- a/ui/src/app/metadata/provider/action/editor.action.ts +++ b/ui/src/app/metadata/provider/action/editor.action.ts @@ -2,16 +2,8 @@ import { Action } from '@ngrx/store'; export enum EditorActionTypes { UPDATE_STATUS = '[Provider Editor] Update Status', - LOAD_SCHEMA_REQUEST = '[Provider Editor] Load Schema Request', - LOAD_SCHEMA_SUCCESS = '[Provider Editor] Load Schema Success', - LOAD_SCHEMA_FAIL = '[Provider Editor] Load Schema Fail', - SELECT_PROVIDER_TYPE = '[Provider Editor] Select Provider Type', - - CLEAR = '[Provider Editor] Clear', - - LOCK = '[Provider Editor] Lock', - UNLOCK = '[Provider Editor] Unlock' + CLEAR = '[Provider Editor] Clear' } export class UpdateStatus implements Action { @@ -20,24 +12,6 @@ export class UpdateStatus implements Action { constructor(public payload: { [key: string]: string }) { } } -export class LoadSchemaRequest implements Action { - readonly type = EditorActionTypes.LOAD_SCHEMA_REQUEST; - - constructor(public payload: string) { } -} - -export class LoadSchemaSuccess implements Action { - readonly type = EditorActionTypes.LOAD_SCHEMA_SUCCESS; - - constructor(public payload: any) { } -} - -export class LoadSchemaFail implements Action { - readonly type = EditorActionTypes.LOAD_SCHEMA_FAIL; - - constructor(public payload: Error) { } -} - export class SelectProviderType implements Action { readonly type = EditorActionTypes.SELECT_PROVIDER_TYPE; @@ -48,20 +22,7 @@ export class ClearEditor implements Action { readonly type = EditorActionTypes.CLEAR; } -export class LockEditor implements Action { - readonly type = EditorActionTypes.LOCK; -} - -export class UnlockEditor implements Action { - readonly type = EditorActionTypes.UNLOCK; -} - export type EditorActionUnion = | UpdateStatus - | LoadSchemaRequest - | LoadSchemaSuccess - | LoadSchemaFail | SelectProviderType - | ClearEditor - | LockEditor - | UnlockEditor; + | ClearEditor; diff --git a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts b/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts deleted file mode 100644 index c74c4935b..000000000 --- a/ui/src/app/metadata/provider/component/provider-wizard-summary.component.ts +++ /dev/null @@ -1,83 +0,0 @@ -import { Component, Input, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core'; -import { Store } from '@ngrx/store'; - -import * as fromProvider from '../reducer'; -import { Wizard, WizardStep } from '../../../wizard/model'; -import { MetadataProvider } from '../../domain/model'; -import { Property } from '../model/property'; - -interface Section { - id: string; - index: number; - label: string; - properties: Property[]; -} - -export function getStepProperties(schema: any, model: any): Property[] { - if (!schema || !schema.properties) { return []; } - return Object.keys(schema.properties).map(property => ({ - name: schema.properties[property].title, - value: (model && model.hasOwnProperty(property)) ? model[property] : null, - type: schema.properties[property].type, - properties: schema.properties ? getStepProperties( - schema.properties[property], - (model && model.hasOwnProperty(property)) ? model[property] : null - ) : [] - })); -} - -@Component({ - selector: 'provider-wizard-summary', - templateUrl: './provider-wizard-summary.component.html', - styleUrls: [] -}) - -export class ProviderWizardSummaryComponent implements OnChanges { - @Input() summary: { definition: Wizard, schema: { [id: string]: any }, model: any }; - - @Output() onPageSelect: EventEmitter = new EventEmitter(); - - sections: Section[]; - columns: Array
[]; - - constructor( - private store: Store - ) {} - - ngOnChanges(changes: SimpleChanges): void { - if (changes.summary && this.summary) { - const schemas = this.summary.schema; - const model = this.summary.model; - const def = this.summary.definition; - const steps = def.steps; - - this.sections = steps - .filter(step => step.id !== 'summary') - .map( - (step: WizardStep) => ({ - id: step.id, - index: step.index, - label: step.label, - properties: getStepProperties(schemas[step.id], def.translate.formatter(model)) - }) - ); - - this.columns = this.sections.reduce((resultArray, item, index) => { - const chunkIndex = Math.floor(index / Math.round(this.sections.length / 2)); - - if (!resultArray[chunkIndex]) { - resultArray[chunkIndex] = []; - } - - resultArray[chunkIndex].push(item); - - return resultArray; - }, []); - } - } - - gotoPage(page: string = ''): void { - this.onPageSelect.emit(page); - } -} - diff --git a/ui/src/app/metadata/provider/component/summary-property.component.html b/ui/src/app/metadata/provider/component/summary-property.component.html deleted file mode 100644 index a4b4b57b5..000000000 --- a/ui/src/app/metadata/provider/component/summary-property.component.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - - - {{ property.name }} - {{ property.value || property.value === false ? property.value : '-' }} - - - - - {{ property.name }} - - - - - - -
diff --git a/ui/src/app/metadata/provider/component/summary-property.component.spec.ts b/ui/src/app/metadata/provider/component/summary-property.component.spec.ts deleted file mode 100644 index 45433c74d..000000000 --- a/ui/src/app/metadata/provider/component/summary-property.component.spec.ts +++ /dev/null @@ -1,77 +0,0 @@ -import { Component, ViewChild } from '@angular/core'; -import { TestBed, async, ComponentFixture } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; -import { StoreModule, Store, combineReducers } from '@ngrx/store'; - -import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; - -import { SummaryPropertyComponent } from './summary-property.component'; -import * as fromRoot from '../reducer'; -import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form'; -import * as fromWizard from '../../../wizard/reducer'; -import { Wizard } from '../../../wizard/model'; -import { MetadataProvider } from '../../domain/model'; -import { Property } from '../model/property'; -import { MockI18nModule } from '../../../../testing/i18n.stub'; - -@Component({ - template: ` - - ` -}) -class TestHostComponent { - @ViewChild(SummaryPropertyComponent) - public componentUnderTest: SummaryPropertyComponent; - - private _property; - - get property(): Property { - return this._property; - } - - set property(prop: Property) { - this._property = prop; - } -} - -describe('Summary Property Component', () => { - - let fixture: ComponentFixture; - let instance: TestHostComponent; - let app: SummaryPropertyComponent; - let store: Store; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - NgbDropdownModule.forRoot(), - RouterTestingModule, - SchemaFormModule.forRoot(), - StoreModule.forRoot({ - provider: combineReducers(fromRoot.reducers), - wizard: combineReducers(fromWizard.reducers) - }), - MockI18nModule - ], - declarations: [ - SummaryPropertyComponent, - TestHostComponent - ], - providers: [ - { provide: WidgetRegistry, useClass: DefaultWidgetRegistry } - ] - }).compileComponents(); - - store = TestBed.get(Store); - spyOn(store, 'dispatch'); - - fixture = TestBed.createComponent(TestHostComponent); - instance = fixture.componentInstance; - app = instance.componentUnderTest; - fixture.detectChanges(); - })); - - it('should instantiate the component', async(() => { - expect(app).toBeTruthy(); - })); -}); diff --git a/ui/src/app/metadata/provider/component/summary-property.component.ts b/ui/src/app/metadata/provider/component/summary-property.component.ts deleted file mode 100644 index 6dbd0c716..000000000 --- a/ui/src/app/metadata/provider/component/summary-property.component.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { Property } from '../model/property'; - -@Component({ - selector: 'summary-property', - templateUrl: './summary-property.component.html', - styleUrls: [] -}) - -export class SummaryPropertyComponent { - @Input() property: Property; -} - diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts index 21646b3a6..866d0d647 100644 --- a/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts +++ b/ui/src/app/metadata/provider/container/provider-edit-step.component.spec.ts @@ -8,7 +8,6 @@ import * as fromRoot from '../reducer'; import * as fromWizard from '../../../wizard/reducer'; import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form'; import { SharedModule } from '../../../shared/shared.module'; -import { SetDefinition } from '../../../wizard/action/wizard.action'; import { FileBackedHttpMetadataProviderEditor } from '../model'; @Component({ @@ -27,6 +26,7 @@ describe('Provider Edit Step Component', () => { let instance: TestHostComponent; let app: ProviderEditStepComponent; let store: Store; + let storeSpy: any; beforeEach(async(() => { TestBed.configureTestingModule({ @@ -42,6 +42,17 @@ describe('Provider Edit Step Component', () => { index: 'common', disabled: false, definition: FileBackedHttpMetadataProviderEditor, + schemaPath: '', + loading: false, + schema: { + type: 'object', + properties: { + foo: { + type: 'string' + } + } + }, + locked: false, schemaCollection: [] } }) @@ -57,7 +68,7 @@ describe('Provider Edit Step Component', () => { }).compileComponents(); store = TestBed.get(Store); - spyOn(store, 'dispatch'); + storeSpy = spyOn(store, 'dispatch'); fixture = TestBed.createComponent(TestHostComponent); instance = fixture.componentInstance; @@ -71,10 +82,10 @@ describe('Provider Edit Step Component', () => { describe('updateStatus method', () => { it('should update the status with provided errors', () => { + storeSpy.calls.reset(); app.currentPage = 'common'; app.updateStatus({value: 'common'}); - app.updateStatus({value: 'foo'}); - expect(store.dispatch).toHaveBeenCalledTimes(3); + expect(store.dispatch).toHaveBeenCalledTimes(1); }); }); diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts index 6ffc7e13c..ec83223fd 100644 --- a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts +++ b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts @@ -3,12 +3,13 @@ import { Observable, Subject } from 'rxjs'; import { Store } from '@ngrx/store'; import * as fromProvider from '../reducer'; -import { UpdateStatus, LockEditor, UnlockEditor } from '../action/editor.action'; +import { UpdateStatus } from '../action/editor.action'; import { Wizard, WizardStep } from '../../../wizard/model'; import { MetadataProvider } from '../../domain/model'; +import { LockEditor, UnlockEditor } from '../../../wizard/action/wizard.action'; import * as fromWizard from '../../../wizard/reducer'; -import { withLatestFrom, map, skipWhile, distinctUntilChanged, startWith, combineLatest } from 'rxjs/operators'; +import { withLatestFrom, map, skipWhile, distinctUntilChanged, takeUntil, filter } from 'rxjs/operators'; import { UpdateProvider } from '../action/entity.action'; import { FormControl } from '@angular/forms'; @@ -18,6 +19,8 @@ import { FormControl } from '@angular/forms'; styleUrls: [] }) export class ProviderEditStepComponent implements OnDestroy { + private ngUnsubscribe: Subject = new Subject(); + valueChangeSubject = new Subject>(); private valueChangeEmitted$ = this.valueChangeSubject.asObservable(); @@ -46,7 +49,7 @@ export class ProviderEditStepComponent implements OnDestroy { this.changes$ = this.store.select(fromProvider.getEntityChanges); this.provider$ = this.store.select(fromProvider.getSelectedProvider); this.step$ = this.store.select(fromWizard.getCurrent); - this.schema$ = this.store.select(fromProvider.getSchema); + this.schema$ = this.store.select(fromWizard.getParsedSchema); this.step$.subscribe(s => { if (s && s.locked) { @@ -64,10 +67,11 @@ export class ProviderEditStepComponent implements OnDestroy { this.store.select(fromProvider.getProviderXmlIds), this.provider$ ), - map(([def, names, ids, provider]) => def.getValidators( + filter(([def, names, ids, provider]) => !def), + map(([def, names, ids, provider]) => def ? def.getValidators( names.filter(n => n !== provider.name), ids.filter(id => id !== provider.xmlId) - )) + ) : {}) ); this.model$ = this.schema$.pipe( @@ -77,23 +81,27 @@ export class ProviderEditStepComponent implements OnDestroy { this.changes$, this.definition$ ), - map(([schema, provider, model, changes, definition]) => ({ - model: { - ...model, - ...provider, - ...changes - }, - definition - })), - skipWhile(({ model, definition }) => !definition || !model), - map(({ model, definition }) => definition.translate.formatter(model)) + map(([schema, provider, model, changes, definition]) => { + return ({ + model: { + ...model, + ...provider, + ...changes + }, + definition + }); + }), + filter(({ model, definition }) => definition && model), + map(({ model, definition }) => { + return definition ? definition.formatter(model) : {}; + }) ); this.valueChangeEmitted$.pipe( map(changes => changes.value), withLatestFrom(this.definition$), skipWhile(([ changes, definition ]) => !definition || !changes), - map(([ changes, definition ]) => definition.translate.parser(changes)) + map(([ changes, definition ]) => definition.parser(changes)) ) .subscribe(changes => this.store.dispatch(new UpdateProvider(changes))); @@ -113,6 +121,8 @@ export class ProviderEditStepComponent implements OnDestroy { ngOnDestroy() { this.valueChangeSubject.complete(); + this.statusChangeSubject.complete(); + this.ngUnsubscribe.unsubscribe(); } } diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.html b/ui/src/app/metadata/provider/container/provider-edit.component.html index 1775b8c92..ffba0f5ff 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.html +++ b/ui/src/app/metadata/provider/container/provider-edit.component.html @@ -10,10 +10,17 @@
- - + [status]="status$ | async"> + + + +