WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java

     @Autowired
     JavaMailSender mailSender;
     @RequestMapping(value = ProfitMandiConstants.URL_USER_GOOGLE_LOGIN, method = RequestMethod.POST)
-    public ResponseEntity<?> googleLogin(HttpServletRequest request, @RequestBody GoogleLoginRequest googleLoginRequest) throws Exception {
+    public ResponseEntity<?> googleLogin(HttpServletRequest request, @RequestBody GoogleLoginRequest loginRequest) throws Exception {
-        String email = googleLoginRequest.getEmail() != null ? googleLoginRequest.getEmail() : googleLoginProcessor.process(googleLoginRequest.getToken());
+        String email = loginRequest.getEmail() != null ? loginRequest.getEmail() : googleLoginProcessor.process(loginRequest.getToken());
-        return responseSender.ok(getAuthTokenMap(email));
+        return responseSender.ok(getAuthTokenMap(email, loginRequest));
+    }
-    private Map<String, Object> getAuthTokenMap(String email) throws Exception {
+    private Map<String, Object> getAuthTokenMap(String email, GoogleLoginRequest loginRequest) throws Exception {
         String name = authService.getNameByEmailId(email);
         Map<String, Object> responseMap = new HashMap<>(2);
         LOGGER.info("User Name from getNameByEmailId({}) is {}", email, name);
         if (name != null) {
             User registeredUser = null;
             AuthUser authUser = authRepository.selectByGmailId(email);
+            if (loginRequest.getPassword() != null) {
+                registeredUser = userService.authenticate(email, loginRequest.getPassword());
-            if (authUser != null) {
+            } else if (authUser != null) {
                 registeredUser = userRepository.selectByEmailId(authUser.getEmailId());
             } else if (promoterRepository.selectMappedByEmailId(email) != null) {
                 Promoter promoter = promoterRepository.selectMappedByEmailId(email);
                 int userId = userAccountRepository.selectUserIdByRetailerId(promoter.getRetailerId());
                 registeredUser = userRepository.selectById(userId);
                 if (authUserPartnerSet != null && authUserPartnerSet.size() > 0) {
                     retailerId = authUserPartnerSet.stream().findFirst().get();
                     FofoStore fs = fofoStoreRepository.selectByRetailerId(retailerId);
                     retailerId = partnerTypeChangeService.getBestPartner(fs.getWarehouseId());
                 } else {
-                    com.spice.profitmandi.dao.entity.user.User user = userUserRepository
+                    com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectByEmailId(Utils.SYSTEM_PARTNER);
-                            .selectByEmailId(Utils.SYSTEM_PARTNER);
                     retailerId = user.getId();
+                }
+            }
             responseMap.put(ProfitMandiConstants.TOKEN,
                     JWTUtil.create(email, registeredUser.getId(), retailerId, roleTypes));
             return responseMap;
+        }
         User user = null;
         try {
+            if (loginRequest.getPassword() != null) {
+                user = userService.authenticate(email, loginRequest.getPassword());
+            } else {
-            user = userRepository.selectByEmailId(email);
+                user = userRepository.selectByEmailId(email);
+            }
         } catch (ProfitMandiBusinessException profitMandiBusinessException) {
+        }
         if (user == null) {
             try {
             throws ProfitMandiBusinessException {
         LOGGER.info("StoreCode {}", storeCode);
         return responseSender.ok(googleLoginProcessor.processStore(storeCode));
+    }
+    @RequestMapping(value = ProfitMandiConstants.URL_USER_FORGOT_PASSWORD, method = RequestMethod.POST)
+    public ResponseEntity<?> forgotPassword(@RequestBody GoogleLoginRequest loginRequest) throws Exception {
+        userService.resetPassword(loginRequest.getEmail());
+        return responseSender.ok(true);
+    }
+    @RequestMapping(value = ProfitMandiConstants.URL_USER_CHANGE_PASSWORD, method = RequestMethod.POST)
+    public ResponseEntity<?> changePassword(@RequestBody EmailPassword emailPassword) throws Exception {
+        User user = userService.authenticate(emailPassword.getEmail(), emailPassword.getPassword());
+        if (user != null){
+            boolean response = userService.changePassword(user, emailPassword.getNewPassword());
+            return responseSender.ok(response);
+        }
+        return responseSender.ok(false);
+    }
     @RequestMapping(value = ProfitMandiConstants.URL_USER_TOKEN_IS_EXPIRED, method = RequestMethod.GET)
     public ResponseEntity<?> tokenIsExpired(HttpServletRequest request, @RequestParam(name = "token") String token)
             throws ProfitMandiBusinessException {
         LOGGER.info("requested url : " + request.getRequestURL().toString());
         return responseSender.ok(JWTUtil.isExpired(token));
                 com.spice.profitmandi.dao.entity.user.User saholicUser = userUserRepository.selectById(uc.getUserId());
                 if (saholicUser.getAddressId() != null) {
                     Address address = addressRepository.selectById(saholicUser.getAddressId());
                     responseMap.put(ProfitMandiConstants.ADDRESS, address);
+                }
-                // if retailer is activated 1 then verified retailer
-                // else if migrated is 1 then old retailer
-                // also lets incoporte old process i.e is user is activated then also retailer
-                // is verified retailer
-                // else retailer is not verifed
                 if (retailer.isActive() || user.isActivated()) {
                     if (roleManager.isPartner(roleIdsSet)) {
                         FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(saholicUser.getId());
                         if (fofoStore.isActive()) {
                             responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
         userRepository.persist(user);
         return responseSender.ok(ResponseCodeHolder.getMessage("USR_OK_1001"));
+    }
     @RequestMapping(value = ProfitMandiConstants.URL_ADMIN_TOKEN, method = RequestMethod.POST)
-    public ResponseEntity<?> getAdminToken(HttpServletRequest request,
-                                           @RequestParam(name = "adminToken") String adminToken, @RequestParam(name = "emailId") String emailId)
+    public ResponseEntity<?> getAdminToken(HttpServletRequest request, @RequestParam(name = "adminToken") String adminToken, @RequestParam(name = "emailId") String emailId) throws Exception {
-            throws Exception {
         LOGGER.info("requested url : " + request.getRequestURL().toString());
         if (!adminToken.equals(validAdminToken)) {
             return responseSender.forbidden(null);
+        }
+        GoogleLoginRequest loginRequest = new GoogleLoginRequest();
+        loginRequest.setToken(adminToken);
+        loginRequest.setEmail(emailId);
+        loginRequest.setType("Internal");
-        return responseSender.ok(this.getAuthTokenMap(emailId));
+        return responseSender.ok(this.getAuthTokenMap(emailId, loginRequest));
+    }
     @RequestMapping(value = "/mobileappsettings")
-    public ResponseEntity<?> mobileAppSettings(HttpServletRequest request, @RequestParam(name = "t") int timestamp,
+    public ResponseEntity<?> mobileAppSettings(HttpServletRequest request, @RequestParam(name = "t") int timestamp, @RequestParam(name = "imeinumber") String imeinumber) throws ProfitMandiBusinessException, ClientProtocolException, IOException {
-                                               @RequestParam(name = "imeinumber") String imeinumber)
-            throws ProfitMandiBusinessException, ClientProtocolException, IOException {
         final String uri = "http://192.168.158.89/mobileappsettings?t=" + timestamp + "&imeinumber=" + imeinumber;
         final String BASIC_AUTH = "Basic " + Base64.getEncoder().encodeToString("dtr:dtr18Feb2015".getBytes());
         Map<String, String> headers = new HashMap<>();
         Map<String, String> params = new HashMap<>();
         headers.put("Authorization", BASIC_AUTH);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java – Rev 34664 → 34794