Skip to content

#106342 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MsNatali merged 6 commits into from
Apr 12, 2023
Merged

#106342 #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cbef2ad
#106342
MsNatali Apr 12, 2023
d244d69
#106342
MsNatali Apr 12, 2023
9823621
#106342
MsNatali Apr 12, 2023
8932661
#106342
MsNatali Apr 12, 2023
8a95409
#106342
MsNatali Apr 12, 2023
0de5a5d
#106342
MsNatali Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions config/initial-event-propagation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
'set_initial_event_http_middleware' => [
'default_user_type' => '',

/**
* If is set to `false` the middleware does not try to get current user
* Defaults to `true`.
*/
'try_auth' => true,

/**
* If is set to `true` the middleware does not override the InitialEvent if it was already set for current context earlier.
* Defaults to `false`.
Expand Down
11 changes: 8 additions & 3 deletions src/SetInitialEventHttpMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,23 @@ class SetInitialEventHttpMiddleware
{
public function handle(Request $request, Closure $next): mixed
{
$user = $request->user();
$config = config('initial-event-propagation', []);
$mc = config('initial-event-propagation.set_initial_event_http_middleware', []);
$holder = Container::getInstance()->make(InitialEventHolder::class);
$existingEvent = $holder->getInitialEvent();

if (!$existingEvent || empty($mc['preserve_existing_event'])) {

$user = null;
if ($mc['try_auth'] ?? true) {
$user = $request->user();
}

$initialEvent = InitialEventDTO::fromScratch(
userId: $user ? $user->getAuthIdentifier() : "",
userType: $user ? $mc['default_user_type'] : "",
app: !empty($mc['app_code_header']) ? $request->header($mc['app_code_header'], '') : ($config['app_code'] ?? ''),
entrypoint: $this->extractEntrypoint($request),
userId: $user ? $user->getAuthIdentifier() : "",
userType: $user ? $mc['default_user_type'] : "",
correlationId: !empty($mc['correlation_id_header']) ? $request->header($mc['correlation_id_header'], '') : '',
timestamp: !empty($mc['timestamp_header']) ? $request->header($mc['timestamp_header'], '') : ''
);
Expand Down