pac4j: Make user profile available in request registry both as concre…

…te type and `UserProfile` (#307)
ratpack · Apr 15, 2014 · 15daa5e · 15daa5e
1 parent c8c3c31
commit 15daa5e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/ratpack-pac4j/src/main/java/ratpack/pac4j/internal/Pac4jAuthenticationHandler.java b/ratpack-pac4j/src/main/java/ratpack/pac4j/internal/Pac4jAuthenticationHandler.java
@@ -66,6 +66,7 @@ public void handle(final Context context) throws Exception {
     } else {
       if (userProfile != null) {
         context.getRequest().register(userProfile);
+        context.getRequest().register(UserProfile.class, userProfile);
         authorizer.handleAuthorization(context, userProfile);
       } else {
         context.next();

diff --git a/ratpack-pac4j/src/test/groovy/ratpack/pac4j/openid/OpenIdRpSpec.groovy b/ratpack-pac4j/src/test/groovy/ratpack/pac4j/openid/OpenIdRpSpec.groovy
@@ -99,7 +99,7 @@ class OpenIdRpSpec extends Specification {
     def response = client.get("noauth")
 
     then: "the page is returned without any redirects, and without authentication"
-    response.asString() == "noauth:null"
+    response.asString() == "noauth:null:null"
 
     where:
     aut << [autConstructed, autInjected]
@@ -136,13 +136,13 @@ class OpenIdRpSpec extends Specification {
     def response4 = client.createRequest().cookies(response1.cookies).get(response3.header(LOCATION))
 
     then: "the original page is returned"
-    response4.asString() == "auth:${EMAIL}"
+    response4.asString() == "auth:${EMAIL}:${EMAIL}"
 
     when: "request a page that doesn't require authentication after authenticating"
     def response5 = client.createRequest().cookies(response1.cookies).get("noauth")
 
     then: "authentication information is still available"
-    response5.asString() == "noauth:${EMAIL}"
+    response5.asString() == "noauth:${EMAIL}:${EMAIL}"
 
     where:
     aut << [autConstructed, autInjected]

diff --git a/ratpack-pac4j/src/test/groovy/ratpack/pac4j/openid/RatpackOpenIdTestApplication.groovy b/ratpack-pac4j/src/test/groovy/ratpack/pac4j/openid/RatpackOpenIdTestApplication.groovy
@@ -17,6 +17,7 @@
 package ratpack.pac4j.openid
 
 import com.google.inject.Module
+import org.pac4j.core.profile.UserProfile
 import org.pac4j.openid.profile.google.GoogleOpenIdProfile
 import ratpack.groovy.test.embed.ClosureBackedEmbeddedApplication
 import ratpack.session.SessionModule
@@ -39,12 +40,14 @@ class RatpackOpenIdTestApplication extends ClosureBackedEmbeddedApplication {
     }
     handlers {
       get("noauth") {
-        def userProfile = request.maybeGet(GoogleOpenIdProfile)
-        response.send "noauth:${userProfile?.email}"
+        def typedUserProfile = request.maybeGet(GoogleOpenIdProfile)
+        def genericUserProfile = request.maybeGet(UserProfile)
+        response.send "noauth:${typedUserProfile?.email}:${genericUserProfile?.attributes?.email}"
       }
       get("auth") {
-        def userProfile = request.maybeGet(GoogleOpenIdProfile)
-        response.send "auth:${userProfile.email}"
+        def typedUserProfile = request.maybeGet(GoogleOpenIdProfile)
+        def genericUserProfile = request.maybeGet(UserProfile)
+        response.send "auth:${typedUserProfile.email}:${genericUserProfile?.attributes?.email}"
       }
       get("error") {
         response.send "An error was encountered."