Merge pull request #29 from pdsinterop/solid-oidc-tests

Improvements from solid-oidc-tests

Author: michielbdejong

src/Config/Server.php

@@ -63,9 +63,12 @@ final public function __construct(array $data, bool $strict = false)
 			OidcMeta::GRANT_TYPES_SUPPORTED => array("authorization_code","implicit","refresh_token","client_credentials"),
 			OidcMeta::TOKEN_ENDPOINT_AUTH_METHODS_SUPPORTED => "client_secret_basic",
 			OidcMeta::TOKEN_ENDPOINT_AUTH_SIGNING_ALG_VALUES_SUPPORTED => ["RS256"],
+			OidcMeta::CODE_CHALLENGE_METHODS_SUPPORTED => ["S256"],
+			OidcMeta::DPOP_SIGNING_ALG_VALUES_SUPPORTED => ["RS256"],
 			OidcMeta::DISPLAY_VALUES_SUPPORTED => [],
 			OidcMeta::CLAIM_TYPES_SUPPORTED => ["normal"],
-			OidcMeta::CLAIMS_SUPPORTED => [],
+			OidcMeta::CLAIMS_SUPPORTED => ["webid"],
+			OidcMeta::SCOPES_SUPPORTED => ["webid"],
 			OidcMeta::CLAIMS_PARAMETER_SUPPORTED => false,
 			OidcMeta::REQUEST_PARAMETER_SUPPORTED => true,
 			OidcMeta::REQUEST_URI_PARAMETER_SUPPORTED => false,

src/Enum/OpenId/OpenIdConnectMetadata.php

@@ -45,6 +45,20 @@ class OpenIdConnectMetadata extends AbstractEnum
      */
     public const CLAIMS_SUPPORTED = 'claims_supported';
 
+    /**
+     * JSON array containing a list of the Code challenge methods supported.
+     *
+     * @recommended
+     */
+    public const CODE_CHALLENGE_METHODS_SUPPORTED = 'code_challenge_methods_supported';
+
+    /**
+     * JSON array containing a list of the JWS alg values supported by the authorization server for DPoP proof JWTs.
+     *
+     * @recommended
+     */
+    public const DPOP_SIGNING_ALG_VALUES_SUPPORTED = 'dpop_signing_alg_values_supported';
+
     /**
      * JSON array containing a list of the display parameter values that the OpenID Provider supports. These values are described in Section 3.1.2.1 of OpenID Connect Core 1.0 [OpenID.Core].
      */

tests/unit/Config/ServerTest.php

@@ -112,11 +112,14 @@ final public function testServerConfigShouldReturnExpectedValuesWhenSerializedWi
             'token_endpoint_auth_signing_alg_values_supported' => ['RS256'],
             'display_values_supported' => [],
             'claim_types_supported' => ['normal'],
-            'claims_supported' => [],
+            'claims_supported' => ['webid'],
             'claims_parameter_supported' => false,
             'request_parameter_supported' => true,
             'request_uri_parameter_supported' => false,
-            'require_request_uri_registration' => false
+            'require_request_uri_registration' => false,
+            'code_challenge_methods_supported' => ['S256'],
+            'dpop_signing_alg_values_supported' => ['RS256'],
+            'scopes_supported' => ['webid']
         ], $actual);
     }
 }

tests/unit/Enum/OpenId/OpenIdConnectMetadataTest.php

@@ -23,6 +23,8 @@ final public function getExpectedValues() : array
             'claims_locales_supported',
             'claims_parameter_supported',
             'claims_supported',
+            'code_challenge_methods_supported',
+            'dpop_signing_alg_values_supported',
             'display_values_supported',
             'grant_types_supported',
             'id_token_encryption_alg_values_supported',