Merge branch 'new-idp' into SHIBUI-1218

TIER · Feb 12, 2019 · e96494f · e96494f
2 parents 1ab6e41 + 780bbb9
commit e96494f
Show file tree

Hide file tree

Showing 3 changed files with 198 additions and 54 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
@@ -83,6 +83,14 @@ class DevConfig {
                 emailAddress = 'anon@institution.edu'
                 roles.add(roleRepository.findByName('ROLE_ADMIN').get())
                 it
+            }, new User().with { // allow us to auto-login as an admin
+                username = 'shibui-admin1'
+                password = '{noop}anonymous'
+                firstName = 'shibui'
+                lastName = 'admin'
+                emailAddress = 'jj@unicon.net'
+                roles.add(roleRepository.findByName('ROLE_ADMIN').get())
+                it
             }]
             users.each {
                 adminUserRepository.save(it)

diff --git a/pac4j-module/src/test/docker/conf/application.yml b/pac4j-module/src/test/docker/conf/application.yml
@@ -19,6 +19,11 @@ shibui:
     forceServiceProviderMetadataGeneration: true
     callbackUrl: "https://localhost:8443/callback"
     maximumAuthenticationLifetime: 3600000
+    saml2ProfileMapping:
+      username: urn:oid:0.9.2342.19200300.100.1.1
+      firstName: urn:oid:2.5.4.42
+      lastName: urn:oid:2.5.4.4
+      email: urn:oid:0.9.2342.19200300.100.1.3
 logging:
   level:
     org.pac4j: "TRACE"