Skip to content

Fixes to get to dokieli compatiblity #34

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

Merged
ylebre merged 6 commits into from
Jun 23, 2026
Merged

Fixes to get to dokieli compatiblity #34

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4af346c
update php-solid-auth to implement rfc-9207
ylebre Jun 12, 2026
a0ea40c
persist remote client document registrations
ylebre Jun 22, 2026
3506c69
only add id_token when asked
ylebre Jun 22, 2026
c03a18a
return bad request when jti is invalid
ylebre Jun 22, 2026
66e4a28
Update solid-auth dependency to v0.14.1
Potherca Jun 23, 2026
2a6230a
use rtrim instead of preg
ylebre Jun 23, 2026
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"pdsinterop/solid-auth": "v0.13.0",
"pdsinterop/solid-auth": "v0.14.1",
"pdsinterop/solid-crud": "v0.8.3",
"phpmailer/phpmailer": "^6.10",
"sweetrdf/easyrdf": "~1.15.0",
Expand Down
12 changes: 8 additions & 4 deletions lib/ClientRegistration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@

class ClientRegistration {
public static function getRegistration($clientId) {
if (preg_match("/^http(s)?:/", $clientId)) {
return self::getRemoteRegistration($clientId);
}

Db::connect();
$query = Db::$pdo->prepare(
'SELECT clientData FROM clients WHERE clientId=:clientId'
Expand All @@ -20,6 +16,14 @@ public static function getRegistration($clientId) {
if (sizeof($result) === 1) {
return json_decode($result[0]['clientData'], true);
}
if (preg_match("/^http(s)?:/", $clientId)) {
$clientData = self::getRemoteRegistration($clientId);
if (!isset($clientData['origin']) && isset($clientData['client_uri'])) {
$clientData['origin'] = preg_replace("/\/$/", "", $clientData['client_uri']);
Comment thread
ylebre marked this conversation as resolved.
Outdated
}
self::saveClientRegistration($clientData);
return $clientData;
}
return false;
}

Expand Down
18 changes: 10 additions & 8 deletions lib/Routes/SolidIdp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,17 @@ public static function respondToAuthorize() {

$response = $authServer->respondToAuthorizationRequest($request, $user, $approval);

$tokenGenerator = Server::getTokenGenerator();
if (in_array("id_token", $requestedResponseTypes)) {
$tokenGenerator = Server::getTokenGenerator();

$response = $tokenGenerator->addIdTokenToResponse(
$response,
$clientId,
$webId,
$_SESSION['nonce'] ?? '',
Server::getKeys()["privateKey"]
);
$response = $tokenGenerator->addIdTokenToResponse(
$response,
$clientId,
$webId,
$_SESSION['nonce'] ?? '',
Server::getKeys()["privateKey"]
);
}

Server::respond($response);
}
Expand Down
9 changes: 8 additions & 1 deletion lib/Routes/SolidStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@ public static function respondToStorage() {
$resourceServer->setBaseUrl($baseUrl);
$wac->setBaseUrl($baseUrl);

$webId = StorageServer::getWebId($rawRequest);
try {
$webId = StorageServer::getWebId($rawRequest);
} catch(\Exception $e) {
$response = $resourceServer->getResponse()
-> withStatus(400, "Bad request");
StorageServer::respond($response);
exit();
}

if (!isset($webId)) {
$response = $resourceServer->getResponse()
Expand Down
Loading