@@ -159,8 +159,8 @@ discard block |
||
| 159 | 159 | | |
| 160 | 160 | */ |
| 161 | 161 | |
| 162 | - 'x509cert' => env('SAML2_SP_CERT_x509',''), |
|
| 163 | - 'privateKey' => env('SAML2_SP_CERT_PRIVATEKEY',''), |
|
| 162 | + 'x509cert' => env('SAML2_SP_CERT_x509', ''), |
|
| 163 | + 'privateKey' => env('SAML2_SP_CERT_PRIVATEKEY', ''), |
|
| 164 | 164 | |
| 165 | 165 | /* |
| 166 | 166 | |-------------------------------------------------------------------------- |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | | |
| 172 | 172 | */ |
| 173 | 173 | |
| 174 | - 'entityId' => env('SAML2_SP_ENTITYID',''), |
|
| 174 | + 'entityId' => env('SAML2_SP_ENTITYID', ''), |
|
| 175 | 175 | |
| 176 | 176 | /* |
| 177 | 177 | |-------------------------------------------------------------------------- |
@@ -108,11 +108,11 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function parseUserAttribute($samlAttribute = null, $propertyName = null) |
| 110 | 110 | { |
| 111 | - if(empty($samlAttribute)) { |
|
| 111 | + if (empty($samlAttribute)) { |
|
| 112 | 112 | return null; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - if(empty($propertyName)) { |
|
| 115 | + if (empty($propertyName)) { |
|
| 116 | 116 | return $this->getAttribute($samlAttribute); |
| 117 | 117 | } |
| 118 | 118 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | public function parseAttributes($attributes = []) |
| 130 | 130 | { |
| 131 | - foreach($attributes as $propertyName => $samlAttribute) { |
|
| 131 | + foreach ($attributes as $propertyName => $samlAttribute) { |
|
| 132 | 132 | $this->parseUserAttribute($samlAttribute, $propertyName); |
| 133 | 133 | } |
| 134 | 134 | } |
@@ -156,7 +156,7 @@ |
||
| 156 | 156 | */ |
| 157 | 157 | public function sls($retrieveParametersFromServer = false) |
| 158 | 158 | { |
| 159 | - $this->base->processSLO(false, null, $retrieveParametersFromServer, function () { |
|
| 159 | + $this->base->processSLO(false, null, $retrieveParametersFromServer, function() { |
|
| 160 | 160 | event(new SignedOut()); |
| 161 | 161 | }); |
| 162 | 162 | |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | */ |
| 25 | 25 | public static function stringToArray(string $string = null, string $valueDelimiter = ':', string $itemDelimiter = ',') |
| 26 | 26 | { |
| 27 | - if(is_null($string)) { |
|
| 27 | + if (is_null($string)) { |
|
| 28 | 28 | return []; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $key = Arr::get($item, 0); |
| 38 | 38 | $value = Arr::get($item, 1); |
| 39 | 39 | |
| 40 | - if(is_null($value)) { |
|
| 40 | + if (is_null($value)) { |
|
| 41 | 41 | $value = $key; |
| 42 | 42 | $key = $index; |
| 43 | 43 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $values = []; |
| 64 | 64 | |
| 65 | 65 | foreach ($array as $key => $value) { |
| 66 | - if(is_array($value)) { |
|
| 66 | + if (is_array($value)) { |
|
| 67 | 67 | continue; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | $target = \Illuminate\Support\Facades\URL::to($path, $parameters, $secure); |
| 18 | 18 | |
| 19 | - if(!$uuid) { |
|
| 20 | - if(!$uuid = saml_tenant_uuid()) { |
|
| 19 | + if (!$uuid) { |
|
| 20 | + if (!$uuid = saml_tenant_uuid()) { |
|
| 21 | 21 | return $target; |
| 22 | 22 | } |
| 23 | 23 | } |
@@ -41,8 +41,8 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $target = \Illuminate\Support\Facades\URL::route($name, $parameters, true); |
| 43 | 43 | |
| 44 | - if(!$uuid) { |
|
| 45 | - if(!$uuid = saml_tenant_uuid()) { |
|
| 44 | + if (!$uuid) { |
|
| 45 | + if (!$uuid = saml_tenant_uuid()) { |
|
| 46 | 46 | return $target; |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | OneLoginUtils::setProxyVars(true); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - $this->app->singleton('OneLogin_Saml2_Auth', function ($app) { |
|
| 68 | + $this->app->singleton('OneLogin_Saml2_Auth', function($app) { |
|
| 69 | 69 | $config = $app['config']['saml2']; |
| 70 | 70 | |
| 71 | 71 | $this->setConfigDefaultValues($config); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | return new OneLoginAuth($oneLoginConfig); |
| 82 | 82 | }); |
| 83 | 83 | |
| 84 | - $this->app->singleton('Slides\Saml2\Auth', function ($app) { |
|
| 84 | + $this->app->singleton('Slides\Saml2\Auth', function($app) { |
|
| 85 | 85 | return new \Slides\Saml2\Auth($app['OneLogin_Saml2_Auth'], $this->tenant); |
| 86 | 86 | }); |
| 87 | 87 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | protected function setConfigDefaultValues(array &$config) |
| 97 | 97 | { |
| 98 | 98 | foreach ($this->configDefaultValues() as $key => $default) { |
| 99 | - if(!Arr::get($config, $key)) { |
|
| 99 | + if (!Arr::get($config, $key)) { |
|
| 100 | 100 | Arr::set($config, $key, $default); |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | protected function bootRoutes() |
| 39 | 39 | { |
| 40 | - if($this->app['config']['saml2.useRoutes'] == true) { |
|
| 40 | + if ($this->app['config']['saml2.useRoutes'] == true) { |
|
| 41 | 41 | include __DIR__ . '/Http/routes.php'; |
| 42 | 42 | } |
| 43 | 43 | } |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | { |
| 23 | 23 | $query = Tenant::query(); |
| 24 | 24 | |
| 25 | - if($withTrashed) { |
|
| 25 | + if ($withTrashed) { |
|
| 26 | 26 | $query->withTrashed(); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function handle($request, \Closure $next) |
| 50 | 50 | { |
| 51 | - if(!$tenant = $this->resolveTenant($request)) { |
|
| 51 | + if (!$tenant = $this->resolveTenant($request)) { |
|
| 52 | 52 | throw new NotFoundHttpException(); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | protected function resolveTenant($request) |
| 78 | 78 | { |
| 79 | - if(!$uuid = $request->route('uuid')) { |
|
| 79 | + if (!$uuid = $request->route('uuid')) { |
|
| 80 | 80 | Log::debug('[Saml2] Tenant UUID is not present in the URL so cannot be resolved', [ |
| 81 | 81 | 'url' => $request->fullUrl() |
| 82 | 82 | ]); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | return null; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if(!$tenant = $this->tenants->findByUUID($uuid)) { |
|
| 87 | + if (!$tenant = $this->tenants->findByUUID($uuid)) { |
|
| 88 | 88 | Log::debug('[Saml2] Tenant doesn\'t exist', [ |
| 89 | 89 | 'uuid' => $uuid |
| 90 | 90 | ]); |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | return null; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - if($tenant->trashed()) { |
|
| 96 | - Log::debug('[Saml2] Tenant #' . $tenant->id. ' resolved but marked as deleted', [ |
|
| 95 | + if ($tenant->trashed()) { |
|
| 96 | + Log::debug('[Saml2] Tenant #' . $tenant->id . ' resolved but marked as deleted', [ |
|
| 97 | 97 | 'id' => $tenant->id, |
| 98 | 98 | 'uuid' => $uuid, |
| 99 | 99 | 'deleted_at' => $tenant->deleted_at->toDateTimeString() |