Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions ProcessMaker/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function showLoginForm(Request $request)
true,
true,
false,
'none'
$this->sessionSameSite()
);

// Redirect to SSO and attach the cookie
Expand All @@ -111,7 +111,7 @@ public function showLoginForm(Request $request)
true,
true,
false,
'none'
$this->sessionSameSite()
);
$loginView = empty(config('app.login_view')) ? 'auth.login' : config('app.login_view');
$response = response(view($loginView, compact('addons', 'block')));
Expand Down Expand Up @@ -358,7 +358,7 @@ public function login(Request $request, User $user)
true,
true,
false,
'none',
$this->sessionSameSite(),
);

return redirect()->route('password.change');
Expand Down Expand Up @@ -406,4 +406,9 @@ private function setupLanguage(Request $request, User $user)
$user->save();
}
}

private function sessionSameSite(): string
{
return config('session.same_site') ?: 'lax';
}
}
12 changes: 11 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,17 @@ public function updateVariable(HttpRequest $request, $abe_uuid)
// Review if the autentication is required
if ($abe->require_login && Auth::user()->username === AnonymousUser::ANONYMOUS_USERNAME) {
$request->session()->put('url.intended', url()->full());
$cookie = cookie('processmaker_intended', url()->full(), 10, '/');
$cookie = cookie(
'processmaker_intended',
url()->full(),
10,
'/',
null,
true,
true,
false,
config('session.same_site') ?: 'lax'
);

return redirect('login')->withCookie($cookie);
}
Expand Down
Loading