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

Added audit log for provider oauth2

Browse Source
This commit is contained in:
oyurov 2022-10-19 11:55:27 +02:00
parent df732a8f58
commit 39b138d45b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,7 +310,7 @@ public class DefaultSystemSecurityService implements SystemSecurityService {
} }
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.getName(), user.getId(), null, actionType, e, clientAddress, browser, os, device, user.getAdditionalInfo());
} }
private static boolean isPositiveInteger(Integer val) { private static boolean isPositiveInteger(Integer val) {

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

@ -257,10 +257,14 @@ 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);
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")) {
actionData.put("provider", provider.get("authProviderName").asText());
}
break; break;
case PROVISION_SUCCESS: case PROVISION_SUCCESS:
case PROVISION_FAILURE: case PROVISION_FAILURE: