Skip to content

Commit f52f1b0

Browse files
feat: add first_name and last_name into OtlpStrategy (#438)
* feat: add first_name and last_name into OtlpStrategy * chore: change method for get first_name and last_name into OtlpStrategy * chore: change method for get first_name and last_name into OtlpStrategy
1 parent 9bb2c6c commit f52f1b0

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

app/Audit/AuditLogOtlpStrategy.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,12 @@ public function audit($subject, array $change_set, string $event_type): void
6060
}
6161

6262
$resource_server_ctx = App::make(\models\oauth2\IResourceServerContext::class);
63-
$user_id = $resource_server_ctx->getCurrentUserId();
64-
$user_email = $resource_server_ctx->getCurrentUserEmail();
63+
$user = $resource_server_ctx->getCurrentUser(false, false);
64+
65+
$user_id = $user ? $user->getId() : null;
66+
$user_email = $user ? $user->getEmail() : null;
67+
$user_first_name = $user ? $user->getFirstName() : null;
68+
$user_last_name = $user ? $user->getLastName() : null;
6569

6670
$formatter = null;
6771
switch ($event_type) {
@@ -94,7 +98,7 @@ public function audit($subject, array $change_set, string $event_type): void
9498
$description = $formatter->format($subject, $change_set);
9599
}
96100

97-
$auditData = $this->buildAuditLogData($entity, $subject, $change_set, $event_type, $user_id, $user_email);
101+
$auditData = $this->buildAuditLogData($entity, $subject, $change_set, $event_type, $user_id, $user_email, $user_first_name, $user_last_name);
98102
if (!empty($description)) {
99103
$auditData['audit.description'] = $description;
100104
}
@@ -128,7 +132,7 @@ private function resolveAuditableEntity($subject)
128132
return null;
129133
}
130134

131-
private function buildAuditLogData($entity, $subject, array $change_set, string $event_type, ?string $user_id, ?string $user_email): array
135+
private function buildAuditLogData($entity, $subject, array $change_set, string $event_type, ?string $user_id, ?string $user_email, ?string $user_first_name, ?string $user_last_name): array
132136
{
133137
$auditData = [
134138
'audit.action' => $this->mapEventTypeToAction($event_type),
@@ -139,6 +143,8 @@ private function buildAuditLogData($entity, $subject, array $change_set, string
139143
'audit.event_type' => $event_type,
140144
'auth.user.id' => $user_id ?? 'unknown',
141145
'auth.user.email' => $user_email ?? 'unknown',
146+
'auth.user.first_name' => $user_first_name ?? 'unknown',
147+
'auth.user.last_name' => $user_last_name ?? 'unknown',
142148
'elasticsearch.index' => $this->elasticIndex,
143149
];
144150

0 commit comments

Comments
 (0)