| Line 265... |
Line 265... |
| 265 |
String userName = null;
|
265 |
String userName = null;
|
| 266 |
if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
|
266 |
if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
|
| 267 |
|
267 |
|
| 268 |
userName = user.getFirstName() + " " + user.getLastName();
|
268 |
userName = user.getFirstName() + " " + user.getLastName();
|
| 269 |
} else {
|
269 |
} else {
|
| 270 |
AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
|
270 |
AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
|
| 271 |
LOGGER.info("authUser {}", authUser);
|
271 |
LOGGER.info("authUser {}", authUser);
|
| 272 |
if (authUser == null || !authUser.isActive()) {
|
272 |
if (authUser == null || !authUser.isActive()) {
|
| 273 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
|
273 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
|
| 274 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|
274 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|
| 275 |
return responseSender.ok(responseMap);
|
275 |
return responseSender.ok(responseMap);
|
| Line 298... |
Line 298... |
| 298 |
LOGGER.info("Uneregistered user", userInfo.getEmail());
|
298 |
LOGGER.info("Uneregistered user", userInfo.getEmail());
|
| 299 |
}
|
299 |
}
|
| 300 |
}
|
300 |
}
|
| 301 |
}
|
301 |
}
|
| 302 |
if (user != null) {
|
302 |
if (user != null) {
|
| 303 |
int retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
|
- |
|
| 304 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
|
303 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
|
| 305 |
responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
|
304 |
responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
|
| 306 |
responseMap.put(ProfitMandiConstants.USER_NAME, user.getFirstName() + " " + user.getLastName());
|
305 |
responseMap.put(ProfitMandiConstants.USER_NAME, user.getFirstName() + " " + user.getLastName());
|
| - |
|
306 |
|
| - |
|
307 |
if(roleManager.isUser(userInfo.getRoleIds()) && !roleManager.isRetailer(userInfo.getRoleIds())) {
|
| - |
|
308 |
|
| - |
|
309 |
} else {
|
| - |
|
310 |
|
| - |
|
311 |
}
|
| - |
|
312 |
|
| - |
|
313 |
|
| 307 |
List<Integer> roleIds = userRoleRepository.selectRoleIdsByUserId(user.getId());
|
314 |
List<Integer> roleIds = userRoleRepository.selectRoleIdsByUserId(user.getId());
|
| 308 |
// LOGGER.info("userRoles {} ", userRoles);
|
315 |
LOGGER.info("userRoles {} ", user.getEmailId());
|
| 309 |
|
316 |
|
| - |
|
317 |
int retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
|
| 310 |
// generate new token if roles have been updated
|
318 |
// generate new token if roles have been updated
|
| 311 |
if (userInfo.getRoleIds() == null || roleIds.size() != userInfo.getRoleIds().size()) {
|
319 |
if (userInfo.getRoleIds() == null || roleIds.size() != userInfo.getRoleIds().size()) {
|
| 312 |
String[] roleIdStrings = new String[roleIds.size()];
|
320 |
String[] roleIdStrings = new String[roleIds.size()];
|
| 313 |
int index = 0;
|
321 |
int index = 0;
|
| 314 |
for (int roleId : roleIds) {
|
322 |
for (int roleId : roleIds) {
|