1242 Extracted Login and Register IDSite controllers to their own sub-classes

Author: Mario

extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/IDSiteFilterFactory.java renamed to extensions/servlet/src/main/java/com/stormpath/sdk/servlet/config/filter/AbstractIDSiteFilterFactory.java

@@ -26,15 +26,13 @@
 /**
  * @since 1.0.0
  */
-public abstract class IDSiteFilterFactory extends ControllerFilterFactory<IdSiteController> {
+public abstract class AbstractIDSiteFilterFactory<T extends IdSiteController> extends ControllerFilterFactory<T> {
 
     @Override
-    protected IdSiteController newController() {
-        return new IdSiteController();
-    }
+    protected abstract T newController();
 
     @Override
-    protected void configure(IdSiteController controller, Config config) throws Exception {
+    protected void configure(T controller, Config config) throws Exception {
 
         SubdomainResolver subdomainResolver = new SubdomainResolver();
         subdomainResolver.setBaseDomainName(config.get("stormpath.web.application.domain"));
@@ -58,5 +56,5 @@ protected void configure(IdSiteController controller, Config config) throws Exce
         doConfigure(controller, config);
     }
 
-    public abstract void doConfigure(IdSiteController controller, Config config);
+    public abstract void doConfigure(T controller, Config config);
 }

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

@@ -21,7 +21,7 @@
 /**
  * @since 1.0.0
  */
-public class IDSiteForgotFilterFactory extends IDSiteFilterFactory {
+public class IDSiteForgotFilterFactory extends AbstractIDSiteFilterFactory<IdSiteController> {
 
     @Override
     protected IdSiteController newController() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,19 @@
 
 import com.stormpath.sdk.servlet.config.Config;
 import com.stormpath.sdk.servlet.mvc.IdSiteController;
+import com.stormpath.sdk.servlet.mvc.IdSiteLoginController;
 
 /**
- * @since 1.0.0
+ * @since 1.5.0
  */
-public class IDSiteLoginFilterFactory extends IDSiteFilterFactory {
+public class IDSiteLoginFilterFactory extends AbstractIDSiteFilterFactory<IdSiteLoginController> {
 
     @Override
-    protected IdSiteController newController() {
-        return new IdSiteController();
+    protected IdSiteLoginController newController() {
+        return new IdSiteLoginController();
     }
 
-    public void doConfigure(IdSiteController controller, Config config) {
+    public void doConfigure(IdSiteLoginController 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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Stormpath, Inc.
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,20 @@
 package com.stormpath.sdk.servlet.config.filter;
 
 import com.stormpath.sdk.servlet.config.Config;
-import com.stormpath.sdk.servlet.mvc.IdSiteController;
+import com.stormpath.sdk.servlet.mvc.IdSiteRegisterController;
 
 /**
- * @since 1.0.0
+ * @since 1.5.0
  */
-public class IDSiteRegisterFilterFactory extends IDSiteFilterFactory {
+public class IDSiteRegisterFilterFactory extends AbstractIDSiteFilterFactory<IdSiteRegisterController> {
 
     @Override
-    protected IdSiteController newController() {
-        return new IdSiteController();
+    protected IdSiteRegisterController newController() {
+        return new IdSiteRegisterController();
     }
 
     @Override
-    public void doConfigure(IdSiteController controller, Config config) {
+    public void doConfigure(IdSiteRegisterController 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/mvc/CallbackController.java

@@ -107,10 +107,8 @@ protected ViewModel onAuthentication(HttpServletRequest request,
 
         publish(new DefaultSuccessfulAuthenticationRequestEvent(request, response, null, authcResult));
 
-        if (postLoginHandler != null) {
-            if (!postLoginHandler.handle(request, response, result.getAccount())) {
-                return null;
-            }
+        if (postLoginHandler != null && !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,9 +40,6 @@ public class IdSiteController extends AbstractController {
 
     private Resolver<IdSiteOrganizationContext> idSiteOrganizationResolver;
 
-    protected WebHandler preRegisterHandler;
-    protected WebHandler preLoginHandler;
-
     public void setServerUriResolver(ServerUriResolver serverUriResolver) {
         this.serverUriResolver = serverUriResolver;
     }
@@ -68,22 +65,13 @@ 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), "This IDSite controller must contain 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);
     }
@@ -108,16 +96,6 @@ 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/IdSiteLoginController.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.servlet.mvc;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @since 1.5.0
+ */
+public class IdSiteLoginController extends IdSiteController {
+
+    protected WebHandler preLoginHandler;
+
+    public void setPreLoginHandler(WebHandler preLoginHandler) {
+        this.preLoginHandler = preLoginHandler;
+    }
+
+    @Override
+    protected ViewModel doGet(HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        if (preLoginHandler != null) {
+            if (!preLoginHandler.handle(request, response, null)) {
+                return null;
+            }
+        }
+
+        return super.doGet(request, response);
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017 Stormpath, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stormpath.sdk.servlet.mvc;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @since 1.5.0
+ */
+public class IdSiteRegisterController extends IdSiteController {
+
+    protected WebHandler preRegisterHandler;
+
+    public void setPreRegisterHandler(WebHandler preRegisterHandler) {
+        this.preRegisterHandler = preRegisterHandler;
+    }
+
+    @Override
+    protected ViewModel doGet(HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        if (preRegisterHandler != null) {
+            if (!preRegisterHandler.handle(request, response, null)) {
+                return null;
+            }
+        }
+
+        return super.doGet(request, response);
+    }
+}

extensions/spring/boot/stormpath-webmvc-spring-boot-starter/src/test/groovy/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityAutoConfigurationIT.groovy

@@ -17,27 +17,62 @@ package com.stormpath.spring.boot.autoconfigure
 
 import autoconfigure.StormpathWebSecurityAutoConfigurationTestApplication
 import com.stormpath.sdk.servlet.csrf.CsrfTokenManager
+import com.stormpath.sdk.servlet.filter.StormpathFilter
+import com.stormpath.sdk.servlet.mvc.Controller
+import com.stormpath.sdk.servlet.mvc.IdSiteLoginController
+import com.stormpath.sdk.servlet.mvc.LoginController
 import com.stormpath.spring.config.TwoAppTenantStormpathTestConfiguration
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.context.TestPropertySource
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests
 import org.springframework.test.context.web.WebAppConfiguration
 import org.testng.annotations.Test
 
 import static org.testng.Assert.assertEquals
+import static org.testng.Assert.assertNotNull
+import static org.testng.Assert.assertTrue
 
 /**
  * @since 1.0.RC5.2
  */
 @SpringBootTest(classes = [StormpathWebSecurityAutoConfigurationTestApplication.class, TwoAppTenantStormpathTestConfiguration.class])
 @WebAppConfiguration
+@TestPropertySource(locations = "classpath:it.application.properties")
 class StormpathWebSecurityAutoConfigurationIT extends AbstractTestNGSpringContextTests {
 
     @Autowired
     CsrfTokenManager csrfTokenManager
 
+    @Autowired
+    @Qualifier("stormpathLoginController")
+    Controller login
+
+    @Autowired
+    @Qualifier("stormpathRegisterController")
+    Controller register
+
+    @Autowired
+    @Qualifier("stormpathIdSiteResultController")
+    Controller idSiteResultController
+
+    @Value("#{ @environment['stormpath.web.idSite.enabled'] ?: false }")
+    protected boolean idSiteEnabled;
+
     @Test
     void testCsrfTokenManager() {
         assertEquals csrfTokenManager.tokenName, 'csrfToken'
     }
+
+    //asserts https://github.com/stormpath/stormpath-sdk-java/issues/1242
+    @Test
+    void assertPrePostHandlersArePresentWhenIDSiteIsEnabled() {
+        assertTrue idSiteEnabled
+        assertTrue(register.preRegisterHandler instanceof StormpathWebSecurityAutoConfigurationTestApplication.CustomRegisterPreHandler)
+        assertTrue(idSiteResultController.postRegisterHandler instanceof StormpathWebSecurityAutoConfigurationTestApplication.CustomRegisterPostHandler)
+        assertTrue(login.preLoginHandler instanceof StormpathWebSecurityAutoConfigurationTestApplication.CustomLoginPreHandler)
+        assertTrue(idSiteResultController.postLoginHandler instanceof StormpathWebSecurityAutoConfigurationTestApplication.CustomLoginPostHandler)
+    }
 }

extensions/spring/boot/stormpath-webmvc-spring-boot-starter/src/test/java/autoconfigure/StormpathWebSecurityAutoConfigurationTestApplication.java

@@ -15,13 +15,18 @@
  */
 package autoconfigure;
 
+import com.stormpath.sdk.account.Account;
+import com.stormpath.sdk.servlet.mvc.WebHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 
 /**
@@ -46,4 +51,51 @@ public static void main(String[] args) {
         }
     }
 
+    @Bean
+    public WebHandler registerPreHandler() {
+        return new CustomRegisterPreHandler();
+    }
+
+    @Bean
+    public WebHandler registerPostHandler() {
+        return new CustomRegisterPostHandler();
+    }
+
+    @Bean
+    public WebHandler loginPreHandler() {
+        return new CustomLoginPreHandler();
+    }
+
+    @Bean
+    public WebHandler loginPostHandler() {
+        return new CustomLoginPostHandler();
+    }
+
+    public class CustomRegisterPreHandler implements WebHandler {
+        @Override
+        public boolean handle(HttpServletRequest request, HttpServletResponse response, Account account) {
+            return false;
+        }
+    }
+
+    public class CustomRegisterPostHandler implements WebHandler {
+        @Override
+        public boolean handle(HttpServletRequest request, HttpServletResponse response, Account account) {
+            return false;
+        }
+    }
+
+    public class CustomLoginPreHandler implements WebHandler {
+        @Override
+        public boolean handle(HttpServletRequest request, HttpServletResponse response, Account account) {
+            return false;
+        }
+    }
+
+    public class CustomLoginPostHandler implements WebHandler {
+        @Override
+        public boolean handle(HttpServletRequest request, HttpServletResponse response, Account account) {
+            return false;
+        }
+    }
 }