nodece commented on code in PR #484:
URL: https://github.com/apache/pulsar-manager/pull/484#discussion_r1033275358
##########
src/main/java/org/apache/pulsar/manager/controller/LoginController.java:
##########
@@ -128,30 +122,40 @@ public ResponseEntity<Map<String, Object>> logout() {
return ResponseEntity.ok(result);
}
- @ApiOperation(value = "Logout pulsar manager")
- @ApiResponses({
- @ApiResponse(code = 200, message = "ok"),
- @ApiResponse(code = 500, message = "Internal server error")
- })
- @RequestMapping(value = "/casdoor", method = RequestMethod.POST)
- public ResponseEntity<Map<String, Object>> callback(
- @RequestBody Map<String, String> body) {
- Map<String, Object> result = Maps.newHashMap();
+ @ApiOperation(value = "casdoor Login pulsar manager")
+ @ApiResponses({@ApiResponse(code = 200, message = "ok"), @ApiResponse(code
= 500, message = "Internal server error")})
+ @RequestMapping(value = "/casdoor", method = RequestMethod.POST)
+ public ResponseEntity<Map<String, Object>> callback(@RequestBody
Map<String, String> body) {
+ String userAccount, userPassword, token;
String code = body.get("code");
String state = body.get("state");
- String token = casdoorAuthService.getOAuthToken(code, state);
- if(!token.startsWith("error")){
- result.put("error", token.substring(7));
- return ResponseEntity.ok(result);
- }
- result.put("login", "success");
+ String casdoortoken = casdoorAuthService.getOAuthToken(code, state);
+ CasdoorUser casdoorUser =
casdoorAuthService.parseJwtToken(casdoortoken);
+ Map<String, Object> result = Maps.newHashMap();
HttpHeaders headers = new HttpHeaders();
HttpServletRequest request = ((ServletRequestAttributes)
RequestContextHolder.getRequestAttributes()).getRequest();
- String jwtToken = jwtService.toToken(account + "-" + password);
- jwtService.setToken(request.getSession().getId(), jwtToken);
- headers.add("token", jwtToken);
- headers.add("tenant","pulsar");
- headers.add("username", "pulsar");
+ Optional<UserInfoEntity> userInfoEntityOptional =
usersRepository.findByUserName(casdoorUser.getName());
+ UserInfoEntity userInfoEntity = new UserInfoEntity();
+ if (!userInfoEntityOptional.isPresent()) {
+ userInfoEntity.setUserId(0);
+ userInfoEntity.setName(casdoorUser.getName());
+ userInfoEntity.setPassword(casdoorUser.getPassword());
+ userInfoEntity.setExpire(0);
+ usersRepository.save(userInfoEntity);
+ } else {
+ userInfoEntity = userInfoEntityOptional.get();
+ }
+ userAccount = casdoorUser.getName();
+ userPassword = casdoorUser.getPassword();
+ token = jwtService.toToken(userAccount + userPassword +
System.currentTimeMillis());
+ userInfoEntity.setAccessToken(token);
+ result.put("login", "success");
+ usersRepository.update(userInfoEntity);
+ headers.add("token", token);
Review Comment:
```suggestion
HttpHeaders headers = new HttpHeaders();
headers.add("token", token);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
