Subversion Repositories SmartDukaan

Rev

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

Rev 23532 Rev 23786
Line 116... Line 116...
116 
					responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(socialUser.getEmailId()));
 116 
					responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(socialUser.getEmailId()));
117 
					responseMap.put(ProfitMandiConstants.REGISTERED, false);
 117 
					responseMap.put(ProfitMandiConstants.REGISTERED, false);
118 
				}
 118 
				}
119 
			}
 119 
			}
120 
			if(user != null){
 120 
			if(user != null){
121 
				//Set<Role> roles = user.getRoles();
 - 
 
122 
				List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
 121 
				List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
123 
				//Set<Role> roles = new HashSet<>();
 - 
 
124 
				String[] roleTypes = new String[userRoles.size()];
 122 
				String[] roleIds = new String[userRoles.size()];
125 
				int index = 0;
 123 
				int index = 0;
126 
				for (UserRole userRole : userRoles) {
 124 
				for (UserRole userRole : userRoles) {
127 
					roleTypes[index++] = userRole.getRoleType().toString();
 125 
					roleIds[index++] = String.valueOf(userRole.getRoleId());
128 
				}
 126 
				}
129 
				responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), roleTypes));
 127 
				responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), roleIds));
130 
				responseMap.put(ProfitMandiConstants.REGISTERED, true);
 128 
				responseMap.put(ProfitMandiConstants.REGISTERED, true);
131 
			}
 129 
			}
132
130
133 
			return responseMap;
 131 
			return responseMap;
134 
		}catch (JsonProcessingException jsonProcessingException) {
 132 
		}catch (JsonProcessingException jsonProcessingException) {