Merge branch 'development' of github.com:BookStackApp/BookStack into development

ssddanbrown · ssddanbrown · commit 90c543064b11 · 2022-01-30T17:41:16.000Z
diff --git a/app/Auth/Access/Oidc/OidcProviderSettings.php b/app/Auth/Access/Oidc/OidcProviderSettings.php
@@ -165,6 +165,7 @@ protected function filterKeys(array $keys): array
     {
         return array_filter($keys, function (array $key) {
             $alg = $key['alg'] ?? null;
+
             return $key['kty'] === 'RSA' && $key['use'] === 'sig' && (is_null($alg) || $alg === 'RS256');
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ protected function filterKeys(array $keys): array`
`165`	`165`	`{`
`166`	`166`	`return array_filter($keys, function (array $key) {`
`167`	`167`	`$alg = $key['alg'] ?? null;`
	`168`	`+`
`168`	`169`	`return $key['kty'] === 'RSA' && $key['use'] === 'sig' && (is_null($alg) \|\| $alg === 'RS256');`
`169`	`170`	`});`
`170`	`171`	`}`