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

     public ResponseEntity<?> googleLogin(HttpServletRequest request, @RequestBody GoogleLoginRequest loginRequest) throws Exception {
         String email = loginRequest.getEmail() != null ? loginRequest.getEmail() : googleLoginProcessor.process(loginRequest.getToken());
         return responseSender.ok(getAuthTokenMap(email, loginRequest));
+    }
+    @RequestMapping(value = "/user/unregistered", method = RequestMethod.GET)
+    public ResponseEntity<?> unregisteredToken() throws Exception {
+        Map<String, Object> responseMap = new HashMap<>();
+        responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create());
+        responseMap.put(ProfitMandiConstants.REGISTERED, false);
+        return responseSender.ok(responseMap);
+    }
     @RequestMapping(value = ProfitMandiConstants.URL_B2B_APP_VERSION, method = RequestMethod.GET)
     public ResponseEntity<?> checkForUpdate(HttpServletRequest request, @RequestParam int version) {
         Map<String, Object> responseMap = new HashMap<>();
         responseMap.put("appVersion", ProfitMandiConstants.B2B_APP_VERSION);
         responseMap.put("appUrl", ProfitMandiConstants.B2B_APP_URL);
             @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> tokenInfo(HttpServletRequest request) throws Throwable {
         Map<String, Object> responseMap = new HashMap<>();
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         LOGGER.info("userinfo1 {}", userInfo);
         User user = null;
+        // Case 1: When userId is present in token
         if (userInfo.getUserId() > -1) {
             user = userRepository.selectById(userInfo.getUserId());
-            String city = user.getCity();
+            // Special FOFO Associate handling for smartdukaan domain
+            boolean isSmartDukaanEmail = userInfo.getEmail() != null
+                    && user.getEmailId() != null
-            if (!(userInfo.getEmail() == null || user.getEmailId().indexOf("@smartdukaan.com") == -1)) {
+                    && user.getEmailId().contains("@smartdukaan.com");
+            if (isSmartDukaanEmail) {
-                String userName = null;
+                String userName;
                 if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
                     userName = user.getFirstName() + " " + user.getLastName();
                 } else {
-                        AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
+                    AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
                     LOGGER.info("authUser {}", authUser);
                     if (authUser == null || !authUser.isActive()) {
                         responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
                         responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
                         return responseSender.ok(responseMap);
                 responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
                 responseMap.put("storeUrl", "");
                 return responseSender.ok(responseMap);
+            }
         } else {
+            // Case 2: When userId is not present, try locate by emails
             try {
                 LOGGER.info("userinfo4 {}", userInfo);
                 user = userRepository.selectByEmailId(userInfo.getEmail());
             } catch (ProfitMandiBusinessException e1) {
+                LOGGER.warn("Failed to fetch user by primary email: {}", userInfo.getEmail(), e1);
+            }
             if (user == null) {
                 try {
                     LOGGER.info("userinfo8 {}", userInfo);
                     user = userRepository.selectBySecondryEmailId(userInfo.getEmail());
                 } catch (ProfitMandiBusinessException e1) {
-                    LOGGER.info("Uneregistered user", userInfo.getEmail());
+                    LOGGER.info("Unregistered user: {}", userInfo.getEmail());
+                }
+            }
+        }
         if (user != null) {
             responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
             responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
             responseMap.put(ProfitMandiConstants.USER_NAME, user.getFirstName() + " " + user.getLastName());
-            if(roleManager.isUser(userInfo.getRoleIds()) && !roleManager.isRetailer(userInfo.getRoleIds())) {
-            } else {
-            }
             List<Integer> roleIds = userRoleRepository.selectRoleIdsByUserId(user.getId());
-            LOGGER.info("userRoles {} ", user.getEmailId());
+            LOGGER.info("userRoles for {}", user.getEmailId());
             int retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
             // generate new token if roles have been updated
             if (userInfo.getRoleIds() == null || roleIds.size() != userInfo.getRoleIds().size()) {
-                String[] roleIdStrings = new String[roleIds.size()];
+                String[] roleIdStrings = roleIds.stream().map(String::valueOf).toArray(String[]::new);
-                int index = 0;
-                for (int roleId : roleIds) {
-                    roleIdStrings[index++] = String.valueOf(roleId);
-                }
                 String newToken = JWTUtil.create(user.getId(), retailerId, roleIdStrings);
                 responseMap.put("newAuthToken", newToken);
+            }
             // if user is retailer
-            Set<Integer> roleIdsSet = new HashSet<Integer>(roleIds);
+            Set<Integer> roleIdsSet = new HashSet<>(roleIds);
             if (roleManager.isRetailer(roleIdsSet)) {
                 UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
                 Retailer retailer = retailerRepository.selectById(uc.getUserId());
                 com.spice.profitmandi.dao.entity.user.User saholicUser = userUserRepository.selectById(uc.getUserId());
                 if (saholicUser.getAddressId() != null) {
         return responseSender.ok(this.getAuthTokenMap(emailId, loginRequest));
+    }
-    @RequestMapping(value = "/mobileappsettings")
-    public ResponseEntity<?> mobileAppSettings(HttpServletRequest request, @RequestParam(name = "t") int timestamp, @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);
-        if (timestamp == 0) {
-            return responseSender.ok(OrderController.APP_SETTINGS);
-        } else {
-            return responseSender.ok(OrderController.APP_SETTINGS_BLANK);
-        }
-    }
     @RequestMapping(value = "/mobileappsettings1", method = RequestMethod.POST)
     public ResponseEntity<?> mobileAppSettings1(HttpServletRequest request, @RequestParam(name = "t") int timestamp,
                                                 @RequestParam(name = "imeinumber") String imeinumber)
             throws ProfitMandiBusinessException, ClientProtocolException, IOException {
         LocalDateTime settingsLastUpdated = LocalDateTime.ofEpochSecond(timestamp, 0, ZoneOffset.ofHoursMinutes(5, 30));

Subversion Repositories SmartDukaan

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