[SHIBUI-1063]

Added a new 'ed' profile with a test EntityDescriptor created by the 'nonadmin' ROLE_USER from the 'dev' profile.
TIER · Jan 24, 2019 · d390b3e · d390b3e
1 parent 4099851
commit d390b3e
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.configuration
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
@@ -8,6 +9,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResol
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataQueryProtocolScheme
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
+import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
 import edu.internet2.tier.shibboleth.admin.ui.security.model.Role
 import edu.internet2.tier.shibboleth.admin.ui.security.model.User
@@ -28,11 +30,13 @@ class DevConfig {
     private final RoleRepository roleRepository
 
     private final MetadataResolverRepository metadataResolverRepository
+    private final EntityDescriptorRepository entityDescriptorRepository
 
-    DevConfig(UserRepository adminUserRepository, MetadataResolverRepository metadataResolverRepository, RoleRepository roleRepository) {
+    DevConfig(UserRepository adminUserRepository, MetadataResolverRepository metadataResolverRepository, RoleRepository roleRepository, EntityDescriptorRepository entityDescriptorRepository) {
         this.adminUserRepository = adminUserRepository
         this.metadataResolverRepository = metadataResolverRepository
         this.roleRepository = roleRepository
+        this.entityDescriptorRepository = entityDescriptorRepository
     }
 
     @Transactional
@@ -92,7 +96,6 @@ class DevConfig {
     @Bean
     MetadataResolver fbhmr(ModelRepresentationConversions modelRepresentationConversions) {
         return this.metadataResolverRepository.save(new FileBackedHttpMetadataResolver().with {
-            it.createdBy = 'nonadmin' // depends on dev profile
             enabled = true
             xmlId = 'test-fbhmr'
             name = 'test-fbhmr'
@@ -121,7 +124,6 @@ class DevConfig {
     @Bean
     MetadataResolver dhmr(ModelRepresentationConversions modelRepresentationConversions) {
         return this.metadataResolverRepository.save(new DynamicHttpMetadataResolver().with {
-            it.createdBy = 'nonadmin' // depends on dev profile
             it.enabled = true
             it.xmlId = 'test-dhmr'
             it.name = 'test-dhmr'
@@ -141,4 +143,17 @@ class DevConfig {
             return it
         })
     }
+
+    @Profile('ed')
+    @Transactional
+    @Bean
+    EntityDescriptor ed() {
+        return this.entityDescriptorRepository.save(new EntityDescriptor().with {
+            it.createdBy = 'nonadmin'
+            it.entityID = 'testID'
+            it.serviceEnabled = true
+            it.serviceProviderName = 'testSP'
+            it
+        })
+    }
 }