Initial Commit

Author: rajsingha

src/main/java/com/webservice/mobile/app/MobileAppWebServicesApplication.java

@@ -17,5 +17,9 @@ public static void main(String[] args) {
 	public BCryptPasswordEncoder bCryptPasswordEncoder(){
 		return new BCryptPasswordEncoder();
 	}
+	@Bean
+	public SpringApplicationContext springApplicationContext(){
+		return new SpringApplicationContext();
+	}
 
 }

src/main/java/com/webservice/mobile/app/SpringApplicationContext.java

@@ -0,0 +1,19 @@
+package com.webservice.mobile.app;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+public class SpringApplicationContext implements ApplicationContextAware {
+
+    private static ApplicationContext CONTEXT;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        CONTEXT  = applicationContext;
+    }
+
+    public static Object getBean(String beanName){
+        return CONTEXT.getBean(beanName);
+    }
+}

src/main/java/com/webservice/mobile/app/UserRepository.java renamed to src/main/java/com/webservice/mobile/app/io/repositories/UserRepository.java

@@ -1,4 +1,4 @@
-package com.webservice.mobile.app;
+package com.webservice.mobile.app.io.repositories;
 
 import com.webservice.mobile.app.io.entity.UserEntity;
 import org.springframework.data.repository.CrudRepository;

src/main/java/com/webservice/mobile/app/security/AuthenticationFilter.java

@@ -2,6 +2,9 @@
 
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.webservice.mobile.app.SpringApplicationContext;
+import com.webservice.mobile.app.service.UserService;
+import com.webservice.mobile.app.shared.dto.UserDTO;
 import com.webservice.mobile.app.ui.model.request.UserLoginRequestModel;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -64,6 +67,10 @@ protected void successfulAuthentication(HttpServletRequest request,
                 .signWith(SignatureAlgorithm.HS512,SecurityConstants.TOKEN_SECRET)
                 .compact();
 
+        UserService userService = (UserService) SpringApplicationContext.getBean("userServiceImpl");
+        UserDTO userDTO = userService.getUser(userName);
+
         response.addHeader(SecurityConstants.HEADER_STRING,SecurityConstants.TOKEN_PREFIX+token);
+        response.addHeader("UserID",userDTO.getUserId());
     }
 }

src/main/java/com/webservice/mobile/app/service/UserService.java

@@ -5,4 +5,5 @@
 
 public interface UserService extends UserDetailsService {
     UserDTO createUser(UserDTO userDTO);
+    UserDTO getUser(String email);
 }

src/main/java/com/webservice/mobile/app/service/impl/UserServiceImpl.java

@@ -1,7 +1,8 @@
 package com.webservice.mobile.app.service.impl;
 
-import com.webservice.mobile.app.UserRepository;
+
 import com.webservice.mobile.app.io.entity.UserEntity;
+import com.webservice.mobile.app.io.repositories.UserRepository;
 import com.webservice.mobile.app.service.UserService;
 import com.webservice.mobile.app.shared.Utils;
 import com.webservice.mobile.app.shared.dto.UserDTO;
@@ -49,6 +50,16 @@ public UserDTO createUser(UserDTO userDTO) {
         return returnValue;
     }
 
+    @Override
+    public UserDTO getUser(String email) {
+        UserEntity userEntity = userRepository.findUserByEmail(email);
+        if (userEntity == null) throw new UsernameNotFoundException(email);
+        UserDTO returnValue = new UserDTO();
+        BeanUtils.copyProperties(userEntity,returnValue);
+        return returnValue;
+
+    }
+
     @Override
     public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
         UserEntity userEntity= userRepository.findUserByEmail(email);