Subversion Repositories SmartDukaan

Rev

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

Rev 21511 Rev 21526
Line 119... Line 119...
119
	@RequestMapping(value = ProfitMandiConstants.URL_USER_TOKEN_INFO, method = RequestMethod.GET)
119
	@RequestMapping(value = ProfitMandiConstants.URL_USER_TOKEN_INFO, method = RequestMethod.GET)
120
	@ApiImplicitParams({
120
	@ApiImplicitParams({
121
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
121
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
122
	public ResponseEntity<?> tokenInfo(HttpServletRequest request) throws Throwable {
122
	public ResponseEntity<?> tokenInfo(HttpServletRequest request) throws Throwable {
123
		Map<String, Object> responseMap = new HashMap<>();
123
		Map<String, Object> responseMap = new HashMap<>();
124
		LOGGER.info("requested url : " + request.getRequestURL().toString());
-
 
125
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
124
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
126
		User user = null;
125
		User user = null;
127
		if(userInfo.getUserId()>-1){
126
		if(userInfo.getUserId()>-1){
128
			user = userRepository.selectById(userInfo.getUserId());
127
			user = userRepository.selectById(userInfo.getUserId());
129
		} else {
128
		} else {
130
			try {
129
			try {
131
				user = userRepository.selectByEmailId(userInfo.getEmail());
130
				user = userRepository.selectByEmailId(userInfo.getEmail());
132
			} catch (ProfitMandiBusinessException e1) {
131
			} catch (ProfitMandiBusinessException e1) {
133
				LOGGER.info("Uneregistered user");
132
				LOGGER.info("Uneregistered user", userInfo.getEmail());
134
			}
133
			}
135
		}
134
		}
136
		if (user != null) {
135
		if (user != null) {
137
			responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
136
			responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
-
 
137
			responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
138
			
138
			
139
			Set<Role> roles = user.getRoles();
139
			Set<Role> roles = user.getRoles();
140
			//generate new token if roles size is different
140
			//generate new token if roles size is different
141
			if(userInfo.getRoleNames() == null || roles.size() != userInfo.getRoleNames().size()) {
141
			if(userInfo.getRoleNames() == null || roles.size() != userInfo.getRoleNames().size()) {
142
				String[] roleTypes = new String[roles.size()];
142
				String[] roleTypes = new String[roles.size()];
Line 177... Line 177...
177
			}
177
			}
178
		} else {
178
		} else {
179
			responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
179
			responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
180
			responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
180
			responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
181
		}
181
		}
182
 
182
	
183
		return responseSender.ok(responseMap);
183
		return responseSender.ok(responseMap);
184
	}
184
	}
185
 
185
 
186
	@RequestMapping(value = ProfitMandiConstants.URL_USER, method = RequestMethod.POST)
186
	@RequestMapping(value = ProfitMandiConstants.URL_USER, method = RequestMethod.POST)
187
	@ApiImplicitParams({
187
	@ApiImplicitParams({