authorizedRedirectUris) {
this.authorizedRedirectUris = authorizedRedirectUris;
return this;
}
}
-
- public Auth getAuth() {
- return auth;
- }
-
- public OAuth2 getOauth2() {
- return oauth2;
- }
}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/config/SecurityConfig.java b/spring-social/src/main/java/com/techatpark/starter/security/config/SecurityConfig.java
new file mode 100644
index 0000000..8b07430
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/config/SecurityConfig.java
@@ -0,0 +1,170 @@
+package com.techatpark.starter.security.config;
+
+import com.techatpark.starter.security.security.CustomUserDetailsService;
+import com.techatpark.starter.security.security.RestAuthenticationEntryPoint;
+import com.techatpark.starter.security.security.TokenAuthenticationFilter;
+import com.techatpark.starter.security.security.oauth2.CustomOAuth2UserService;
+import com.techatpark.starter.security.security.oauth2.HttpCookieOAuth2AuthorizationRequestRepository;
+import com.techatpark.starter.security.security.oauth2.OAuth2AuthenticationFailureHandler;
+import com.techatpark.starter.security.security.oauth2.OAuth2AuthenticationSuccessHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.BeanIds;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.util.List;
+
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(
+ securedEnabled = true,
+ jsr250Enabled = true,
+ prePostEnabled = true
+)
+@EnableConfigurationProperties(AppProperties.class)
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+ @Autowired
+ private CustomUserDetailsService customUserDetailsService;
+
+ @Autowired
+ private CustomOAuth2UserService customOAuth2UserService;
+
+ @Autowired
+ private OAuth2AuthenticationSuccessHandler
+ oAuth2AuthenticationSuccessHandler;
+
+ @Autowired
+ private OAuth2AuthenticationFailureHandler
+ oAuth2AuthenticationFailureHandler;
+
+ @Autowired
+ private HttpCookieOAuth2AuthorizationRequestRepository
+ httpCookieOAuth2AuthorizationRequestRepository;
+
+ @Bean
+ public TokenAuthenticationFilter tokenAuthenticationFilter() {
+ return new TokenAuthenticationFilter();
+ }
+
+ /*
+ By default, Spring OAuth2 uses HttpSessionOAuth2AuthorizationRequestRepository to save
+ the authorization request. But, since our service is stateless, we can't save it in
+ the session. We'll save the request in a Base64 encoded cookie instead.
+ */
+ @Bean
+ public HttpCookieOAuth2AuthorizationRequestRepository cookieAuthorizationRequestRepository() {
+ return new HttpCookieOAuth2AuthorizationRequestRepository();
+ }
+
+ @Override
+ public void configure(
+ AuthenticationManagerBuilder authenticationManagerBuilder)
+ throws Exception {
+ authenticationManagerBuilder
+ .userDetailsService(customUserDetailsService)
+ .passwordEncoder(passwordEncoder());
+ }
+
+ @Bean
+ public PasswordEncoder passwordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
+
+
+ @Bean(BeanIds.AUTHENTICATION_MANAGER)
+ @Override
+ public AuthenticationManager authenticationManagerBean() throws Exception {
+ return super.authenticationManagerBean();
+ }
+
+ @Override
+ protected void configure(HttpSecurity http) throws Exception {
+ http
+ .cors()
+ .and()
+ .sessionManagement()
+ .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+ .and()
+ .csrf()
+ .disable()
+ .formLogin()
+ .disable()
+ .httpBasic()
+ .disable()
+ .exceptionHandling()
+ .authenticationEntryPoint(new RestAuthenticationEntryPoint())
+ .and()
+ .authorizeRequests()
+ .antMatchers("/",
+ "/error",
+ "/favicon.ico",
+ "/**/*.png",
+ "/**/*.gif",
+ "/**/*.svg",
+ "/**/*.jpg",
+ "/**/*.html",
+ "/**/*.css",
+ "/**/*.js")
+ .permitAll()
+ .antMatchers("/api/auth/login"
+ , "/api/auth/signup"
+ , "/oauth2/**")
+ .permitAll()
+ .anyRequest()
+ .authenticated()
+ .and()
+ .oauth2Login()
+ .authorizationEndpoint()
+ .baseUri("/oauth2/authorize")
+ .authorizationRequestRepository(
+ cookieAuthorizationRequestRepository())
+ .and()
+ .redirectionEndpoint()
+ .baseUri("/oauth2/callback/*")
+ .and()
+ .userInfoEndpoint()
+ .userService(customOAuth2UserService)
+ .and()
+ .successHandler(oAuth2AuthenticationSuccessHandler)
+ .failureHandler(oAuth2AuthenticationFailureHandler);
+
+ // Add our custom Token based authentication filter
+ http.addFilterBefore(tokenAuthenticationFilter(),
+ UsernamePasswordAuthenticationFilter.class);
+ }
+
+ /**
+ * In Production we can controld the filters from application.yml
+ *
+ * @return corsFilter
+ */
+ @Bean
+ public CorsFilter corsFilter() {
+ CorsConfiguration config = new CorsConfiguration();
+ config.addAllowedOriginPattern("*");
+ config.addAllowedHeader("*");
+ config.setAllowedMethods(
+ List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
+
+ UrlBasedCorsConfigurationSource source =
+ new UrlBasedCorsConfigurationSource();
+ source.registerCorsConfiguration("/**", config);
+
+ return new CorsFilter(source);
+ }
+}
diff --git a/spring-social/src/main/java/com/example/springsocial/controller/AuthController.java b/spring-social/src/main/java/com/techatpark/starter/security/controller/AuthController.java
similarity index 53%
rename from spring-social/src/main/java/com/example/springsocial/controller/AuthController.java
rename to spring-social/src/main/java/com/techatpark/starter/security/controller/AuthController.java
index 4f3f413..15e9717 100644
--- a/spring-social/src/main/java/com/example/springsocial/controller/AuthController.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/controller/AuthController.java
@@ -1,14 +1,13 @@
-package com.example.springsocial.controller;
-
-import com.example.springsocial.exception.BadRequestException;
-import com.example.springsocial.model.AuthProvider;
-import com.example.springsocial.model.User;
-import com.example.springsocial.payload.ApiResponse;
-import com.example.springsocial.payload.AuthResponse;
-import com.example.springsocial.payload.LoginRequest;
-import com.example.springsocial.payload.SignUpRequest;
-import com.example.springsocial.repository.UserRepository;
-import com.example.springsocial.security.TokenProvider;
+package com.techatpark.starter.security.controller;
+
+import com.techatpark.starter.security.exception.BadRequestException;
+import com.techatpark.starter.security.model.AuthProvider;
+import com.techatpark.starter.security.model.User;
+import com.techatpark.starter.security.payload.ApiResponse;
+import com.techatpark.starter.security.payload.AuthenticationResponse;
+import com.techatpark.starter.security.payload.AuthenticationRequest;
+import com.techatpark.starter.security.repository.UserRepository;
+import com.techatpark.starter.security.security.TokenProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
@@ -16,14 +15,17 @@
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
import javax.validation.Valid;
import java.net.URI;
@RestController
-@RequestMapping("/auth")
+@RequestMapping("/api/auth")
public class AuthController {
@Autowired
@@ -39,11 +41,12 @@ public class AuthController {
private TokenProvider tokenProvider;
@PostMapping("/login")
- public ResponseEntity authenticateUser(@Valid @RequestBody LoginRequest loginRequest) {
+ public ResponseEntity authenticateUser(
+ @Valid @RequestBody AuthenticationRequest loginRequest) {
Authentication authentication = authenticationManager.authenticate(
new UsernamePasswordAuthenticationToken(
- loginRequest.getEmail(),
+ loginRequest.getUserName(),
loginRequest.getPassword()
)
);
@@ -51,19 +54,25 @@ public ResponseEntity authenticateUser(@Valid @RequestBody LoginRequest login
SecurityContextHolder.getContext().setAuthentication(authentication);
String token = tokenProvider.createToken(authentication);
- return ResponseEntity.ok(new AuthResponse(token));
+ AuthenticationResponse authenticationResponse =
+ new AuthenticationResponse(loginRequest.getUserName(),
+ token,
+ "Refresh",
+ "/images/"+loginRequest.getUserName()+".png");
+ return ResponseEntity.ok(authenticationResponse);
}
@PostMapping("/signup")
- public ResponseEntity registerUser(@Valid @RequestBody SignUpRequest signUpRequest) {
- if(userRepository.existsByEmail(signUpRequest.getEmail())) {
+ public ResponseEntity registerUser(
+ @Valid @RequestBody AuthenticationRequest signUpRequest) {
+ if (userRepository.existsByName(signUpRequest.getUserName())) {
throw new BadRequestException("Email address already in use.");
}
// Creating user's account
User user = new User();
- user.setName(signUpRequest.getName());
- user.setEmail(signUpRequest.getEmail());
+ user.setName(signUpRequest.getUserName());
+// user.setEmail(signUpRequest.getEmail());
user.setPassword(signUpRequest.getPassword());
user.setProvider(AuthProvider.local);
@@ -73,7 +82,7 @@ public ResponseEntity registerUser(@Valid @RequestBody SignUpRequest signUpRe
URI location = ServletUriComponentsBuilder
.fromCurrentContextPath().path("/user/me")
- .buildAndExpand(result.getId()).toUri();
+ .buildAndExpand(result.getName()).toUri();
return ResponseEntity.created(location)
.body(new ApiResponse(true, "User registered successfully@"));
diff --git a/spring-social/src/main/java/com/example/springsocial/controller/SequenceGenerator.java b/spring-social/src/main/java/com/techatpark/starter/security/controller/SequenceGenerator.java
similarity index 76%
rename from spring-social/src/main/java/com/example/springsocial/controller/SequenceGenerator.java
rename to spring-social/src/main/java/com/techatpark/starter/security/controller/SequenceGenerator.java
index 2f48cb3..28ba272 100644
--- a/spring-social/src/main/java/com/example/springsocial/controller/SequenceGenerator.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/controller/SequenceGenerator.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.controller;
+package com.techatpark.starter.security.controller;
import java.net.NetworkInterface;
@@ -9,7 +9,7 @@
/**
* Distributed Sequence Generator.
* Inspired by Twitter snowflake: https://github.com/twitter/snowflake/tree/snowflake-2010
- *
+ *
* This class should be used as a Singleton.
* Make sure that you create and reuse a Single instance of SequenceGenerator per machine in your distributed system cluster.
*/
@@ -19,8 +19,10 @@ public class SequenceGenerator {
private static final int MACHINE_ID_BITS = 10;
private static final int SEQUENCE_BITS = 12;
- private static final int maxMachineId = (int)(Math.pow(2, MACHINE_ID_BITS) - 1);
- private static final int maxSequence = (int)(Math.pow(2, SEQUENCE_BITS) - 1);
+ private static final int maxMachineId =
+ (int) (Math.pow(2, MACHINE_ID_BITS) - 1);
+ private static final int maxSequence =
+ (int) (Math.pow(2, SEQUENCE_BITS) - 1);
// Custom Epoch (January 1, 2015 Midnight UTC = 2015-01-01T00:00:00Z)
private static final long CUSTOM_EPOCH = 1420070400000L;
@@ -32,8 +34,10 @@ public class SequenceGenerator {
// Create Snowflake with a machineId
public SequenceGenerator(int machineId) {
- if(machineId < 0 || machineId > maxMachineId) {
- throw new IllegalArgumentException(String.format("MachineId must be between %d and %d", 0, maxMachineId));
+ if (machineId < 0 || machineId > maxMachineId) {
+ throw new IllegalArgumentException(
+ String.format("MachineId must be between %d and %d", 0,
+ maxMachineId));
}
this.machineId = machineId;
}
@@ -43,18 +47,22 @@ public SequenceGenerator() {
this.machineId = createMachineId();
}
+ // Get current timestamp in milliseconds, adjust for the custom epoch.
+ private static long timestamp() {
+ return Instant.now().toEpochMilli() - CUSTOM_EPOCH;
+ }
public long nextId() {
long currentTimestamp = timestamp();
synchronized (this) {
- if(currentTimestamp < lastTimestamp) {
+ if (currentTimestamp < lastTimestamp) {
throw new IllegalStateException("Invalid System Clock!");
}
if (currentTimestamp == lastTimestamp) {
sequence = (sequence + 1) & maxSequence;
- if(sequence == 0) {
+ if (sequence == 0) {
// Sequence Exhausted, wait till next millisecond.
currentTimestamp = waitNextMillis(currentTimestamp);
}
@@ -72,12 +80,6 @@ public long nextId() {
return id;
}
-
- // Get current timestamp in milliseconds, adjust for the custom epoch.
- private static long timestamp() {
- return Instant.now().toEpochMilli() - CUSTOM_EPOCH;
- }
-
// Block and wait till next millisecond
private long waitNextMillis(long currentTimestamp) {
while (currentTimestamp == lastTimestamp) {
@@ -90,13 +92,15 @@ private int createMachineId() {
int machineId;
try {
StringBuilder sb = new StringBuilder();
- Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces();
+ Enumeration networkInterfaces =
+ NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements()) {
- NetworkInterface networkInterface = networkInterfaces.nextElement();
+ NetworkInterface networkInterface =
+ networkInterfaces.nextElement();
byte[] mac = networkInterface.getHardwareAddress();
if (mac != null) {
- for(int i = 0; i < mac.length; i++) {
- sb.append(String.format("%02X", mac[i]));
+ for (byte b : mac) {
+ sb.append(String.format("%02X", b));
}
}
}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/controller/UserController.java b/spring-social/src/main/java/com/techatpark/starter/security/controller/UserController.java
new file mode 100644
index 0000000..0677867
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/controller/UserController.java
@@ -0,0 +1,26 @@
+package com.techatpark.starter.security.controller;
+
+import com.techatpark.starter.security.exception.ResourceNotFoundException;
+import com.techatpark.starter.security.model.User;
+import com.techatpark.starter.security.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.security.Principal;
+
+@RestController
+public class UserController {
+
+ @Autowired
+ private UserRepository userRepository;
+
+ @GetMapping("/api/auth/me")
+ @PreAuthorize("hasRole('USER')")
+ public User getCurrentUser(Principal principal) {
+ return userRepository.findByName(principal.getName())
+ .orElseThrow(() -> new ResourceNotFoundException("User", "id",
+ principal.getName()));
+ }
+}
diff --git a/spring-social/src/main/java/com/example/springsocial/exception/BadRequestException.java b/spring-social/src/main/java/com/techatpark/starter/security/exception/BadRequestException.java
similarity index 88%
rename from spring-social/src/main/java/com/example/springsocial/exception/BadRequestException.java
rename to spring-social/src/main/java/com/techatpark/starter/security/exception/BadRequestException.java
index 00bbacf..82a1cfa 100644
--- a/spring-social/src/main/java/com/example/springsocial/exception/BadRequestException.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/exception/BadRequestException.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.exception;
+package com.techatpark.starter.security.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/spring-social/src/main/java/com/example/springsocial/exception/OAuth2AuthenticationProcessingException.java b/spring-social/src/main/java/com/techatpark/starter/security/exception/OAuth2AuthenticationProcessingException.java
similarity index 64%
rename from spring-social/src/main/java/com/example/springsocial/exception/OAuth2AuthenticationProcessingException.java
rename to spring-social/src/main/java/com/techatpark/starter/security/exception/OAuth2AuthenticationProcessingException.java
index 1e9ddf7..3cd0e39 100644
--- a/spring-social/src/main/java/com/example/springsocial/exception/OAuth2AuthenticationProcessingException.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/exception/OAuth2AuthenticationProcessingException.java
@@ -1,8 +1,9 @@
-package com.example.springsocial.exception;
+package com.techatpark.starter.security.exception;
import org.springframework.security.core.AuthenticationException;
-public class OAuth2AuthenticationProcessingException extends AuthenticationException {
+public class OAuth2AuthenticationProcessingException
+ extends AuthenticationException {
public OAuth2AuthenticationProcessingException(String msg, Throwable t) {
super(msg, t);
}
diff --git a/spring-social/src/main/java/com/example/springsocial/exception/ResourceNotFoundException.java b/spring-social/src/main/java/com/techatpark/starter/security/exception/ResourceNotFoundException.java
similarity index 73%
rename from spring-social/src/main/java/com/example/springsocial/exception/ResourceNotFoundException.java
rename to spring-social/src/main/java/com/techatpark/starter/security/exception/ResourceNotFoundException.java
index aadf0b5..cbcd76b 100644
--- a/spring-social/src/main/java/com/example/springsocial/exception/ResourceNotFoundException.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/exception/ResourceNotFoundException.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.exception;
+package com.techatpark.starter.security.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@@ -9,8 +9,11 @@ public class ResourceNotFoundException extends RuntimeException {
private String fieldName;
private Object fieldValue;
- public ResourceNotFoundException(String resourceName, String fieldName, Object fieldValue) {
- super(String.format("%s not found with %s : '%s'", resourceName, fieldName, fieldValue));
+ public ResourceNotFoundException(String resourceName, String fieldName,
+ Object fieldValue) {
+ super(String
+ .format("%s not found with %s : '%s'", resourceName, fieldName,
+ fieldValue));
this.resourceName = resourceName;
this.fieldName = fieldName;
this.fieldValue = fieldValue;
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/model/AuthProvider.java b/spring-social/src/main/java/com/techatpark/starter/security/model/AuthProvider.java
new file mode 100644
index 0000000..ac3a2fe
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/model/AuthProvider.java
@@ -0,0 +1,8 @@
+package com.techatpark.starter.security.model;
+
+public enum AuthProvider {
+ local,
+ facebook,
+ google,
+ github
+}
diff --git a/spring-social/src/main/java/com/example/springsocial/model/User.java b/spring-social/src/main/java/com/techatpark/starter/security/model/User.java
similarity index 53%
rename from spring-social/src/main/java/com/example/springsocial/model/User.java
rename to spring-social/src/main/java/com/techatpark/starter/security/model/User.java
index a110e43..89fa958 100644
--- a/spring-social/src/main/java/com/example/springsocial/model/User.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/model/User.java
@@ -1,47 +1,24 @@
-package com.example.springsocial.model;
+package com.techatpark.starter.security.model;
+
import com.fasterxml.jackson.annotation.JsonIgnore;
-import javax.persistence.*;
-import javax.validation.constraints.Email;
import javax.validation.constraints.NotNull;
-@Entity
-@Table(name = "users", uniqueConstraints = {
- @UniqueConstraint(columnNames = "email")
-})
+
public class User {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Long id;
- @Column(nullable = false)
private String name;
- @Email
- @Column(nullable = false)
- private String email;
-
private String imageUrl;
- @Column(nullable = false)
- private Boolean emailVerified = false;
-
@JsonIgnore
private String password;
@NotNull
- @Enumerated(EnumType.STRING)
private AuthProvider provider;
private String providerId;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
public String getName() {
return name;
@@ -51,13 +28,6 @@ public void setName(String name) {
this.name = name;
}
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
public String getImageUrl() {
return imageUrl;
@@ -67,13 +37,6 @@ public void setImageUrl(String imageUrl) {
this.imageUrl = imageUrl;
}
- public Boolean getEmailVerified() {
- return emailVerified;
- }
-
- public void setEmailVerified(Boolean emailVerified) {
- this.emailVerified = emailVerified;
- }
public String getPassword() {
return password;
diff --git a/spring-social/src/main/java/com/example/springsocial/payload/ApiResponse.java b/spring-social/src/main/java/com/techatpark/starter/security/payload/ApiResponse.java
similarity index 91%
rename from spring-social/src/main/java/com/example/springsocial/payload/ApiResponse.java
rename to spring-social/src/main/java/com/techatpark/starter/security/payload/ApiResponse.java
index fbbf5d5..30200a5 100644
--- a/spring-social/src/main/java/com/example/springsocial/payload/ApiResponse.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/payload/ApiResponse.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.payload;
+package com.techatpark.starter.security.payload;
public class ApiResponse {
private boolean success;
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/payload/AuthenticationRequest.java b/spring-social/src/main/java/com/techatpark/starter/security/payload/AuthenticationRequest.java
new file mode 100644
index 0000000..bd73d47
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/payload/AuthenticationRequest.java
@@ -0,0 +1,49 @@
+package com.techatpark.starter.security.payload;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public final class AuthenticationRequest {
+
+ /**
+ * declares variable.
+ */
+ private final String userName;
+ /**
+ * declares variable.
+ */
+ private final String password;
+
+ /**
+ * initializing the userName,password.
+ *
+ * @param anUserName
+ * @param aPassword
+ */
+ @JsonCreator
+ public AuthenticationRequest(
+ @JsonProperty("userName") final String anUserName,
+ @JsonProperty("password") final String aPassword) {
+ this.userName = anUserName;
+ this.password = aPassword;
+ }
+
+ /**
+ * gets the value for userName.
+ *
+ * @return username
+ */
+ public String getUserName() {
+ return userName;
+ }
+
+ /**
+ * gets the value for password.
+ *
+ * @return password
+ */
+ public String getPassword() {
+ return password;
+ }
+
+}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/payload/AuthenticationResponse.java b/spring-social/src/main/java/com/techatpark/starter/security/payload/AuthenticationResponse.java
new file mode 100644
index 0000000..d516a1b
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/payload/AuthenticationResponse.java
@@ -0,0 +1,79 @@
+package com.techatpark.starter.security.payload;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public final class AuthenticationResponse {
+ /**
+ * declares variable userName.
+ */
+ private final String userName;
+ /**
+ * declares variable authToken.
+ */
+ private final String authToken;
+ /**
+ * declares variable refreshToken.
+ */
+ private final String refreshToken;
+ /**
+ * declares variable profilePicture.
+ */
+ private final String profilePicture;
+
+ /**
+ * initializes the value for authToken,refresh_token,profile_pic.
+ *
+ * @param anUserName
+ * @param anAuthToken
+ * @param aRefreshToken
+ * @param aProfilePicture
+ */
+ @JsonCreator
+ public AuthenticationResponse(
+ @JsonProperty("userName") final String anUserName,
+ @JsonProperty("authToken") final String anAuthToken,
+ @JsonProperty("refresh_token") final String aRefreshToken,
+ @JsonProperty("profile_pic") final String aProfilePicture) {
+ this.userName = anUserName;
+ this.authToken = anAuthToken;
+ this.refreshToken = aRefreshToken;
+ this.profilePicture = aProfilePicture;
+ }
+
+ /**
+ * gets the value for auth token.
+ *
+ * @return auth token
+ */
+ public String getAuthToken() {
+ return authToken;
+ }
+
+ /**
+ * gets the value for refresh token.
+ *
+ * @return refresh token
+ */
+ public String getRefreshToken() {
+ return refreshToken;
+ }
+
+ /**
+ * gets the value for profile picture.
+ *
+ * @return profile picture
+ */
+ public String getProfilePicture() {
+ return profilePicture;
+ }
+
+ /**
+ * gets the value for userName.
+ *
+ * @return userName
+ */
+ public String getUserName() {
+ return userName;
+ }
+}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/repository/UserRepository.java b/spring-social/src/main/java/com/techatpark/starter/security/repository/UserRepository.java
new file mode 100644
index 0000000..926922b
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/repository/UserRepository.java
@@ -0,0 +1,50 @@
+package com.techatpark.starter.security.repository;
+
+import com.techatpark.starter.security.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Component
+public class UserRepository {
+
+
+ private final List users;
+
+ public UserRepository(final PasswordEncoder passwordEncoder) {
+ this.users = new ArrayList<>();
+
+ User user = new User();
+ user.setName("tom");
+ user.setPassword(passwordEncoder.encode("password"));
+
+ users.add(user);
+
+ user = new User();
+ user.setName("jerry");
+ user.setPassword(passwordEncoder.encode("password"));
+
+ users.add(user);
+
+ }
+
+ public Optional findByName(String name) {
+ return this.users.stream()
+ .filter(user -> user.getName().equals(name))
+ .findFirst();
+ }
+
+ public Boolean existsByName(String name) {
+ return this.users.stream()
+ .anyMatch(user -> user.getName().equals(name));
+ }
+
+ public User save(User user) {
+ users.add(user);
+ return user;
+ }
+}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/security/CurrentUser.java b/spring-social/src/main/java/com/techatpark/starter/security/security/CurrentUser.java
new file mode 100644
index 0000000..dd52123
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/CurrentUser.java
@@ -0,0 +1,17 @@
+package com.techatpark.starter.security.security;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.PARAMETER, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@AuthenticationPrincipal
+public @interface CurrentUser {
+
+}
\ No newline at end of file
diff --git a/spring-social/src/main/java/com/example/springsocial/security/CustomUserDetailsService.java b/spring-social/src/main/java/com/techatpark/starter/security/security/CustomUserDetailsService.java
similarity index 50%
rename from spring-social/src/main/java/com/example/springsocial/security/CustomUserDetailsService.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/CustomUserDetailsService.java
index e06432d..d9704cb 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/CustomUserDetailsService.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/CustomUserDetailsService.java
@@ -1,15 +1,13 @@
-package com.example.springsocial.security;
+package com.techatpark.starter.security.security;
-import com.example.springsocial.exception.ResourceNotFoundException;
-import com.example.springsocial.model.User;
-import com.example.springsocial.repository.UserRepository;
+import com.techatpark.starter.security.model.User;
+import com.techatpark.starter.security.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
/**
* Created by rajeevkumarsingh on 02/08/17.
@@ -22,23 +20,16 @@ public class CustomUserDetailsService implements UserDetailsService {
UserRepository userRepository;
@Override
- @Transactional
public UserDetails loadUserByUsername(String email)
throws UsernameNotFoundException {
- User user = userRepository.findByEmail(email)
+ User user = userRepository.findByName(email)
.orElseThrow(() ->
- new UsernameNotFoundException("User not found with email : " + email)
- );
+ new UsernameNotFoundException(
+ "User not found with email : " + email)
+ );
return UserPrincipal.create(user);
}
- @Transactional
- public UserDetails loadUserById(Long id) {
- User user = userRepository.findById(id).orElseThrow(
- () -> new ResourceNotFoundException("User", "id", id)
- );
- return UserPrincipal.create(user);
- }
}
\ No newline at end of file
diff --git a/spring-social/src/main/java/com/example/springsocial/security/RestAuthenticationEntryPoint.java b/spring-social/src/main/java/com/techatpark/starter/security/security/RestAuthenticationEntryPoint.java
similarity index 71%
rename from spring-social/src/main/java/com/example/springsocial/security/RestAuthenticationEntryPoint.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/RestAuthenticationEntryPoint.java
index 762413f..56fa3a5 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/RestAuthenticationEntryPoint.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/RestAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.security;
+package com.techatpark.starter.security.security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -12,13 +12,16 @@
public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint {
- private static final Logger logger = LoggerFactory.getLogger(RestAuthenticationEntryPoint.class);
+ private static final Logger logger =
+ LoggerFactory.getLogger(RestAuthenticationEntryPoint.class);
@Override
public void commence(HttpServletRequest httpServletRequest,
HttpServletResponse httpServletResponse,
- AuthenticationException e) throws IOException, ServletException {
- logger.error("Responding with unauthorized error. Message - {}", e.getMessage());
+ AuthenticationException e)
+ throws IOException, ServletException {
+ logger.error("Responding with unauthorized error. Message - {}",
+ e.getMessage());
httpServletResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED,
e.getLocalizedMessage());
}
diff --git a/spring-social/src/main/java/com/example/springsocial/security/TokenAuthenticationFilter.java b/spring-social/src/main/java/com/techatpark/starter/security/security/TokenAuthenticationFilter.java
similarity index 57%
rename from spring-social/src/main/java/com/example/springsocial/security/TokenAuthenticationFilter.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/TokenAuthenticationFilter.java
index f3ddaf9..3bf3913 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/TokenAuthenticationFilter.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/TokenAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.security;
+package com.techatpark.starter.security.security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,30 +18,39 @@
public class TokenAuthenticationFilter extends OncePerRequestFilter {
+ private static final Logger logger =
+ LoggerFactory.getLogger(TokenAuthenticationFilter.class);
@Autowired
private TokenProvider tokenProvider;
-
@Autowired
private CustomUserDetailsService customUserDetailsService;
- private static final Logger logger = LoggerFactory.getLogger(TokenAuthenticationFilter.class);
-
@Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+ protected void doFilterInternal(HttpServletRequest request,
+ HttpServletResponse response,
+ FilterChain filterChain)
+ throws ServletException, IOException {
try {
String jwt = getJwtFromRequest(request);
if (StringUtils.hasText(jwt) && tokenProvider.validateToken(jwt)) {
- Long userId = tokenProvider.getUserIdFromToken(jwt);
+ String userName = tokenProvider.getUserNameFromToken(jwt);
- UserDetails userDetails = customUserDetailsService.loadUserById(userId);
- UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
- authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+ UserDetails userDetails =
+ customUserDetailsService.loadUserByUsername(userName);
+ UsernamePasswordAuthenticationToken authentication =
+ new UsernamePasswordAuthenticationToken(userDetails,
+ null, userDetails.getAuthorities());
+ authentication.setDetails(new WebAuthenticationDetailsSource()
+ .buildDetails(request));
- SecurityContextHolder.getContext().setAuthentication(authentication);
+ SecurityContextHolder.getContext()
+ .setAuthentication(authentication);
}
} catch (Exception ex) {
- logger.error("Could not set user authentication in security context", ex);
+ logger.error(
+ "Could not set user authentication in security context",
+ ex);
}
filterChain.doFilter(request, response);
@@ -49,7 +58,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
private String getJwtFromRequest(HttpServletRequest request) {
String bearerToken = request.getHeader("Authorization");
- if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
+ if (StringUtils.hasText(bearerToken) &&
+ bearerToken.startsWith("Bearer ")) {
return bearerToken.substring(7, bearerToken.length());
}
return null;
diff --git a/spring-social/src/main/java/com/example/springsocial/security/TokenProvider.java b/spring-social/src/main/java/com/techatpark/starter/security/security/TokenProvider.java
similarity index 51%
rename from spring-social/src/main/java/com/example/springsocial/security/TokenProvider.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/TokenProvider.java
index 11de03b..1958b6d 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/TokenProvider.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/TokenProvider.java
@@ -1,18 +1,26 @@
-package com.example.springsocial.security;
+package com.techatpark.starter.security.security;
-import com.example.springsocial.config.AppProperties;
-import io.jsonwebtoken.*;
+import com.techatpark.starter.security.config.AppProperties;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.SignatureException;
+import io.jsonwebtoken.UnsupportedJwtException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.HashMap;
@Service
public class TokenProvider {
- private static final Logger logger = LoggerFactory.getLogger(TokenProvider.class);
+ private static final Logger logger =
+ LoggerFactory.getLogger(TokenProvider.class);
private AppProperties appProperties;
@@ -21,31 +29,36 @@ public TokenProvider(AppProperties appProperties) {
}
public String createToken(Authentication authentication) {
- UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+ UserPrincipal userPrincipal =
+ (UserPrincipal) authentication.getPrincipal();
Date now = new Date();
- Date expiryDate = new Date(now.getTime() + appProperties.getAuth().getTokenExpirationMsec());
-
+ Date expiryDate = new Date(now.getTime() +
+ appProperties.getAuth().getTokenExpirationMsec());
return Jwts.builder()
- .setSubject(Long.toString(userPrincipal.getId()))
- .setIssuedAt(new Date())
+ .setClaims(new HashMap<>())
+ .setSubject(userPrincipal.getName())
+ .setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(expiryDate)
- .signWith(SignatureAlgorithm.HS512, appProperties.getAuth().getTokenSecret())
- .compact();
+ .signWith(SignatureAlgorithm.HS512,
+ appProperties.getAuth().getTokenSecret()).compact();
+
}
- public Long getUserIdFromToken(String token) {
+ public String getUserNameFromToken(String token) {
Claims claims = Jwts.parser()
.setSigningKey(appProperties.getAuth().getTokenSecret())
.parseClaimsJws(token)
.getBody();
- return Long.parseLong(claims.getSubject());
+ return claims.getSubject();
}
public boolean validateToken(String authToken) {
try {
- Jwts.parser().setSigningKey(appProperties.getAuth().getTokenSecret()).parseClaimsJws(authToken);
+ Jwts.parser()
+ .setSigningKey(appProperties.getAuth().getTokenSecret())
+ .parseClaimsJws(authToken);
return true;
} catch (SignatureException ex) {
logger.error("Invalid JWT signature");
diff --git a/spring-social/src/main/java/com/example/springsocial/security/UserPrincipal.java b/spring-social/src/main/java/com/techatpark/starter/security/security/UserPrincipal.java
similarity index 75%
rename from spring-social/src/main/java/com/example/springsocial/security/UserPrincipal.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/UserPrincipal.java
index 6732973..50069ad 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/UserPrincipal.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/UserPrincipal.java
@@ -1,6 +1,6 @@
-package com.example.springsocial.security;
+package com.techatpark.starter.security.security;
-import com.example.springsocial.model.User;
+import com.techatpark.starter.security.model.User;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
@@ -12,15 +12,16 @@
import java.util.Map;
public class UserPrincipal implements OAuth2User, UserDetails {
- private Long id;
- private String email;
+
+ private String name;
private String password;
private Collection authorities;
private Map attributes;
- public UserPrincipal(Long id, String email, String password, Collection authorities) {
- this.id = id;
- this.email = email;
+ public UserPrincipal(String name, String password,
+ Collection authorities) {
+
+ this.name = name;
this.password = password;
this.authorities = authorities;
}
@@ -30,26 +31,20 @@ public static UserPrincipal create(User user) {
singletonList(new SimpleGrantedAuthority("ROLE_USER"));
return new UserPrincipal(
- user.getId(),
- user.getEmail(),
+
+ user.getName(),
user.getPassword(),
authorities
);
}
- public static UserPrincipal create(User user, Map attributes) {
+ public static UserPrincipal create(User user,
+ Map attributes) {
UserPrincipal userPrincipal = UserPrincipal.create(user);
userPrincipal.setAttributes(attributes);
return userPrincipal;
}
- public Long getId() {
- return id;
- }
-
- public String getEmail() {
- return email;
- }
@Override
public String getPassword() {
@@ -58,7 +53,7 @@ public String getPassword() {
@Override
public String getUsername() {
- return email;
+ return name;
}
@Override
@@ -97,6 +92,6 @@ public void setAttributes(Map attributes) {
@Override
public String getName() {
- return String.valueOf(id);
+ return name;
}
}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/CustomOAuth2UserService.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/CustomOAuth2UserService.java
new file mode 100644
index 0000000..bf452b7
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/CustomOAuth2UserService.java
@@ -0,0 +1,98 @@
+package com.techatpark.starter.security.security.oauth2;
+
+import com.techatpark.starter.security.exception.OAuth2AuthenticationProcessingException;
+import com.techatpark.starter.security.model.AuthProvider;
+import com.techatpark.starter.security.model.User;
+import com.techatpark.starter.security.repository.UserRepository;
+import com.techatpark.starter.security.security.UserPrincipal;
+import com.techatpark.starter.security.security.oauth2.user.OAuth2UserInfo;
+import com.techatpark.starter.security.security.oauth2.user.OAuth2UserInfoFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.InternalAuthenticationServiceException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.Optional;
+
+@Service
+public class CustomOAuth2UserService extends DefaultOAuth2UserService {
+
+ @Autowired
+ private UserRepository userRepository;
+
+ @Override
+ public OAuth2User loadUser(OAuth2UserRequest oAuth2UserRequest)
+ throws OAuth2AuthenticationException {
+ OAuth2User oAuth2User = super.loadUser(oAuth2UserRequest);
+
+ try {
+ return processOAuth2User(oAuth2UserRequest, oAuth2User);
+ } catch (AuthenticationException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ // Throwing an instance of AuthenticationException will trigger the OAuth2AuthenticationFailureHandler
+ throw new InternalAuthenticationServiceException(ex.getMessage(),
+ ex.getCause());
+ }
+ }
+
+ private OAuth2User processOAuth2User(OAuth2UserRequest oAuth2UserRequest,
+ OAuth2User oAuth2User) {
+ OAuth2UserInfo oAuth2UserInfo = OAuth2UserInfoFactory
+ .getOAuth2UserInfo(oAuth2UserRequest.getClientRegistration()
+ .getRegistrationId(), oAuth2User.getAttributes());
+ if (StringUtils.isEmpty(oAuth2UserInfo.getEmail())) {
+ throw new OAuth2AuthenticationProcessingException(
+ "Email not found from OAuth2 provider");
+ }
+
+ Optional userOptional =
+ userRepository.findByName(oAuth2UserInfo.getEmail());
+ User user;
+ if (userOptional.isPresent()) {
+ user = userOptional.get();
+ if (!user.getProvider().equals(AuthProvider.valueOf(
+ oAuth2UserRequest.getClientRegistration()
+ .getRegistrationId()))) {
+ throw new OAuth2AuthenticationProcessingException(
+ "Looks like you're signed up with " +
+ user.getProvider() +
+ " account. Please use your " +
+ user.getProvider() +
+ " account to login.");
+ }
+ user = updateExistingUser(user, oAuth2UserInfo);
+ } else {
+ user = registerNewUser(oAuth2UserRequest, oAuth2UserInfo);
+ }
+
+ return UserPrincipal.create(user, oAuth2User.getAttributes());
+ }
+
+ private User registerNewUser(OAuth2UserRequest oAuth2UserRequest,
+ OAuth2UserInfo oAuth2UserInfo) {
+ User user = new User();
+
+ user.setProvider(AuthProvider.valueOf(
+ oAuth2UserRequest.getClientRegistration()
+ .getRegistrationId()));
+ user.setProviderId(oAuth2UserInfo.getId());
+ user.setName(oAuth2UserInfo.getEmail());
+// user.setEmail(oAuth2UserInfo.getEmail());
+ user.setImageUrl(oAuth2UserInfo.getImageUrl());
+ return userRepository.save(user);
+ }
+
+ private User updateExistingUser(User existingUser,
+ OAuth2UserInfo oAuth2UserInfo) {
+ existingUser.setName(oAuth2UserInfo.getEmail());
+ existingUser.setImageUrl(oAuth2UserInfo.getImageUrl());
+ return userRepository.save(existingUser);
+ }
+
+}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java
new file mode 100644
index 0000000..f9680cd
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/HttpCookieOAuth2AuthorizationRequestRepository.java
@@ -0,0 +1,67 @@
+package com.techatpark.starter.security.security.oauth2;
+
+import com.techatpark.starter.security.util.CookieUtils;
+import com.nimbusds.oauth2.sdk.util.StringUtils;
+import org.springframework.security.oauth2.client.web.AuthorizationRequestRepository;
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Component
+public class HttpCookieOAuth2AuthorizationRequestRepository
+ implements AuthorizationRequestRepository {
+ public static final String OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME =
+ "oauth2_auth_request";
+ public static final String REDIRECT_URI_PARAM_COOKIE_NAME = "redirect_uri";
+ private static final int cookieExpireSeconds = 180;
+
+ @Override
+ public OAuth2AuthorizationRequest loadAuthorizationRequest(
+ HttpServletRequest request) {
+ return CookieUtils
+ .getCookie(request, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME)
+ .map(cookie -> CookieUtils
+ .deserialize(cookie, OAuth2AuthorizationRequest.class))
+ .orElse(null);
+ }
+
+ @Override
+ public void saveAuthorizationRequest(
+ OAuth2AuthorizationRequest authorizationRequest,
+ HttpServletRequest request, HttpServletResponse response) {
+ if (authorizationRequest == null) {
+ CookieUtils.deleteCookie(request, response,
+ OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME);
+ CookieUtils.deleteCookie(request, response,
+ REDIRECT_URI_PARAM_COOKIE_NAME);
+ return;
+ }
+
+ CookieUtils
+ .addCookie(response, OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME,
+ CookieUtils.serialize(authorizationRequest),
+ cookieExpireSeconds);
+ String redirectUriAfterLogin =
+ request.getParameter(REDIRECT_URI_PARAM_COOKIE_NAME);
+ if (StringUtils.isNotBlank(redirectUriAfterLogin)) {
+ CookieUtils.addCookie(response, REDIRECT_URI_PARAM_COOKIE_NAME,
+ redirectUriAfterLogin, cookieExpireSeconds);
+ }
+ }
+
+ @Override
+ public OAuth2AuthorizationRequest removeAuthorizationRequest(
+ HttpServletRequest request) {
+ return this.loadAuthorizationRequest(request);
+ }
+
+ public void removeAuthorizationRequestCookies(HttpServletRequest request,
+ HttpServletResponse response) {
+ CookieUtils.deleteCookie(request, response,
+ OAUTH2_AUTHORIZATION_REQUEST_COOKIE_NAME);
+ CookieUtils.deleteCookie(request, response,
+ REDIRECT_URI_PARAM_COOKIE_NAME);
+ }
+}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/OAuth2AuthenticationFailureHandler.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/OAuth2AuthenticationFailureHandler.java
new file mode 100644
index 0000000..408ae3b
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/OAuth2AuthenticationFailureHandler.java
@@ -0,0 +1,45 @@
+package com.techatpark.starter.security.security.oauth2;
+
+import com.techatpark.starter.security.util.CookieUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static com.techatpark.starter.security.security.oauth2.HttpCookieOAuth2AuthorizationRequestRepository.REDIRECT_URI_PARAM_COOKIE_NAME;
+
+@Component
+public class OAuth2AuthenticationFailureHandler
+ extends SimpleUrlAuthenticationFailureHandler {
+
+ @Autowired
+ HttpCookieOAuth2AuthorizationRequestRepository
+ httpCookieOAuth2AuthorizationRequestRepository;
+
+ @Override
+ public void onAuthenticationFailure(HttpServletRequest request,
+ HttpServletResponse response,
+ AuthenticationException exception)
+ throws IOException, ServletException {
+ String targetUrl =
+ CookieUtils.getCookie(request, REDIRECT_URI_PARAM_COOKIE_NAME)
+ .map(Cookie::getValue)
+ .orElse(("/"));
+
+ targetUrl = UriComponentsBuilder.fromUriString(targetUrl)
+ .queryParam("error", exception.getLocalizedMessage())
+ .build().toUriString();
+
+ httpCookieOAuth2AuthorizationRequestRepository
+ .removeAuthorizationRequestCookies(request, response);
+
+ getRedirectStrategy().sendRedirect(request, response, targetUrl);
+ }
+}
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/OAuth2AuthenticationSuccessHandler.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/OAuth2AuthenticationSuccessHandler.java
new file mode 100644
index 0000000..0cb137e
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/OAuth2AuthenticationSuccessHandler.java
@@ -0,0 +1,110 @@
+package com.techatpark.starter.security.security.oauth2;
+
+import com.techatpark.starter.security.config.AppProperties;
+import com.techatpark.starter.security.exception.BadRequestException;
+import com.techatpark.starter.security.security.TokenProvider;
+import com.techatpark.starter.security.util.CookieUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Optional;
+
+import static com.techatpark.starter.security.security.oauth2.HttpCookieOAuth2AuthorizationRequestRepository.REDIRECT_URI_PARAM_COOKIE_NAME;
+
+@Component
+public class OAuth2AuthenticationSuccessHandler
+ extends SimpleUrlAuthenticationSuccessHandler {
+
+ private TokenProvider tokenProvider;
+
+ private AppProperties appProperties;
+
+ private HttpCookieOAuth2AuthorizationRequestRepository
+ httpCookieOAuth2AuthorizationRequestRepository;
+
+
+ @Autowired
+ OAuth2AuthenticationSuccessHandler(TokenProvider tokenProvider,
+ AppProperties appProperties,
+ HttpCookieOAuth2AuthorizationRequestRepository httpCookieOAuth2AuthorizationRequestRepository) {
+ this.tokenProvider = tokenProvider;
+ this.appProperties = appProperties;
+ this.httpCookieOAuth2AuthorizationRequestRepository =
+ httpCookieOAuth2AuthorizationRequestRepository;
+ }
+
+ @Override
+ public void onAuthenticationSuccess(HttpServletRequest request,
+ HttpServletResponse response,
+ Authentication authentication)
+ throws IOException, ServletException {
+ String targetUrl =
+ determineTargetUrl(request, response, authentication);
+
+ if (response.isCommitted()) {
+ logger.debug(
+ "Response has already been committed. Unable to redirect to " +
+ targetUrl);
+ return;
+ }
+
+ clearAuthenticationAttributes(request, response);
+ getRedirectStrategy().sendRedirect(request, response, targetUrl);
+ }
+
+ protected String determineTargetUrl(HttpServletRequest request,
+ HttpServletResponse response,
+ Authentication authentication) {
+ Optional redirectUri =
+ CookieUtils.getCookie(request, REDIRECT_URI_PARAM_COOKIE_NAME)
+ .map(Cookie::getValue);
+
+ if (redirectUri.isPresent() &&
+ !isAuthorizedRedirectUri(redirectUri.get())) {
+ throw new BadRequestException(
+ "Sorry! We've got an Unauthorized Redirect URI and can't proceed with the authentication");
+ }
+
+ String targetUrl = redirectUri.orElse(getDefaultTargetUrl());
+
+ String token = tokenProvider.createToken(authentication);
+
+ return UriComponentsBuilder.fromUriString(targetUrl)
+ .queryParam("token", token)
+ .build().toUriString();
+ }
+
+ protected void clearAuthenticationAttributes(HttpServletRequest request,
+ HttpServletResponse response) {
+ super.clearAuthenticationAttributes(request);
+ httpCookieOAuth2AuthorizationRequestRepository
+ .removeAuthorizationRequestCookies(request, response);
+ }
+
+ private boolean isAuthorizedRedirectUri(String uri) {
+ URI clientRedirectUri = URI.create(uri);
+
+ return appProperties.getOauth2().getAuthorizedRedirectUris()
+ .stream()
+ .anyMatch(authorizedRedirectUri -> {
+ // Only validate host and port. Let the clients use different paths if they want to
+ URI authorizedURI = URI.create(authorizedRedirectUri);
+ if (authorizedURI.getHost()
+ .equalsIgnoreCase(clientRedirectUri.getHost())
+ && authorizedURI.getPort() ==
+ clientRedirectUri.getPort()) {
+ return true;
+ }
+ return false;
+ });
+ }
+}
diff --git a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/FacebookOAuth2UserInfo.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/FacebookOAuth2UserInfo.java
similarity index 59%
rename from spring-social/src/main/java/com/example/springsocial/security/oauth2/user/FacebookOAuth2UserInfo.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/FacebookOAuth2UserInfo.java
index e4c644d..ea50089 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/FacebookOAuth2UserInfo.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/FacebookOAuth2UserInfo.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.security.oauth2.user;
+package com.techatpark.starter.security.security.oauth2.user;
import java.util.Map;
@@ -24,11 +24,13 @@ public String getEmail() {
@Override
public String getImageUrl() {
- if(attributes.containsKey("picture")) {
- Map pictureObj = (Map) attributes.get("picture");
- if(pictureObj.containsKey("data")) {
- Map dataObj = (Map) pictureObj.get("data");
- if(dataObj.containsKey("url")) {
+ if (attributes.containsKey("picture")) {
+ Map pictureObj =
+ (Map) attributes.get("picture");
+ if (pictureObj.containsKey("data")) {
+ Map dataObj =
+ (Map) pictureObj.get("data");
+ if (dataObj.containsKey("url")) {
return (String) dataObj.get("url");
}
}
diff --git a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/GithubOAuth2UserInfo.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/GithubOAuth2UserInfo.java
similarity index 90%
rename from spring-social/src/main/java/com/example/springsocial/security/oauth2/user/GithubOAuth2UserInfo.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/GithubOAuth2UserInfo.java
index b76922a..1c2a72d 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/GithubOAuth2UserInfo.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/GithubOAuth2UserInfo.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.security.oauth2.user;
+package com.techatpark.starter.security.security.oauth2.user;
import java.util.Map;
diff --git a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/GoogleOAuth2UserInfo.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/GoogleOAuth2UserInfo.java
similarity index 90%
rename from spring-social/src/main/java/com/example/springsocial/security/oauth2/user/GoogleOAuth2UserInfo.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/GoogleOAuth2UserInfo.java
index 36d8250..6f7a788 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/GoogleOAuth2UserInfo.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/GoogleOAuth2UserInfo.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.security.oauth2.user;
+package com.techatpark.starter.security.security.oauth2.user;
import java.util.Map;
diff --git a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/OAuth2UserInfo.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/OAuth2UserInfo.java
similarity index 88%
rename from spring-social/src/main/java/com/example/springsocial/security/oauth2/user/OAuth2UserInfo.java
rename to spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/OAuth2UserInfo.java
index fac083a..14bfe3f 100644
--- a/spring-social/src/main/java/com/example/springsocial/security/oauth2/user/OAuth2UserInfo.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/OAuth2UserInfo.java
@@ -1,4 +1,4 @@
-package com.example.springsocial.security.oauth2.user;
+package com.techatpark.starter.security.security.oauth2.user;
import java.util.Map;
diff --git a/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/OAuth2UserInfoFactory.java b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/OAuth2UserInfoFactory.java
new file mode 100644
index 0000000..788434a
--- /dev/null
+++ b/spring-social/src/main/java/com/techatpark/starter/security/security/oauth2/user/OAuth2UserInfoFactory.java
@@ -0,0 +1,26 @@
+package com.techatpark.starter.security.security.oauth2.user;
+
+import com.techatpark.starter.security.exception.OAuth2AuthenticationProcessingException;
+import com.techatpark.starter.security.model.AuthProvider;
+
+import java.util.Map;
+
+public class OAuth2UserInfoFactory {
+
+ public static OAuth2UserInfo getOAuth2UserInfo(String registrationId,
+ Map attributes) {
+ if (registrationId.equalsIgnoreCase(AuthProvider.google.toString())) {
+ return new GoogleOAuth2UserInfo(attributes);
+ } else if (registrationId
+ .equalsIgnoreCase(AuthProvider.facebook.toString())) {
+ return new FacebookOAuth2UserInfo(attributes);
+ } else if (registrationId
+ .equalsIgnoreCase(AuthProvider.github.toString())) {
+ return new GithubOAuth2UserInfo(attributes);
+ } else {
+ throw new OAuth2AuthenticationProcessingException(
+ "Sorry! Login with " + registrationId +
+ " is not supported yet.");
+ }
+ }
+}
diff --git a/spring-social/src/main/java/com/example/springsocial/util/CookieUtils.java b/spring-social/src/main/java/com/techatpark/starter/security/util/CookieUtils.java
similarity index 76%
rename from spring-social/src/main/java/com/example/springsocial/util/CookieUtils.java
rename to spring-social/src/main/java/com/techatpark/starter/security/util/CookieUtils.java
index 2d665a3..5d6f1b9 100644
--- a/spring-social/src/main/java/com/example/springsocial/util/CookieUtils.java
+++ b/spring-social/src/main/java/com/techatpark/starter/security/util/CookieUtils.java
@@ -1,6 +1,7 @@
-package com.example.springsocial.util;
+package com.techatpark.starter.security.util;
import org.springframework.util.SerializationUtils;
+
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -9,7 +10,8 @@
public class CookieUtils {
- public static Optional getCookie(HttpServletRequest request, String name) {
+ public static Optional getCookie(HttpServletRequest request,
+ String name) {
Cookie[] cookies = request.getCookies();
if (cookies != null && cookies.length > 0) {
@@ -23,7 +25,8 @@ public static Optional getCookie(HttpServletRequest request, String name
return Optional.empty();
}
- public static void addCookie(HttpServletResponse response, String name, String value, int maxAge) {
+ public static void addCookie(HttpServletResponse response, String name,
+ String value, int maxAge) {
Cookie cookie = new Cookie(name, value);
cookie.setPath("/");
cookie.setHttpOnly(true);
@@ -31,10 +34,12 @@ public static void addCookie(HttpServletResponse response, String name, String v
response.addCookie(cookie);
}
- public static void deleteCookie(HttpServletRequest request, HttpServletResponse response, String name) {
+ public static void deleteCookie(HttpServletRequest request,
+ HttpServletResponse response,
+ String name) {
Cookie[] cookies = request.getCookies();
if (cookies != null && cookies.length > 0) {
- for (Cookie cookie: cookies) {
+ for (Cookie cookie : cookies) {
if (cookie.getName().equals(name)) {
cookie.setValue("");
cookie.setPath("/");
@@ -52,7 +57,7 @@ public static String serialize(Object object) {
public static T deserialize(Cookie cookie, Class cls) {
return cls.cast(SerializationUtils.deserialize(
- Base64.getUrlDecoder().decode(cookie.getValue())));
+ Base64.getUrlDecoder().decode(cookie.getValue())));
}
diff --git a/spring-social/src/main/resources/application.yml b/spring-social/src/main/resources/application.yml
index 4e4b471..4568249 100644
--- a/spring-social/src/main/resources/application.yml
+++ b/spring-social/src/main/resources/application.yml
@@ -1,50 +1,47 @@
spring:
- datasource:
- url: jdbc:mysql://localhost:3306/spring_social?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false
- username: root
- password: callicoder
+ datasource:
+ url: jdbc:h2:mem:spring_social;DB_CLOSE_DELAY=-1;INIT=create schema if not exists spring_social\;
+ username: user
+ password: password
- jpa:
- show-sql: true
- hibernate:
- ddl-auto: update
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MySQL5InnoDBDialect
- security:
- oauth2:
- client:
- registration:
- google:
- clientId: 5014057553-8gm9um6vnli3cle5rgigcdjpdrid14m9.apps.googleusercontent.com
- clientSecret: tWZKVLxaD_ARWsriiiUFYoIk
- redirectUri: "{baseUrl}/oauth2/callback/{registrationId}"
- scope:
- - email
- - profile
- facebook:
- clientId: 121189305185277
- clientSecret: 42ffe5aa7379e8326387e0fe16f34132
- redirectUri: "{baseUrl}/oauth2/callback/{registrationId}"
- scope:
- - email
- - public_profile
- github:
- clientId: d3e47fc2ddd966fa4352
- clientSecret: 3bc0f6b8332f93076354c2a5bada2f5a05aea60d
- redirectUri: "{baseUrl}/oauth2/callback/{registrationId}"
- scope:
- - user:email
- - read:user
- provider:
- facebook:
- authorizationUri: https://www.facebook.com/v3.0/dialog/oauth
- tokenUri: https://graph.facebook.com/v3.0/oauth/access_token
- userInfoUri: https://graph.facebook.com/v3.0/me?fields=id,first_name,middle_name,last_name,name,email,verified,is_verified,picture.width(250).height(250)
+ jpa:
+ show-sql: true
+ hibernate:
+ ddl-auto: update
+ naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+ security:
+ oauth2:
+ client:
+ registration:
+ google:
+ clientId: 5014057553-8gm9um6vnli3cle5rgigcdjpdrid14m9.apps.googleusercontent.com
+ clientSecret: tWZKVLxaD_ARWsriiiUFYoIk
+ redirectUri: "{baseUrl}/oauth2/callback/{registrationId}"
+ scope:
+ - email
+ - profile
+ facebook:
+ clientId: 121189305185277
+ clientSecret: 42ffe5aa7379e8326387e0fe16f34132
+ redirectUri: "{baseUrl}/oauth2/callback/{registrationId}"
+ scope:
+ - email
+ - public_profile
+ github:
+ clientId: d3e47fc2ddd966fa4352
+ clientSecret: 3bc0f6b8332f93076354c2a5bada2f5a05aea60d
+ redirectUri: "{baseUrl}/oauth2/callback/{registrationId}"
+ scope:
+ - user:email
+ - read:user
+ provider:
+ facebook:
+ authorizationUri: https://www.facebook.com/v3.0/dialog/oauth
+ tokenUri: https://graph.facebook.com/v3.0/oauth/access_token
+ userInfoUri: https://graph.facebook.com/v3.0/me?fields=id,first_name,middle_name,last_name,name,email,verified,is_verified,picture.width(250).height(250)
app:
auth:
- tokenSecret: 926D96C90030DD58429D2751AC1BDBBC
+ tokenSecret: 926D96C90030DD58429D2751926D96C90030DD58429D2751AC1BDBBC926D96C90030DD58429D2751AC1BDBBC926D96C90030DD58429D2751AC1BDBBC926D96C90030DD58429D2751AC1BDBBC926D96C90030DD58429D2751AC1BDBBC926D96C90030DD58429D2751AC1BDBBC926D96C90030DD58429D2751AC1BDBBCAC1BDBBC
tokenExpirationMsec: 864000000
oauth2:
# After successfully authenticating with the OAuth2 Provider,
diff --git a/spring-social/src/test/java/com/example/springsocial/SpringSocialApplicationTests.java b/spring-social/src/test/java/com/example/springsocial/SpringSocialApplicationTests.java
deleted file mode 100644
index f152e1a..0000000
--- a/spring-social/src/test/java/com/example/springsocial/SpringSocialApplicationTests.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.springsocial;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-public class SpringSocialApplicationTests {
-
- @Test
- public void contextLoads() {
- }
-
-}
diff --git a/spring-social/src/test/java/com/techatpark/starter/security/SpringSocialApplicationTests.java b/spring-social/src/test/java/com/techatpark/starter/security/SpringSocialApplicationTests.java
new file mode 100644
index 0000000..dc77dd5
--- /dev/null
+++ b/spring-social/src/test/java/com/techatpark/starter/security/SpringSocialApplicationTests.java
@@ -0,0 +1,11 @@
+package com.techatpark.starter.security;
+
+import org.junit.jupiter.api.Test;
+
+public class SpringSocialApplicationTests {
+
+ @Test
+ public void contextLoads() {
+ }
+
+}