Skip to content

Commit 8eb23e8

Browse files
chore: change method for get first_name and last_name into OtlpStrategy
1 parent 4ae663f commit 8eb23e8

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

app/Audit/AuditLogOtlpStrategy.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +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();
65-
$user_first_name = $resource_server_ctx->getCurrentUserFirstName();
66-
$user_last_name = $resource_server_ctx->getCurrentUserLastName();
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;
6769

6870
$formatter = null;
6971
switch ($event_type) {

0 commit comments

Comments
 (0)