|
23 | 23 | import com.alibaba.nacos.api.model.v2.Result; |
24 | 24 | import com.alibaba.nacos.auth.annotation.Secured; |
25 | 25 | import com.alibaba.nacos.auth.config.NacosAuthConfigHolder; |
26 | | -import com.alibaba.nacos.common.utils.JacksonUtils; |
27 | 26 | import com.alibaba.nacos.common.utils.StringUtils; |
28 | 27 | import com.alibaba.nacos.core.context.RequestContextHolder; |
29 | 28 | import com.alibaba.nacos.plugin.auth.api.IdentityContext; |
|
40 | 39 | import com.alibaba.nacos.plugin.auth.impl.users.NacosUser; |
41 | 40 | import com.alibaba.nacos.plugin.auth.impl.users.NacosUserService; |
42 | 41 | import com.alibaba.nacos.plugin.auth.impl.utils.PasswordGeneratorUtil; |
43 | | -import com.fasterxml.jackson.databind.node.ObjectNode; |
44 | 42 | import jakarta.servlet.http.HttpServletRequest; |
45 | 43 | import jakarta.servlet.http.HttpServletResponse; |
46 | 44 | import org.springframework.http.HttpStatus; |
|
54 | 52 | import org.springframework.web.bind.annotation.RestController; |
55 | 53 |
|
56 | 54 | import java.io.IOException; |
| 55 | +import java.util.HashMap; |
57 | 56 | import java.util.List; |
| 57 | +import java.util.Map; |
58 | 58 |
|
59 | 59 | /** |
60 | 60 | * Controller for handling HTTP requests related to user operations. |
@@ -289,8 +289,8 @@ public Object login(HttpServletResponse response, HttpServletRequest request) th |
289 | 289 | NacosUser user = iAuthenticationManager.authenticate(request); |
290 | 290 |
|
291 | 291 | response.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.TOKEN_PREFIX + user.getToken()); |
292 | | - |
293 | | - ObjectNode result = JacksonUtils.createEmptyJsonNode(); |
| 292 | + |
| 293 | + Map<String, Object> result = new HashMap<>(); |
294 | 294 | result.put(Constants.ACCESS_TOKEN, user.getToken()); |
295 | 295 | result.put(Constants.TOKEN_TTL, jwtTokenManager.getTokenTtlInSeconds(user.getToken())); |
296 | 296 | result.put(Constants.GLOBAL_ADMIN, iAuthenticationManager.hasGlobalAdminRole(user)); |
|
0 commit comments