reddit improvements

Author: Doha2012

spring-security-oauth/Procfile

@@ -0,0 +1 @@
+web:    java $JAVA_OPTS -jar target/dependency/webapp-runner.jar --port $PORT target/*.war

spring-security-oauth/pom.xml

@@ -106,6 +106,26 @@
             <version>${httpcore.version}</version>
         </dependency>
 
+        <!-- thymeleaf -->
+        
+        <dependency>
+		    <groupId>org.thymeleaf</groupId>
+		    <artifactId>thymeleaf</artifactId>
+		    <version>2.1.4.RELEASE</version>
+		</dependency>
+        
+        <dependency>
+		    <groupId>org.thymeleaf</groupId>
+		    <artifactId>thymeleaf-spring4</artifactId>
+		    <version>2.1.4.RELEASE</version>
+		</dependency>
+        
+        <dependency>
+		    <groupId>org.thymeleaf.extras</groupId>
+		    <artifactId>thymeleaf-extras-springsecurity3</artifactId>
+		    <version>2.1.2.RELEASE</version>
+		</dependency>
+        
         <!-- persistence -->
 
         <dependency>
@@ -140,6 +160,14 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- h2 -->
+        
+        <dependency>
+		    <groupId>com.h2database</groupId>
+		    <artifactId>h2</artifactId>
+		    <version>1.4.187</version>
+		</dependency>
+        
         <!-- web -->
 
         <dependency>
@@ -328,6 +356,29 @@
                     </configuration>
                 </configuration>
             </plugin>
+            
+            <!-- webapp runner -->
+            <plugin>
+			    <groupId>org.apache.maven.plugins</groupId>
+			    <artifactId>maven-dependency-plugin</artifactId>
+			    <version>2.3</version>
+			    <executions>
+			        <execution>
+			            <phase>package</phase>
+			            <goals><goal>copy</goal></goals>
+			            <configuration>
+			                <artifactItems>
+			                    <artifactItem>
+			                        <groupId>com.github.jsimone</groupId>
+			                        <artifactId>webapp-runner</artifactId>
+			                        <version>7.0.57.2</version>
+			                        <destFileName>webapp-runner.jar</destFileName>
+			                    </artifactItem>
+			                </artifactItems>
+			            </configuration>
+			        </execution>
+			    </executions>
+			</plugin>
 
         </plugins>
 

spring-security-oauth/src/main/java/org/baeldung/config/SecurityConfig.java

@@ -34,7 +34,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .httpBasic().authenticationEntryPoint(oauth2AuthenticationEntryPoint())
                 .and()
                 .logout()
-                .deleteCookies("JSESSIONID","CustomRememberMe")
+                .deleteCookies("JSESSIONID")
                 .logoutUrl("/logout")
                 .logoutSuccessUrl("/");
         // @formatter:on

spring-security-oauth/src/main/java/org/baeldung/config/ServletInitializer.java

@@ -13,7 +13,7 @@ public class ServletInitializer extends AbstractDispatcherServletInitializer {
     @Override
     protected WebApplicationContext createServletApplicationContext() {
         final AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(PersistenceJPAConfig.class, WebConfig.class, SecurityConfig.class);
+        context.register(PersistenceJPAConfig.class, WebConfig.class, SecurityConfig.class, ThymeleafConfig.class);
         return context;
     }
 

spring-security-oauth/src/main/java/org/baeldung/config/SessionListener.java

@@ -13,7 +13,7 @@ public class SessionListener implements HttpSessionListener {
     @Override
     public void sessionCreated(HttpSessionEvent event) {
         logger.info("==== Session is created ====");
-        event.getSession().setMaxInactiveInterval(30 * 60);
+        event.getSession().setMaxInactiveInterval(60 * 60);
         event.getSession().setAttribute("PREDICTION_FEATURE", MyFeatures.PREDICTION_FEATURE);
     }
 

spring-security-oauth/src/main/java/org/baeldung/config/ThymeleafConfig.java

@@ -0,0 +1,39 @@
+package org.baeldung.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring4.SpringTemplateEngine;
+import org.thymeleaf.spring4.view.ThymeleafViewResolver;
+import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
+import org.thymeleaf.templateresolver.TemplateResolver;
+
+@Configuration
+public class ThymeleafConfig {
+    @Bean
+    public TemplateResolver templateResolver() {
+        final ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
+        templateResolver.setPrefix("/WEB-INF/jsp/");
+        templateResolver.setSuffix(".jsp");
+
+        return templateResolver;
+    }
+
+    @Bean
+    public SpringTemplateEngine templateEngine() {
+        final SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+        templateEngine.setTemplateResolver(templateResolver());
+        templateEngine.addDialect(new SpringSecurityDialect());
+        return templateEngine;
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        final ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+        viewResolver.setTemplateEngine(templateEngine());
+        viewResolver.setOrder(1);
+
+        return viewResolver;
+    }
+}

spring-security-oauth/src/main/java/org/baeldung/config/WebConfig.java

@@ -5,7 +5,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.baeldung.persistence.service.RedditTokenService;
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.lang.StringUtils;
+import org.baeldung.persistence.dao.PostRepository;
 import org.baeldung.reddit.classifier.RedditClassifier;
 import org.baeldung.reddit.util.MyFeatures;
 import org.baeldung.reddit.util.UserAgentInterceptor;
@@ -115,6 +118,9 @@ protected static class ResourceConfiguration {
         @Value("${clientSecret}")
         private String clientSecret;
 
+        @Autowired
+        private PostRepository repo;
+
         @Bean
         public OAuth2ProtectedResourceDetails reddit() {
             final AuthorizationCodeResourceDetails details = new AuthorizationCodeResourceDetails();
@@ -132,16 +138,24 @@ public OAuth2ProtectedResourceDetails reddit() {
         }
 
         @Bean
-        public OAuth2RestTemplate redditRestTemplate(OAuth2ClientContext clientContext, RedditTokenService redditTokenService) {
+        public OAuth2RestTemplate redditRestTemplate(OAuth2ClientContext clientContext) {
             final OAuth2RestTemplate template = new OAuth2RestTemplate(reddit(), clientContext);
             final List<ClientHttpRequestInterceptor> list = new ArrayList<ClientHttpRequestInterceptor>();
             list.add(new UserAgentInterceptor());
             template.setInterceptors(list);
             final AccessTokenProviderChain accessTokenProvider = new AccessTokenProviderChain(Arrays.<AccessTokenProvider> asList(new MyAuthorizationCodeAccessTokenProvider(), new ImplicitAccessTokenProvider(), new ResourceOwnerPasswordAccessTokenProvider(),
                     new ClientCredentialsAccessTokenProvider()));
-            accessTokenProvider.setClientTokenServices(redditTokenService);
             template.setAccessTokenProvider(accessTokenProvider);
             return template;
         }
+
+        @PostConstruct
+        public void startupCheck() {
+            if (StringUtils.isBlank(accessTokenUri) || StringUtils.isBlank(userAuthorizationUri) || StringUtils.isBlank(clientID) || StringUtils.isBlank(clientSecret)) {
+                throw new RuntimeException("Incomplete reddit properties");
+            }
+            repo.findAll();
+        }
+
     }
 }

spring-security-oauth/src/main/java/org/baeldung/persistence/dao/UserRepository.java

@@ -8,6 +8,4 @@ public interface UserRepository extends JpaRepository<User, Long> {
     User findByUsername(String username);
 
     User findByAccessToken(String token);
-
-    User findByRememberMeToken(String token);
 }

spring-security-oauth/src/main/java/org/baeldung/persistence/model/User.java

@@ -26,8 +26,6 @@ public class User {
 
     private boolean needCaptcha;
 
-    private String rememberMeToken;
-
     public User() {
         super();
     }
@@ -82,14 +80,6 @@ public void setNeedCaptcha(final boolean needCaptcha) {
 
     //
 
-    public String getRememberMeToken() {
-        return rememberMeToken;
-    }
-
-    public void setRememberMeToken(String rememberMeToken) {
-        this.rememberMeToken = rememberMeToken;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;