Subversion Repositories SmartDukaan

Rev

Rev 26395 | Rev 26450 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26395 Rev 26449
Line 75... Line 75...
75 
	@Autowired
 75 
	@Autowired
76 
	private GoogleTokenUtil googleTokenUtil;
 76 
	private GoogleTokenUtil googleTokenUtil;
77 
 
 77 
 
78 
	@Autowired
 78 
	@Autowired
79 
	private RoleManager roleManager;
 79 
	private RoleManager roleManager;
80
80 
 
81 
	@Autowired
 81 
	@Autowired
82 
	private DeviceRepository deviceRepository;
 82 
	private DeviceRepository deviceRepository;
83 
 
 83 
 
84 
	@Autowired
 84 
	@Autowired
85 
	private RetailerRepository retailerRepository;
 85 
	private RetailerRepository retailerRepository;
Line 127... Line 127...
127 
			LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
 127 
			LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
128 
			LOGGER.info("Request session is already exist, should be redirect to as per roles assigned");
 128 
			LOGGER.info("Request session is already exist, should be redirect to as per roles assigned");
129 
			String redirectUrl = null;
 129 
			String redirectUrl = null;
130 
 
 130 
 
131 
			Role roleRetailer = roleRepository.selectByName(RoleType.RETAILER.toString());
 131 
			Role roleRetailer = roleRepository.selectByName(RoleType.RETAILER.toString());
132 
			Role roleFofo = roleRepository.selectByName(RoleType.RETAILER.toString());
 132 
			Role roleFofo = roleRepository.selectByName(RoleType.FOFO.toString());
133 
			FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoDetails.getFofoId());
 - 
 
134 
			if(!fofoStore.isActive()) {
 - 
 
135 
				cookiesProcessor.removeCookies(request, response);
 - 
 
136 
				throw new ProfitMandiBusinessException("", "", "");
 - 
 
137 
			}
 - 
 
138 
			Role roleFofoAdmin = roleRepository.selectByName(RoleType.RETAILER.toString());
 133 
			Role roleFofoAdmin = roleRepository.selectByName(RoleType.FOFO_ADMIN.toString());
139 
			if ((fofoDetails.getRoleIds().contains(roleRetailer.getId())
 - 
 
140 
					&& fofoDetails.getRoleIds().contains(roleFofo.getId())
 - 
 
141 
					|| (fofoDetails.getRoleIds().contains(roleFofoAdmin.getId())))) {
 134 
			if (fofoDetails.getRoleIds().contains(roleFofoAdmin.getId())) {
142 
				redirectUrl = "/dashboard";
 135 
				redirectUrl = "/dashboard";
- 
 
 136 
			} else if (fofoDetails.getRoleIds().contains(roleRetailer.getId())
- 
 
 137 
					&& fofoDetails.getRoleIds().contains(roleFofo.getId())) {
- 
 
 138 
				FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoDetails.getFofoId());
- 
 
 139 
				if (!fofoStore.isActive()) {
- 
 
 140 
					cookiesProcessor.removeCookies(request, response);
- 
 
 141 
					throw new ProfitMandiBusinessException("", "", "");
- 
 
 142 
				}
- 
 
 143 
 
143 
			} else {
 144 
			} else {
144 
				redirectUrl = "/login";
 145 
				redirectUrl = "/login";
145 
			}
 146 
			}
146 
			return "redirect:" + redirectUrl;
 147 
			return "redirect:" + redirectUrl;
147 
		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
 148 
		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
Line 175... Line 176...
175 
		return "mobileapp";
 176 
		return "mobileapp";
176 
	}
 177 
	}
177 
 
 178 
 
178 
	private String getAndroidId(String emailId) throws Exception {
 179 
	private String getAndroidId(String emailId) throws Exception {
179 
		User user = userRepository.selectByEmailId(emailId);
 180 
		User user = userRepository.selectByEmailId(emailId);
180 
		List<Device> devices = deviceRepository.selectByUserIdAndModifiedTimestamp(Arrays.asList(user.getId()), LocalDateTime.now().minusYears(2), LocalDateTime.now());
 181 
		List<Device> devices = deviceRepository.selectByUserIdAndModifiedTimestamp(Arrays.asList(user.getId()),
- 
 
 182 
				LocalDateTime.now().minusYears(2), LocalDateTime.now());
181 
		if(devices.size() > 0) {
 183 
		if (devices.size() > 0) {
182 
			Device device = devices.get(0);
 184 
			Device device = devices.get(0);
183 
			return device.getAndroidId();
 185 
			return device.getAndroidId();
184 
		} else {
 186 
		} else {
185 
			return "";
 187 
			return "";
186 
		}
 188 
		}
Line 336... Line 338...
336 
					mvcResponseSender.createResponseString(profitMandiBusinessException.getCode(), false, "/error"));
 338 
					mvcResponseSender.createResponseString(profitMandiBusinessException.getCode(), false, "/error"));
337 
			return "response";
 339 
			return "response";
338 
		} catch (Exception e) {
 340 
		} catch (Exception e) {
339 
			e.printStackTrace();
 341 
			e.printStackTrace();
340 
			model.addAttribute("response",
 342 
			model.addAttribute("response",
341 
					mvcResponseSender.createResponseString("You are not authorised! "
 343 
					mvcResponseSender.createResponseString(
342 
							+ "Please contact the team if you feel this is incorrect", false, "/error"));
 344 
							"You are not authorised! " + "Please contact the team if you feel this is incorrect", false,
- 
 
 345 
							"/error"));
343 
			return "response";
 346 
			return "response";
344 
		}
 347 
		}
345 
	}
 348 
	}
346 
 
 349 
 
347 
	@PostMapping(value = "/forgetPassword")
 350 
	@PostMapping(value = "/forgetPassword")