Fixes for legacy solid apps (poddit launcher in solid-nextcloud) #140
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Potherca
reviewed
Nov 20, 2023
| use Pdsinterop\Solid\Auth\Utils\Bearer; | ||
| use Pdsinterop\Solid\Auth\Utils\JtiValidator; | ||
|
|
||
| trait BearerFactoryTrait |
Potherca
reviewed
Nov 20, 2023
| @@ -304,13 +306,28 @@ public function handleRequest($userId, $path) { | |||
|
|
|||
| $dpop = $this->getDpop(); | |||
|
|
|||
| $error = false; | |||
There was a problem hiding this comment.
Error is set here (and below) but doesn't seem to be used anywhere?
Potherca
reviewed
Nov 20, 2023
| try { | ||
| $webId = $dpop->getWebId($request); | ||
| } catch(\Pdsinterop\Solid\Auth\Exception\Exception $e) { | ||
| $error = $e; |
There was a problem hiding this comment.
Not sure, think this might be more readable/understandable?
$error = false;
try {
$webId = $dpop->getWebId($request);
} catch(\Pdsinterop\Solid\Auth\Exception\Exception $e) {
$bearer = $this->getBearer();
try {
$webId = $bearer->getWebId($request);
} catch(\Pdsinterop\Solid\Auth\Exception\Exception $e) {
$error = $e;
}
}
if ($error instanceof \Pdsinterop\Solid\Auth\Exception\Exception) {
$response = $this->resourceServer->getResponse()
->withStatus(Http::STATUS_CONFLICT, "Invalid token");
return $this->respond($response);
}
Potherca
approved these changes
Nov 20, 2023
provide functions to list and remove client registrations
Potherca
approved these changes
Jan 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds fixes to get the poddit launcher working. Depends on pdsinterop/php-solid-auth#40