From 57ec69ad3b45a3d1f1431231c8c2b9deb1c00a3e Mon Sep 17 00:00:00 2001
From: Adrian Precub <adi.precub@gmail.com>
Date: Wed, 8 May 2019 17:26:17 +0300
Subject: [PATCH] BAEL-2587: create separate module for cognito (#6814)

* BAEL-2587: create separate module for cognito

* BAEL-2587: add separate module for cognito in parent pom

* BAEL-2587: remove cognito from spring-5-security-oauth module and correct pom.xml

* BAEL-2587: replace tabs with spaces in pom.xml to fix indentation

* BAEL-2587: fix pom indentation

* BAEL-2587: fix article link
---
 pom.xml                                       |  4 +-
 spring-5-security-cognito/README.md           |  3 +
 spring-5-security-cognito/pom.xml             | 74 +++++++++++++++++++
 .../cognito/CognitoWebConfiguration.java      |  2 +-
 .../cognito/SpringCognitoApplication.java     |  2 +-
 .../resources/cognito/application-cognito.yml |  0
 .../src/main/resources/cognito/home.html      |  0
 .../src/main/resources/cognito/style.css      |  0
 .../src/main/resources/logback.xml            | 13 ++++
 9 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 spring-5-security-cognito/README.md
 create mode 100644 spring-5-security-cognito/pom.xml
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java (91%)
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java (88%)
 rename spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml => spring-5-security-cognito/src/main/resources/cognito/application-cognito.yml (100%)
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/resources/cognito/home.html (100%)
 rename {spring-5-security-oauth => spring-5-security-cognito}/src/main/resources/cognito/style.css (100%)
 create mode 100644 spring-5-security-cognito/src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 89c9416ebb82..2ea5e4505c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,6 +608,7 @@
                 <module>spring-5-reactive-security</module>
                 <module>spring-5-security</module>
                 <module>spring-5-security-oauth</module>
+                <module>spring-5-security-cognito</module>
 
                 <module>spring-activiti</module>
                 <module>spring-akka</module>
@@ -819,6 +820,7 @@
 				<module>spring-5-reactive-security</module>
 				<module>spring-5-security</module>
 				<module>spring-5-security-oauth</module>
+				<module>spring-5-security-cognito</module>
 				<module>spring-activiti</module>
 				<module>spring-akka</module>
 				<module>spring-all</module>
@@ -1271,7 +1273,7 @@
                 <module>spring-5-reactive-security</module>
                 <module>spring-5-security</module>
                 <module>spring-5-security-oauth</module>
-
+                <module>spring-5-security-cognito</module>
                 <module>spring-activiti</module>
                 <module>spring-akka</module>
                 <module>spring-all</module>
diff --git a/spring-5-security-cognito/README.md b/spring-5-security-cognito/README.md
new file mode 100644
index 000000000000..0825882c0559
--- /dev/null
+++ b/spring-5-security-cognito/README.md
@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Authenticating with Amazon Cognito Using Spring Security](https://www.baeldung.com/spring-security-oauth-cognito)
diff --git a/spring-5-security-cognito/pom.xml b/spring-5-security-cognito/pom.xml
new file mode 100644
index 000000000000..c7314d6f9fbd
--- /dev/null
+++ b/spring-5-security-cognito/pom.xml
@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>spring-5-security-cognito</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-5-security-cognito</name>
+    <packaging>jar</packaging>
+    <description>spring 5 security oauth cognito sample project</description>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+        </dependency>
+
+        <!-- oauth2 -->
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>${oauth-auto.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-jose</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+	
+    <properties>
+        <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
+        <oauth-auto.version>2.1.0.RELEASE</oauth-auto.version>
+        <start-class>com.baeldung.cognito.SpringCognitoApplication</start-class>
+    </properties>
+
+</project>
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
similarity index 91%
rename from spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
rename to spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
index ae03e0a802c0..6841fa7a6537 100644
--- a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
+++ b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/CognitoWebConfiguration.java
@@ -6,7 +6,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-@PropertySource("cognito/application_cognito.yml")
+@PropertySource("cognito/application-cognito.yml")
 public class CognitoWebConfiguration implements WebMvcConfigurer {
 
     @Override
diff --git a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
similarity index 88%
rename from spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
rename to spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
index 7f7b751cd94c..eebe6d8f4595 100644
--- a/spring-5-security-oauth/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
+++ b/spring-5-security-cognito/src/main/java/com/baeldung/cognito/SpringCognitoApplication.java
@@ -5,7 +5,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
-@PropertySource("cognito/application_cognito.yml")
+@PropertySource("cognito/application-cognito.yml")
 public class SpringCognitoApplication {
 
     public static void main(String[] args) {
diff --git a/spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml b/spring-5-security-cognito/src/main/resources/cognito/application-cognito.yml
similarity index 100%
rename from spring-5-security-oauth/src/main/resources/cognito/application_cognito.yml
rename to spring-5-security-cognito/src/main/resources/cognito/application-cognito.yml
diff --git a/spring-5-security-oauth/src/main/resources/cognito/home.html b/spring-5-security-cognito/src/main/resources/cognito/home.html
similarity index 100%
rename from spring-5-security-oauth/src/main/resources/cognito/home.html
rename to spring-5-security-cognito/src/main/resources/cognito/home.html
diff --git a/spring-5-security-oauth/src/main/resources/cognito/style.css b/spring-5-security-cognito/src/main/resources/cognito/style.css
similarity index 100%
rename from spring-5-security-oauth/src/main/resources/cognito/style.css
rename to spring-5-security-cognito/src/main/resources/cognito/style.css
diff --git a/spring-5-security-cognito/src/main/resources/logback.xml b/spring-5-security-cognito/src/main/resources/logback.xml
new file mode 100644
index 000000000000..7d900d8ea884
--- /dev/null
+++ b/spring-5-security-cognito/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file