| Line 258... |
Line 258... |
| 258 |
UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
|
258 |
UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
|
| 259 |
LOGGER.info("userinfo1 {}", userInfo);
|
259 |
LOGGER.info("userinfo1 {}", userInfo);
|
| 260 |
User user = null;
|
260 |
User user = null;
|
| 261 |
if (userInfo.getUserId() > -1) {
|
261 |
if (userInfo.getUserId() > -1) {
|
| 262 |
user = userRepository.selectById(userInfo.getUserId());
|
262 |
user = userRepository.selectById(userInfo.getUserId());
|
| 263 |
LOGGER.info("userinfo7 {}", user);
|
- |
|
| 264 |
String city = user.getCity();
|
263 |
String city = user.getCity();
|
| 265 |
|
264 |
|
| 266 |
if (!(userInfo.getEmail() == null || user.getEmailId().indexOf("@smartdukaan.com") == -1)) {
|
265 |
if (!(userInfo.getEmail() == null || user.getEmailId().indexOf("@smartdukaan.com") == -1)) {
|
| 267 |
String userName = null;
|
266 |
String userName = null;
|
| 268 |
LOGGER.info("userinfo2 {}", userInfo);
|
- |
|
| 269 |
if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
|
267 |
if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
|
| 270 |
|
268 |
|
| 271 |
LOGGER.info("userinfo3 {}", user);
|
- |
|
| 272 |
userName = user.getFirstName() + " " + user.getLastName();
|
269 |
userName = user.getFirstName() + " " + user.getLastName();
|
| 273 |
} else {
|
270 |
} else {
|
| 274 |
AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
|
271 |
AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
|
| 275 |
LOGGER.info("authUser {}", authUser);
|
272 |
LOGGER.info("authUser {}", authUser);
|
| 276 |
if (authUser == null || !authUser.isActive()) {
|
273 |
if (authUser == null || !authUser.isActive()) {
|
| Line 285... |
Line 282... |
| 285 |
responseMap.put(ProfitMandiConstants.USER_STATUS, "fofoAssociate");
|
282 |
responseMap.put(ProfitMandiConstants.USER_STATUS, "fofoAssociate");
|
| 286 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|
283 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|
| 287 |
responseMap.put("storeUrl", "");
|
284 |
responseMap.put("storeUrl", "");
|
| 288 |
return responseSender.ok(responseMap);
|
285 |
return responseSender.ok(responseMap);
|
| 289 |
}
|
286 |
}
|
| 290 |
LOGGER.info("userinfo10 {}", userInfo);
|
- |
|
| 291 |
} else {
|
287 |
} else {
|
| 292 |
try {
|
288 |
try {
|
| 293 |
|
289 |
|
| 294 |
LOGGER.info("userinfo4 {}", userInfo);
|
290 |
LOGGER.info("userinfo4 {}", userInfo);
|
| 295 |
user = userRepository.selectByEmailId(userInfo.getEmail());
|
291 |
user = userRepository.selectByEmailId(userInfo.getEmail());
|