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

 import com.spice.profitmandi.dao.repository.catalog.DeviceRepository;
 import com.spice.profitmandi.dao.repository.dtr.*;
 import com.spice.profitmandi.service.AuthService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.user.RetailerService;
+import com.spice.profitmandi.service.user.UserService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
 import com.spice.profitmandi.web.util.GoogleTokenUtil;
 import com.spice.profitmandi.web.util.MVCResponseSender;
 import org.apache.commons.lang.StringUtils;
     @Autowired
     private AuthService authService;
     @Autowired
+    private UserService userService;
+    @Autowired
     private AuthRepository authRepository;
     @RequestMapping(value = "/login", method = RequestMethod.GET)
     public String loginPage(HttpServletRequest request, HttpServletResponse response, Model model) throws Exception {
         LOGGER.info("Context Path is {}", request.getContextPath());
         LoginDetails fofoDetails = new LoginDetails();
         Set<Integer> roleIds = new HashSet<>();
         fofoDetails.setRoleIds(roleIds);
         String emailId = null;
         String name = null;
+        User user = null;
         try {
             // if role is retailer then FOFO_ID is retailerId else it is userid as normal
             // user's wont have retailer id.
             if (StringUtils.isEmpty(token)) {
                 if (authService.authenticate(emailIdOrMobileNumber, password)) {
                     AuthUser authUser = authRepository.selectByEmailOrMobile(emailIdOrMobileNumber);
                     if (authUser == null) {
-                        throw new ProfitMandiBusinessException("Authentication", "Email or Mobile",
+                        throw new ProfitMandiBusinessException("Authentication", "Email or Mobile", "Invalid Email Or Mobile");
-                                "Invalid Email Or Mobile");
+                    }
                     emailId = authUser.getEmailId();
                     name = authUser.getFirstName() + " " + authUser.getLastName();
                     authUser.setLastLoginTimestamp(LocalDateTime.now());
+                } else {
+                    // TODO: Add login with email and password
+                    user = userService.authenticate(emailIdOrMobileNumber, password);
+                    if (user != null) {
+                        emailId = user.getEmailId();
+                    } else {
+                        LOGGER.error("User not found with given emailIdOrMobileNumber [{}]", emailIdOrMobileNumber);
+                        model.addAttribute("response1", mvcResponseSender.createResponseString("RTLR_OK_1002", true,
+                                request.getContextPath() + "/login", "Email"));
+                        return "response";
+                    }
+                }
             } else {
                 try {
                     emailId = googleTokenUtil.getEmailId(token);
                 } catch (Exception e) {
                     // in case we cannot connect to google server.
                     emailId = emailIdOrMobileNumber;
+                }
+            }
             fofoDetails.setEmailId(emailId);
             fofoDetails.setFofoId(-1);
-            // fofoDetails.setFofo(false);
-            User user = null;
-            try {
-                user = userRepository.selectByEmailId(emailId);
-            } catch (ProfitMandiBusinessException profitMandiBusinessException) {
-                LOGGER.error("User not found with given emailId [{}]", emailId);
-            }
             if (user == null) {
                 try {
-                    user = userRepository.selectBySecondryEmailId(emailId);
+                    user = userRepository.selectByEmailId(emailId);
                 } catch (ProfitMandiBusinessException profitMandiBusinessException) {
+                    LOGGER.error("User not found with given emailId [{}]", emailId);
+                    try {
+                        user = userRepository.selectBySecondryEmailId(emailId);
+                    } catch (ProfitMandiBusinessException exception) {
-                    LOGGER.error("User not found with given emailId", profitMandiBusinessException);
+                        LOGGER.error("User not found with given emailId", exception);
-                    model.addAttribute("response1", mvcResponseSender.createResponseString("RTLR_OK_1002", true,
+                        model.addAttribute("response1", mvcResponseSender.createResponseString("RTLR_OK_1002", true,
-                            request.getContextPath() + "/login", "Email"));
+                                request.getContextPath() + "/login", "Email"));
-                    return "response";
+                        return "response";
+                    }
+                }
+            }
             if (user != null) {
                 fofoDetails.setFofoId(user.getId());
                 try {
                     List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
-                    for (int index = 0; index < userRoles.size(); index++) {
+                    for (UserRole userRole : userRoles) {
-                        roleIds.add(userRoles.get(index).getRoleId());
+                        roleIds.add(userRole.getRoleId());
+                    }
                     List<Role> roles = roleRepository.selectByIds(roleIds);
                     for (Role role : roles) {
                         if (role.getName().equals(RoleType.RETAILER.toString())) {
-                            UserAccount userAccounts = userAccountRepository.selectByUserIdType(user.getId(),
+                            UserAccount userAccounts = userAccountRepository.selectByUserIdType(user.getId(), AccountType.saholic);
-                                    AccountType.saholic);
                             Retailer retailer = retailerRepository.selectById(userAccounts.getAccountKey());
                             fofoDetails.setFofoId(retailer.getId());
-                            // fofoDetails.setFofo(retailer.isFofo());
+                        }
+                    }
                 } catch (ProfitMandiBusinessException pmbe) {
                     LOGGER.error("Data Inconsistent", pmbe);
+                }
             Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
             Role roleFofoAdmin = roleRepository.selectByName(RoleType.FOFO_ADMIN.toString());
             if (fofoDetails.getRoleIds().contains(roleFofo.getId())) {
                 redirectUrl = "/dashboard";
-                if (fofoDetails.getRoleIds().contains(roleFofo.getId())) {
-                }
             } else {
                 redirectUrl = "/login";
+            }
             if (redirectUrl.equals("/dashboard")) {
                 user.setLoginTimestamp(LocalDateTime.now());
                 this.addCookiesToResponse(fofoDetails, request, response);
-                LOGGER.info("Requested token email_id is valid, user login to system, shoud be redirect to {}",
+                LOGGER.info("Requested token email_id is valid, user login to system, shoud be redirect to {}", redirectUrl);
-                        redirectUrl);
                 model.addAttribute("response1", mvcResponseSender.createResponseString("RTLR_OK_1002", true,
                         request.getContextPath() + redirectUrl, name));
             } else {
                 LOGGER.error("Requested token email_id is not valid, please try to login");
                 /**
                  * TODO:Amit This redirect should be handle.
                  */
-                throw new ProfitMandiBusinessException(ProfitMandiConstants.EMAIL_ID, fofoDetails.getEmailId(),
+                throw new ProfitMandiBusinessException(ProfitMandiConstants.EMAIL_ID, fofoDetails.getEmailId(), "RTLR_1000");
-                        "RTLR_1000");
+            }
             return "response";
         } catch (ProfitMandiBusinessException profitMandiBusinessException) {
             LOGGER.error("Error : ", profitMandiBusinessException);
             model.addAttribute("response1",
             return "response";
+        }
+    }
     @PostMapping(value = "/forgetPassword")
+    public String forgetPasswordPage(@RequestParam(name = ProfitMandiConstants.EMAIL_ID, defaultValue = "") String emailId, Model model) throws Exception {
+        try {
-    public String forgetPasswordPage(
+            LOGGER.info("Forgetting password of: [{}]",emailId);
-            @RequestParam(name = ProfitMandiConstants.EMAIL_ID, defaultValue = "") String emailId, Model model)
+            authService.resetPassword(emailId);
-            throws Exception {
+        } catch (Exception exception){
-        LOGGER.info(emailId);
+            try {
-        authService.resetPassword(emailId);
+                userService.resetPassword(emailId);
+            } catch (Exception e){
+                throw new ProfitMandiBusinessException("Password Reset Email", emailId, "Could not send password reset mail. Password Could not be reset");
+            }
+        }
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         LOGGER.info("completed");
         return "response";
+    }
-    private void addCookiesToResponse(LoginDetails fofoDetails, HttpServletRequest request,
+    private void addCookiesToResponse(LoginDetails fofoDetails, HttpServletRequest request, HttpServletResponse response) {
-                                      HttpServletResponse response) {
         List<String> roleIds = new ArrayList<>();
         for (int roleId : fofoDetails.getRoleIds()) {
             roleIds.add(String.valueOf(roleId));
+        }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LoginController.java – Rev 34300 → 34785