Skip to content

remove specific flow #214

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

Draft
ylebre wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

remove specific flow #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef26ac4
remove specific flow
ylebre Jun 28, 2025
e8d734a
enable debugging so we see more in the ci/cd run
ylebre Jun 28, 2025
563886a
add client_secret, check for array key
ylebre Jun 29, 2025
dd60cf2
empty commit for GHA weirdness
ylebre Jun 29, 2025
2072675
use isset
ylebre Jun 29, 2025
c180eb1
fix test by adding grant_type authorization_code
ylebre Jun 29, 2025
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
1 change: 1 addition & 0 deletions env-vars-testers.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ SERVER_ROOT_ESCAPED=https:\/\/server
SERVER_ROOT=https://server
STORAGE_ROOT=https://server/apps/solid/~alice/storage/
SKIP_CONC=1
DEBUG=*
12 changes: 6 additions & 6 deletions solid/lib/Controller/ServerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ private function createAuthServerConfig() {
if (isset($_GET['client_id'])) {
$clientId = $_GET['client_id'];
} else if (isset($_POST['client_id'])) {
if (isset($_POST['refresh_token'])) { // FIXME: Why does the test suite break without this?
$clientId = $_POST['client_id'];
}
$clientId = $_POST['client_id'];
}
$client = $this->getClient($clientId);
$keys = $this->getKeys();
Expand Down Expand Up @@ -323,17 +321,19 @@ public function session() {
*/
public function token() {
$request = \Laminas\Diactoros\ServerRequestFactory::fromGlobals($_SERVER, $_GET, $_POST, $_COOKIE, $_FILES);
$grantType = $request->getParsedBody()['grant_type'];
$requestBody = $request->getParsedBody();
$grantType = isset($requestBody['grant_type']) ? $requestBody['grant_type'] : null;
$clientId = isset($requestBody['client_id']) ? $requestBody['client_id'] : null;
switch ($grantType) {
case "authorization_code":
$code = $request->getParsedBody()['code'];
$code = $requestBody['code'];
// FIXME: not sure if decoding this here is the way to go.
// FIXME: because this is a public page, the nonce from the session is not available here.
$codeInfo = $this->tokenGenerator->getCodeInfo($code);
$userId = $codeInfo['user_id'];
break;
case "refresh_token":
$refreshToken = $request->getParsedBody()['refresh_token'];
$refreshToken = $requestBody['refresh_token'];
$tokenInfo = $this->tokenGenerator->getCodeInfo($refreshToken); // FIXME: getCodeInfo should be named 'decrypt' or 'getInfo'?
$userId = $tokenInfo['user_id'];
break;
Expand Down
2 changes: 2 additions & 0 deletions solid/tests/Unit/Controller/ServerControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ public function testRegisterWithRedirectUris()
'registration_client_uri' => '',
'response_types' => ['id_token token'],
'token_endpoint_auth_method' => 'client_secret_basic',
'client_secret' => '3b5798fddd49e23662ee6fe801085100',
],
'headers' => [
'Cache-Control' => 'no-cache, no-store, must-revalidate',
Expand All @@ -369,6 +370,7 @@ public function testToken()
{
$_POST['client_id'] = self::MOCK_CLIENT_ID;
$_POST['code'] = '';
$_POST['grant_type'] = 'authorization_code';
$_SERVER['HTTP_DPOP'] = 'mock dpop';
$_SESSION['nonce'] = 'mock nonce';

Expand Down
Loading