libre.sh/scim-server-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix technical endpoints bug & mozart dependency

Browse source 
Also fix linter issues
This commit is contained in:
Julien Schneider 2023-01-26 17:23:23 +01:00
parent b509a277d5
commit 43c0cf0e7a
6 changed files with 639 additions and 910 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -29,7 +29,7 @@ lint:
composer install --prefer-dist composer install --prefer-dist
# Lint with CodeSniffer # Lint with CodeSniffer
vendor/bin/phpcs --standard=phpcs.xml src/ vendor/bin/phpcs --standard=phpcs.xml src/ --ignore=src/Vendor
.PHONY: api_test .PHONY: api_test
api_test: api_test:

6
composer.json
View file

@ -11,7 +11,8 @@
"ramsey/uuid": "^4.2", "ramsey/uuid": "^4.2",
"slim/psr7": "^1.5", "slim/psr7": "^1.5",
"php-di/php-di": "^6.3", "php-di/php-di": "^6.3",
"firebase/php-jwt": "^6.3" "firebase/php-jwt": "^6.3",
"coenjacobs/mozart": "^0.7.1"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -36,8 +37,7 @@
], ],
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.6", "squizlabs/php_codesniffer": "^3.6"
"coenjacobs/mozart": "^0.7.1"
}, },
"extra": { "extra": {
"mozart": { "mozart": {

1533
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
src/Util/Authentication/SimpleBearerAuthenticator.php
View file

@ -15,7 +15,7 @@ class SimpleBearerAuthenticator implements AuthenticatorInterface
public function __construct(ContainerInterface $container) public function __construct(ContainerInterface $container)
{ {
$this->logger = $container->get(\Monolog\Logger::class); $this->logger = $container->get(\Monolog\Logger::class);
} }
public function authenticate(string $credentials, array $authorizationInfo): bool public function authenticate(string $credentials, array $authorizationInfo): bool

2
src/Util/Filters/FilterParser.php
View file

@ -29,7 +29,7 @@ class FilterParser
if (!isset($splitAttributePathFromFilterExpression[1]) || empty($splitAttributePathFromFilterExpression[1])) { if (!isset($splitAttributePathFromFilterExpression[1]) || empty($splitAttributePathFromFilterExpression[1])) {
throw new FilterException("Incorrectly formatted AttributeExpression"); throw new FilterException("Incorrectly formatted AttributeExpression");
} else if (strcmp($splitAttributePathFromFilterExpression[1], "pr") === 0) { } elseif (strcmp($splitAttributePathFromFilterExpression[1], "pr") === 0) {
$attributeExpression = new AttributeExpression( $attributeExpression = new AttributeExpression(
$splitAttributePathFromFilterExpression[0], // The attribute path $splitAttributePathFromFilterExpression[0], // The attribute path
"pr", // The comparison operator (which must be "pr" in this case) "pr", // The comparison operator (which must be "pr" in this case)

4
src/Util/Util.php
View file

@ -10,7 +10,7 @@ use PDO;
abstract class Util abstract class Util
{ {
private static string $defaultConfigFilePath = __DIR__ . '/../../config/config.default.php'; private static string $defaultConfigFilePath = __DIR__ . '/../../config/config.default.php';
private static string $customConfigFilePath; private static string $customConfigFilePath = '';
public const USER_SCHEMA = "urn:ietf:params:scim:schemas:core:2.0:User"; public const USER_SCHEMA = "urn:ietf:params:scim:schemas:core:2.0:User";
public const ENTERPRISE_USER_SCHEMA = "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User"; public const ENTERPRISE_USER_SCHEMA = "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User";
@ -353,6 +353,6 @@ abstract class Util
return null; return null;
} }
return $scimServiceProviderConfigurationFile; return json_decode($scimServiceProviderConfigurationFile);
} }
} }