| Line 210... |
Line 210... |
| 210 |
if (!(userInfo.getEmail() == null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
|
210 |
if (!(userInfo.getEmail() == null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
|
| 211 |
String userName = null;
|
211 |
String userName = null;
|
| 212 |
if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
|
212 |
if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
|
| 213 |
userName = user.getFirstName() + " " + user.getLastName();
|
213 |
userName = user.getFirstName() + " " + user.getLastName();
|
| 214 |
} else {
|
214 |
} else {
|
| 215 |
userName = authService.getNameByEmailId(userInfo.getEmail());
|
215 |
AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
|
| - |
|
216 |
if(authUser==null || !authUser.isActive()) {
|
| - |
|
217 |
responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
|
| - |
|
218 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|
| - |
|
219 |
return responseSender.ok(responseMap);
|
| - |
|
220 |
}
|
| - |
|
221 |
userName = authUser.getName();
|
| 216 |
}
|
222 |
}
|
| 217 |
responseMap.put(ProfitMandiConstants.USER_ID, userInfo.getUserId());
|
223 |
responseMap.put(ProfitMandiConstants.USER_ID, userInfo.getUserId());
|
| 218 |
responseMap.put(ProfitMandiConstants.USER_NAME, userName);
|
224 |
responseMap.put(ProfitMandiConstants.USER_NAME, userName);
|
| 219 |
responseMap.put(ProfitMandiConstants.USER_STATUS, "fofoAssociate");
|
225 |
responseMap.put(ProfitMandiConstants.USER_STATUS, "fofoAssociate");
|
| 220 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|
226 |
responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
|