dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
oyurov 2022-10-19 15:25:33 +02:00
parent 39b138d45b
commit f8158ee6ae
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/service/security/system/DefaultSystemSecurityService.java
View File

@ -268,6 +268,7 @@ public class DefaultSystemSecurityService implements SystemSecurityService {
String browser = "Unknown"; String browser = "Unknown";
String os = "Unknown"; String os = "Unknown";
String device = "Unknown"; String device = "Unknown";
String provider = null;
if (authenticationDetails instanceof RestAuthenticationDetails) { if (authenticationDetails instanceof RestAuthenticationDetails) {
RestAuthenticationDetails details = (RestAuthenticationDetails) authenticationDetails; RestAuthenticationDetails details = (RestAuthenticationDetails) authenticationDetails;
clientAddress = details.getClientAddress(); clientAddress = details.getClientAddress();
@ -308,9 +309,12 @@ public class DefaultSystemSecurityService implements SystemSecurityService {
if (actionType == ActionType.LOGIN && e == null) { if (actionType == ActionType.LOGIN && e == null) {
userService.setLastLoginTs(user.getTenantId(), user.getId()); userService.setLastLoginTs(user.getTenantId(), user.getId());
} }
if (user.getAdditionalInfo() != null && user.getAdditionalInfo().has("authProviderName")) {
provider = user.getAdditionalInfo().get("authProviderName").asText();
}
auditLogService.logEntityAction( auditLogService.logEntityAction(
user.getTenantId(), user.getCustomerId(), user.getId(), user.getTenantId(), user.getCustomerId(), user.getId(),
user.getName(), user.getId(), null, actionType, e, clientAddress, browser, os, device, user.getAdditionalInfo()); user.getName(), user.getId(), null, actionType, e, clientAddress, browser, os, device, provider);
} }
private static boolean isPositiveInteger(Integer val) { private static boolean isPositiveInteger(Integer val) {

6
dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
View File

@ -257,13 +257,13 @@ public class AuditLogServiceImpl implements AuditLogService {
String browser = extractParameter(String.class, 1, additionalInfo); String browser = extractParameter(String.class, 1, additionalInfo);
String os = extractParameter(String.class, 2, additionalInfo); String os = extractParameter(String.class, 2, additionalInfo);
String device = extractParameter(String.class, 3, additionalInfo); String device = extractParameter(String.class, 3, additionalInfo);
JsonNode provider = extractParameter(JsonNode.class, 4, additionalInfo); String provider = extractParameter(String.class, 4, additionalInfo);
actionData.put("clientAddress", clientAddress); actionData.put("clientAddress", clientAddress);
actionData.put("browser", browser); actionData.put("browser", browser);
actionData.put("os", os); actionData.put("os", os);
actionData.put("device", device); actionData.put("device", device);
if (provider != null && provider.has("authProviderName")) { if (org.springframework.util.StringUtils.hasText(provider)) {
actionData.put("provider", provider.get("authProviderName").asText()); actionData.put("provider", provider);
} }
break; break;
case PROVISION_SUCCESS: case PROVISION_SUCCESS: