Merge pull request #131 from Doha2012/master

Spring oauth reddit

spring-oauth/.classpath

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

spring-oauth/.project

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>spring-oauth</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.core.springbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springframework.ide.eclipse.core.springnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

spring-oauth/.springBeans

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beansProjectDescription>
+	<version>1</version>
+	<pluginVersion><![CDATA[3.6.3.201411271034-RELEASE]]></pluginVersion>
+	<configSuffixes>
+		<configSuffix><![CDATA[xml]]></configSuffix>
+	</configSuffixes>
+	<enableImports><![CDATA[true]]></enableImports>
+	<configs>
+	</configs>
+	<autoconfigs>
+	</autoconfigs>
+	<configSets>
+	</configSets>
+</beansProjectDescription>

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

@@ -0,0 +1,42 @@
+package org.baeldung.config;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.filter.DelegatingFilterProxy;
+import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer;
+
+public class ServletInitializer extends AbstractDispatcherServletInitializer {
+
+    @Override
+    protected WebApplicationContext createServletApplicationContext() {
+        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+        context.register(WebConfig.class);
+        return context;
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] { "/" };
+    }
+
+    @Override
+    protected WebApplicationContext createRootApplicationContext() {
+        return null;
+    }
+
+    @Override
+    public void onStartup(ServletContext servletContext) throws ServletException {
+        super.onStartup(servletContext);
+        registerProxyFilter(servletContext, "oauth2ClientContextFilter");
+    }
+
+    private void registerProxyFilter(ServletContext servletContext, String name) {
+        DelegatingFilterProxy filter = new DelegatingFilterProxy(name);
+        filter.setContextAttribute("org.springframework.web.servlet.FrameworkServlet.CONTEXT.dispatcher");
+        servletContext.addFilter(name, filter).addMappingForUrlPatterns(null, false, "/*");
+    }
+
+}

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

@@ -0,0 +1,94 @@
+package org.baeldung.config;
+
+import java.util.Arrays;
+
+import org.baeldung.web.RedditController;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2RestTemplate;
+import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
+import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableOAuth2Client;
+import org.springframework.web.client.RestOperations;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+@Configuration
+@EnableWebMvc
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+        return new PropertySourcesPlaceholderConfigurer();
+    }
+
+    @Bean
+    public ViewResolver viewResolver() {
+        InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
+        viewResolver.setPrefix("/WEB-INF/jsp/");
+        viewResolver.setSuffix(".jsp");
+        return viewResolver;
+    }
+
+    @Override
+    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+        configurer.enable();
+    }
+
+    @Bean
+    public RedditController redditController(@Qualifier("redditRestTemplate") RestOperations redditRestTemplate) {
+        RedditController controller = new RedditController();
+        controller.setRedditRestTemplate(redditRestTemplate);
+        return controller;
+    }
+
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
+    }
+
+    @Configuration
+    @EnableOAuth2Client
+    @PropertySource("classpath:reddit.properties")
+    protected static class ResourceConfiguration {
+
+        @Value("${accessTokenUri}")
+        private String accessTokenUri;
+
+        @Value("${userAuthorizationUri}")
+        private String userAuthorizationUri;
+
+        @Value("${clientID}")
+        private String clientID;
+
+        @Value("${clientSecret}")
+        private String clientSecret;
+
+        @Bean
+        public OAuth2ProtectedResourceDetails reddit() {
+            AuthorizationCodeResourceDetails details = new AuthorizationCodeResourceDetails();
+            details.setId("reddit");
+            details.setClientId(clientID);
+            details.setClientSecret(clientSecret);
+            details.setAccessTokenUri(accessTokenUri);
+            details.setUserAuthorizationUri(userAuthorizationUri);
+            details.setTokenName("oauth_token");
+            details.setScope(Arrays.asList("identity"));
+            return details;
+        }
+
+        @Bean
+        public OAuth2RestTemplate redditRestTemplate(OAuth2ClientContext clientContext) {
+            OAuth2RestTemplate template = new OAuth2RestTemplate(reddit(), clientContext);
+            return template;
+        }
+    }
+}

spring-oauth/src/main/java/org/baeldung/web/RedditController.java

@@ -0,0 +1,28 @@
+package org.baeldung.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.client.RestOperations;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Controller
+public class RedditController {
+
+    private RestOperations redditRestTemplate;
+
+    @RequestMapping("/reddit/info")
+    public String getInfo(Model model) throws Exception {
+        String result = redditRestTemplate.getForObject("https://oauth.reddit.com/api/v1/me", String.class);
+        JsonNode node = new ObjectMapper().readTree(result);
+        model.addAttribute("info", node.get("name").asText());
+        return "reddit";
+    }
+
+    public void setRedditRestTemplate(RestOperations redditRestTemplate) {
+        this.redditRestTemplate = redditRestTemplate;
+    }
+
+}

spring-oauth/src/main/resources/log4j.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+	
+	<!-- Application Loggers -->
+	<logger name="org.baeldung.web">
+		<level value="info" />
+	</logger>
+	
+	<!-- 3rdparty Loggers -->
+	<logger name="org.springframework.core">
+		<level value="info" />
+	</logger>
+	
+	<logger name="org.springframework.beans">
+		<level value="info" />
+	</logger>
+	
+	<logger name="org.springframework.context">
+		<level value="info" />
+	</logger>
+
+	<logger name="org.springframework.web">
+		<level value="info" />
+	</logger>
+
+	<!-- Root Logger -->
+	<root>
+		<priority value="warn" />
+		<appender-ref ref="console" />
+	</root>
+	
+</log4j:configuration>

spring-oauth/src/main/resources/reddit.properties

@@ -0,0 +1,4 @@
+clientID=5iAHD5-BBmEL8Q
+clientSecret=grkII6-THVcFsMm1wVTiQDRONmw
+accessTokenUri=https://www.reddit.com/api/v1/access_token
+userAuthorizationUri=https://www.reddit.com/api/v1/authorize

spring-oauth/src/main/webapp/WEB-INF/jsp/reddit.jsp

@@ -0,0 +1,12 @@
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+
+<title>Spring OAuth</title>
+</head>
+<body>
+<h1>Your Reddit Info</h1>
+<b>Your reddit username is </b>${info}
+</body>
+</html>

spring-oauth/src/main/webapp/index.jsp

@@ -0,0 +1,15 @@
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>Spring OAuth</title>
+</head>
+<body>
+	
+<h1>Welcome to Spring OAuth</h1>
+<a href="reddit/info">Login with Reddit</a>
+			
+</body>
+</html>

spring-oauth/src/test/resources/log4j.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+	<!-- Appenders -->
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%-5p: %c - %m%n" />
+		</layout>
+	</appender>
+	
+	<!-- Application Loggers -->
+	<logger name="org.baeldung.web">
+		<level value="info" />
+	</logger>
+	
+	<!-- 3rdparty Loggers -->
+	<logger name="org.springframework.core">
+		<level value="info" />
+	</logger>	
+	
+	<logger name="org.springframework.beans">
+		<level value="info" />
+	</logger>
+	
+	<logger name="org.springframework.context">
+		<level value="info" />
+	</logger>
+
+	<logger name="org.springframework.web">
+		<level value="info" />
+	</logger>
+
+	<!-- Root Logger -->
+	<root>
+		<priority value="info" />
+		<appender-ref ref="console" />
+	</root>
+	
+</log4j:configuration>

spring-security-login-and-registration/src/main/java/org/baeldung/registration/listener/RegistrationListener.java

@@ -41,7 +41,6 @@ public class RegistrationListener implements ApplicationListener<OnRegistrationC
         email.setTo(recipientAddress);
         email.setSubject(subject);
         email.setText(message + " \r\n" + "http://localhost:8080" + confirmationUrl);
-        System.out.println(email.getText());
         mailSender.send(email);
     }
 }

spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java

@@ -130,7 +130,7 @@ public class RegistrationController {
             return "redirect:/emailError.html?lang=" + locale.getLanguage();
         } catch (final Exception e) {
             LOGGER.debug(e.getLocalizedMessage());
-            model.addAttribute("error", e.getLocalizedMessage());
+            model.addAttribute("message", e.getLocalizedMessage());
             return "redirect:/login.html?lang=" + locale.getLanguage();
         }
         model.addAttribute("message", messages.getMessage("message.resendToken", null, locale));
@@ -156,7 +156,7 @@ public class RegistrationController {
             return "redirect:/emailError.html?lang=" + request.getLocale().getLanguage();
         } catch (final Exception e) {
             LOGGER.debug(e.getLocalizedMessage());
-            model.addAttribute("error", e.getLocalizedMessage());
+            model.addAttribute("message", e.getLocalizedMessage());
             return "redirect:/login.html?lang=" + request.getLocale().getLanguage();
         }
         model.addAttribute("message", messages.getMessage("message.resetPassword", null, request.getLocale()));
@@ -230,4 +230,4 @@ public class RegistrationController {
         }
         return registered;
     }
-}
+}

spring-security-login-and-registration/src/main/resources/messages_en.properties

@@ -54,7 +54,7 @@ NotEmpty.user.matchingPassword=Required
 PasswordMatches.user:Password does not match!
 Email.user.email=Invalid Username (Email)
 label.form.resendRegistrationToken=Re-send Token
-message.resendToken=We will send you a message with a new registration token to your email account.
+message.resendToken=We will send you a message with a new registration token to your email account
 message.forgetPassword=Forget Password
 message.resetPassword=Reset Password
 message.updatePassword=Update Password

spring-security-login-and-registration/src/main/resources/messages_es_ES.properties

@@ -53,4 +53,9 @@ NotNull.user.matchingPassword=Campo obligatirio
 NotEmpty.user.matchingPassword=Campo obligatrio
 PasswordMatches.user:Las claves no coinciden!
 Email.user.email=Email no es valido
-label.form.resendRegistrationToken=Reenviar mensaje de emergencia
+label.form.resendRegistrationToken=Reenviar mensaje de emergencia
+message.resendToken=Le enviaremos un mensaje con un nuevo token de registro en su cuenta de correo electrónico
+message.forgetPassword=Olvide la contraseña
+message.resetPassword=Restablecer contraseña
+message.updatePassword=Actualizar contraseña
+message.userNotFound=Usuario no encontrado

spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp

@@ -56,6 +56,12 @@
 </script>
 </head>
 <body>
+<c:if test="${param.message != null}">
+<div class="alert alert-error">
+${param.message}
+</div>
+</c:if>
+
 	<div class="container">
 		<div class="span12">
 			<h1>