1242 - Pre and Post handlers added to IDSite outbound and inbound

Author: Mario

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/IDSiteLoginFilterFactory.java

@@ -31,5 +31,6 @@ protected IdSiteController newController() {
     public void doConfigure(IdSiteController controller, Config config) {
         controller.setIdSiteUri(config.get("stormpath.web.idSite.loginUri"));
         controller.setNextUri(config.get("stormpath.web.login.nextUri"));
+        controller.setPreLoginHandler(config.getLoginPreHandler());
     }
 }

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/IDSiteRegisterFilterFactory.java

@@ -32,6 +32,7 @@ protected IdSiteController newController() {
     public void doConfigure(IdSiteController controller, Config config) {
         controller.setIdSiteUri(config.get("stormpath.web.idSite.registerUri"));
         controller.setNextUri(config.get("stormpath.web.register.nextUri"));
+        controller.setPreRegisterHandler(config.getRegisterPreHandler());
     }
 
 }

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/IDSiteResultFilterFactory.java

@@ -31,6 +31,8 @@ protected IdSiteResultController newController() {
     @Override
     public void doConfigure(IdSiteResultController controller, Config config) {
         controller.setRegisterNextUri(config.getRegisterConfig().getNextUri());
+        controller.setPostRegisterHandler(config.getRegisterPostHandler());
+        controller.setPostLoginHandler(config.getLoginPostHandler());
     }
 
 }

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/CallbackController.java

@@ -19,7 +19,6 @@
 import com.stormpath.sdk.authc.AuthenticationResult;
 import com.stormpath.sdk.idsite.LogoutResult;
 import com.stormpath.sdk.lang.Assert;
-import com.stormpath.sdk.lang.Strings;
 import com.stormpath.sdk.saml.SamlResultListener;
 import com.stormpath.sdk.servlet.application.ApplicationResolver;
 import com.stormpath.sdk.servlet.authc.impl.DefaultSuccessfulAuthenticationRequestEvent;
@@ -43,6 +42,8 @@ public abstract class CallbackController extends AbstractController {
     protected Saver<AuthenticationResult> authenticationResultSaver;
     protected Publisher<RequestEvent> eventPublisher;
     protected List<SamlResultListener> samlResultListeners = new ArrayList<SamlResultListener>();
+    protected WebHandler postLoginHandler;
+    protected WebHandler postRegisterHandler;
 
     public void setLoginNextUri(String loginNextUri) {
         this.loginNextUri = loginNextUri;
@@ -106,6 +107,12 @@ protected ViewModel onAuthentication(HttpServletRequest request,
 
         publish(new DefaultSuccessfulAuthenticationRequestEvent(request, response, null, authcResult));
 
+        if (postLoginHandler != null) {
+            if (!postLoginHandler.handle(request, response, result.getAccount())) {
+                return null;
+            }
+        }
+
         return new DefaultViewModel(loginNextUri).setRedirect(true);
     }
 

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/IdSiteController.java

@@ -40,6 +40,9 @@ public class IdSiteController extends AbstractController {
 
     private Resolver<IdSiteOrganizationContext> idSiteOrganizationResolver;
 
+    protected WebHandler preRegisterHandler;
+    protected WebHandler preLoginHandler;
+
     public void setServerUriResolver(ServerUriResolver serverUriResolver) {
         this.serverUriResolver = serverUriResolver;
     }
@@ -65,13 +68,22 @@ public void init() {
         Assert.notNull(callbackUri, "callbackUri must be configured.");
         Assert.notNull(idSiteOrganizationResolver, "idSiteOrganizationResolver must be configured.");
         Assert.notNull(alreadyLoggedInUri, "alreadyLoggedInUri must be configured.");
+        Assert.isTrue(preRegisterHandler != null ^ preLoginHandler != null || (preRegisterHandler == null && preLoginHandler == null), "This IDSite controller should have only one of preRegisterHandler and preLoginHandler");
     }
 
     @Override
     public boolean isNotAllowedIfAuthenticated() {
         return false;
     }
 
+    public void setPreLoginHandler(WebHandler preLoginHandler) {
+        this.preLoginHandler = preLoginHandler;
+    }
+
+    public void setPreRegisterHandler(WebHandler preRegisterHandler) {
+        this.preRegisterHandler = preRegisterHandler;
+    }
+
     protected Application getApplication(HttpServletRequest request) {
         return ApplicationResolver.INSTANCE.getApplication(request);
     }
@@ -96,6 +108,16 @@ protected String buildCallbackUri(HttpServletRequest request) {
     @Override
     protected ViewModel doGet(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
+        if (preLoginHandler != null) {
+            if (!preLoginHandler.handle(request, response, null)) {
+                return null;
+            }
+        } else if (preRegisterHandler != null) {
+            if (!preRegisterHandler.handle(request, response, null)) {
+                return null;
+            }
+        }
+
         //Let's redirect to "alreadyLoggedInUri" if the user is already logged in
         if (AccountResolver.INSTANCE.getAccount(request) != null) {
             return new DefaultViewModel(alreadyLoggedInUri).setRedirect(true);

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/mvc/IdSiteResultController.java

@@ -20,6 +20,7 @@
 import com.stormpath.sdk.application.Application;
 import com.stormpath.sdk.authc.AuthenticationResult;
 import com.stormpath.sdk.client.Client;
+import com.stormpath.sdk.idsite.AccountResult;
 import com.stormpath.sdk.idsite.IdSiteCallbackHandler;
 import com.stormpath.sdk.idsite.IdSiteResultListener;
 import com.stormpath.sdk.idsite.LogoutResult;
@@ -106,7 +107,7 @@ public void onLogout(LogoutResult result) {
             idSiteCallbackHandler.addResultListener(resultListener);
         }
 
-        idSiteCallbackHandler.getAccountResult();
+        AccountResult accountResult = idSiteCallbackHandler.getAccountResult();
 
         return viewModel[0];
     }
@@ -126,7 +127,12 @@ private ViewModel onRegistration(final HttpServletRequest request, final HttpSer
             AuthenticationResult authcResult = new TransientAuthenticationResult(account);
             saveResult(request, response, authcResult);
         }
-        // else - do we need to do anything else?
+
+        if (postRegisterHandler != null) {
+            if (!postRegisterHandler.handle(request, response, account)) {
+                return null;
+            }
+        }
 
         //just redirect to post-register view:
         return new DefaultViewModel(registerNextUri).setRedirect(true);
@@ -136,4 +142,12 @@ private RegisteredAccountRequestEvent createRegisteredEvent(HttpServletRequest r
                                                                 HttpServletResponse response, Account account) {
         return new DefaultRegisteredAccountRequestEvent(request, response, account);
     }
+
+    public void setPostRegisterHandler(WebHandler postRegisterHandler) {
+        this.postRegisterHandler = postRegisterHandler;
+    }
+
+    public void setPostLoginHandler(WebHandler postLoginHandler) {
+        this.postLoginHandler = postLoginHandler;
+    }
 }

extensions/spring/stormpath-spring-webmvc/src/main/java/com/stormpath/spring/config/AbstractStormpathWebMvcConfiguration.java

@@ -909,7 +909,7 @@ public Resolver<SamlOrganizationContext> stormpathSamlOrganizationResolver() {
         return resolver;
     }
 
-    protected Controller createIdSiteController(String idSiteUri) {
+    protected IdSiteController createIdSiteController(String idSiteUri) {
         IdSiteController controller = new IdSiteController();
         controller.setServerUriResolver(stormpathServerUriResolver());
         controller.setIdSiteUri(idSiteUri);
@@ -962,7 +962,9 @@ public ControllerConfig stormpathLoginConfig() {
     public Controller stormpathLoginController() {
 
         if (idSiteEnabled) {
-            return createIdSiteController(idSiteLoginUri);
+            IdSiteController controller = createIdSiteController(idSiteLoginUri);
+            controller.setPreLoginHandler(loginPreHandler);
+            return controller;
         }
 
         //otherwise standard login controller:
@@ -1094,7 +1096,9 @@ public ControllerConfig stormpathRegisterConfig() {
     public Controller stormpathRegisterController() {
 
         if (idSiteEnabled) {
-            return createIdSiteController(idSiteRegisterUri);
+            IdSiteController controller = createIdSiteController(idSiteRegisterUri);
+            controller.setPreRegisterHandler(registerPreHandler);
+            return controller;
         }
 
         //otherwise standard registration:
@@ -1202,6 +1206,8 @@ public Controller stormpathIdSiteResultController() {
         if (springSecurityIdSiteResultListener != null) {
             controller.addIdSiteResultListener(springSecurityIdSiteResultListener);
         }
+        controller.setPostLoginHandler(loginPostHandler);
+        controller.setPostRegisterHandler(registerPostHandler);
         controller.init();
         return controller;
     }