From d73e019e3d3898cad5dc49679c98baa1cbddf910 Mon Sep 17 00:00:00 2001
From: Jean Paul Torre <jean.paul.ruben@gmail.com>
Date: Sun, 19 Jan 2020 22:33:11 -0500
Subject: [PATCH] Add userId to login response

---
 pom.xml                                              |  4 ----
 src/main/java/com/fcgl/madrid/MadridApplication.java |  2 --
 .../madrid/user/payload/response/AuthResponse.java   | 12 +++++++++++-
 .../madrid/user/payload/response/LoginResponse.java  |  1 +
 .../com/fcgl/madrid/user/service/AuthService.java    |  5 ++++-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffe66c3..b46ca1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,10 +57,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/src/main/java/com/fcgl/madrid/MadridApplication.java b/src/main/java/com/fcgl/madrid/MadridApplication.java
index 9c9ae91..9c4f1af 100644
--- a/src/main/java/com/fcgl/madrid/MadridApplication.java
+++ b/src/main/java/com/fcgl/madrid/MadridApplication.java
@@ -3,10 +3,8 @@
 import com.fcgl.madrid.user.configuration.AppProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
-@EnableEurekaClient
 @SpringBootApplication
 @EnableConfigurationProperties(AppProperties.class)
 public class MadridApplication {
diff --git a/src/main/java/com/fcgl/madrid/user/payload/response/AuthResponse.java b/src/main/java/com/fcgl/madrid/user/payload/response/AuthResponse.java
index a198d13..18d9679 100644
--- a/src/main/java/com/fcgl/madrid/user/payload/response/AuthResponse.java
+++ b/src/main/java/com/fcgl/madrid/user/payload/response/AuthResponse.java
@@ -3,9 +3,11 @@
 public class AuthResponse {
     private String accessToken;
     private String tokenType = "Bearer";
+    private String userId;
 
-    public AuthResponse(String accessToken) {
+    public AuthResponse(String accessToken, String userId) {
         this.accessToken = accessToken;
+        this.userId = userId;
     }
 
     public String getAccessToken() {
@@ -24,5 +26,13 @@ public void setTokenType(String tokenType) {
         this.tokenType = tokenType;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     // Getters and Setters (Omitted for brevity)
 }
diff --git a/src/main/java/com/fcgl/madrid/user/payload/response/LoginResponse.java b/src/main/java/com/fcgl/madrid/user/payload/response/LoginResponse.java
index 574dbad..c962002 100644
--- a/src/main/java/com/fcgl/madrid/user/payload/response/LoginResponse.java
+++ b/src/main/java/com/fcgl/madrid/user/payload/response/LoginResponse.java
@@ -26,4 +26,5 @@ public AuthResponse getResponse() {
     public void setResponse(AuthResponse response) {
         this.response = response;
     }
+
 }
diff --git a/src/main/java/com/fcgl/madrid/user/service/AuthService.java b/src/main/java/com/fcgl/madrid/user/service/AuthService.java
index 28126e7..9adca86 100644
--- a/src/main/java/com/fcgl/madrid/user/service/AuthService.java
+++ b/src/main/java/com/fcgl/madrid/user/service/AuthService.java
@@ -12,6 +12,7 @@
 import com.fcgl.madrid.user.payload.response.LoginResponse;
 import com.fcgl.madrid.user.repository.UserRepository;
 import com.fcgl.madrid.user.security.TokenProvider;
+import com.fcgl.madrid.user.security.UserPrincipal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -68,7 +69,9 @@ public ResponseEntity<LoginResponse> authenticateUser(LoginRequest loginRequest)
         SecurityContextHolder.getContext().setAuthentication(authentication);
 
         String token = tokenProvider.createToken(authentication);
-        AuthResponse authResponse = new AuthResponse(token);
+        UserPrincipal userPrincipal = (UserPrincipal) authentication.getPrincipal();
+        String userId = Long.toString(userPrincipal.getId());
+        AuthResponse authResponse = new AuthResponse(token, userId);
         LoginResponse response = new LoginResponse(InternalStatus.OK, authResponse);
         return new ResponseEntity<LoginResponse>(response ,HttpStatus.OK);
     }