Skip to content

Commit 8afbcc2

Browse files
chore(deps): spring-boot upgrade from 3.4.10 to 4.0.5: fix login response
1 parent 2db282d commit 8afbcc2

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

  • plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/controller/v3

plugin-default-impl/nacos-default-auth-plugin/src/main/java/com/alibaba/nacos/plugin/auth/impl/controller/v3/UserControllerV3.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.alibaba.nacos.api.model.v2.Result;
2424
import com.alibaba.nacos.auth.annotation.Secured;
2525
import com.alibaba.nacos.auth.config.NacosAuthConfigHolder;
26-
import com.alibaba.nacos.common.utils.JacksonUtils;
2726
import com.alibaba.nacos.common.utils.StringUtils;
2827
import com.alibaba.nacos.core.context.RequestContextHolder;
2928
import com.alibaba.nacos.plugin.auth.api.IdentityContext;
@@ -40,7 +39,6 @@
4039
import com.alibaba.nacos.plugin.auth.impl.users.NacosUser;
4140
import com.alibaba.nacos.plugin.auth.impl.users.NacosUserService;
4241
import com.alibaba.nacos.plugin.auth.impl.utils.PasswordGeneratorUtil;
43-
import com.fasterxml.jackson.databind.node.ObjectNode;
4442
import jakarta.servlet.http.HttpServletRequest;
4543
import jakarta.servlet.http.HttpServletResponse;
4644
import org.springframework.http.HttpStatus;
@@ -54,7 +52,9 @@
5452
import org.springframework.web.bind.annotation.RestController;
5553

5654
import java.io.IOException;
55+
import java.util.HashMap;
5756
import java.util.List;
57+
import java.util.Map;
5858

5959
/**
6060
* Controller for handling HTTP requests related to user operations.
@@ -289,8 +289,8 @@ public Object login(HttpServletResponse response, HttpServletRequest request) th
289289
NacosUser user = iAuthenticationManager.authenticate(request);
290290

291291
response.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.TOKEN_PREFIX + user.getToken());
292-
293-
ObjectNode result = JacksonUtils.createEmptyJsonNode();
292+
293+
Map<String, Object> result = new HashMap<>();
294294
result.put(Constants.ACCESS_TOKEN, user.getToken());
295295
result.put(Constants.TOKEN_TTL, jwtTokenManager.getTokenTtlInSeconds(user.getToken()));
296296
result.put(Constants.GLOBAL_ADMIN, iAuthenticationManager.hasGlobalAdminRole(user));

0 commit comments

Comments
 (0)