community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420

Browse Source
This commit is contained in:
tcdlpds 2024-02-01 01:50:08 +05:30
commit 51199fbb70
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/src/main/java/io/entgra/device/mgt/core/ui/request/interceptor/UserHandler.java
View File

@ -50,7 +50,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;
import java.util.Map;
@MultipartConfig @MultipartConfig
@WebServlet("/user") @WebServlet("/user")
@ -122,13 +121,11 @@ public class UserHandler extends HttpServlet {
proxyResponse.setCode(HttpStatus.SC_OK); proxyResponse.setCode(HttpStatus.SC_OK);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
Map<String, Object> nodeMap = mapper.convertValue(tokenData, new TypeReference<>() { String data = tokenData.get("username").textValue().replaceAll("@carbon.super", "");
}); proxyResponse.setData(mapper.convertValue(data, JsonNode.class));
nodeMap.put("username", tokenData.get("username").textValue().replaceAll("@carbon.super", ""));
proxyResponse.setData(mapper.convertValue(nodeMap, JsonNode.class));
HandlerUtil.handleSuccess(resp, proxyResponse); HandlerUtil.handleSuccess(resp, proxyResponse);
httpSession.setAttribute(HandlerConstants.USERNAME_WITH_DOMAIN, nodeMap.get("username").toString()); httpSession.setAttribute(HandlerConstants.USERNAME_WITH_DOMAIN, tokenData.get("username").toString());
log.info( log.info(
"User " + proxyResponse.getData() + " logged in", "User " + proxyResponse.getData() + " logged in",
userLoginLogContextBuilder userLoginLogContextBuilder