Skip to content

Fix sail port #68

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix sail port #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f49d770
Initial comit
Jun 6, 2023
f003757
Add a serverPort optional configuration to get the Lib working behind…
Jun 6, 2023
d3bc6eb
Merge branch '24Slides:master' into fixSailPort
Nov 1, 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
12 changes: 12 additions & 0 deletions config/saml2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@

'proxyVars' => false,

/*
|--------------------------------------------------------------------------
| Whether to force the server self port
|--------------------------------------------------------------------------
|
| If 'serverPort' is setted will get this one - Good in case your Laravel
| application is behind a docker container using another port.
|
*/

'serverPort' => env('APP_PORT'),

/*
|--------------------------------------------------------------------------
| Service Provider configuration.
Expand Down
1 change: 0 additions & 1 deletion src/Http/Controllers/Saml2Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public function metadata(Auth $auth)
public function acs(Auth $auth)
{
$errors = $auth->acs();

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't relevant to the PR.

if (!empty($errors)) {
$error = $auth->getLastErrorReason();
$uuid = $auth->getTenant()->uuid;
Expand Down
4 changes: 4 additions & 0 deletions src/OneLoginBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ public function bootstrap()
OneLoginUtils::setProxyVars(true);
}

if ($this->app['config']->get('saml2.serverPort')) {
OneLoginUtils::setSelfPort($this->app['config']->get('saml2.serverPort'));
}

$this->app->singleton('OneLogin_Saml2_Auth', function ($app) {
$config = $app['config']['saml2'];

Expand Down