Skip to content

Ignore OPTIONS request to validate with JWT #1796

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
jessevz merged 1 commit into from
Dec 1, 2025
Merged

Ignore OPTIONS request to validate with JWT #1796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/api/v2/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
use DBA\User;
use DBA\Factory;
use JimTools\JwtAuth\Handlers\BeforeHandlerInterface;
use JimTools\JwtAuth\Rules\RequestMethodRule;
use JimTools\JwtAuth\Rules\RequestPathRule;
use Psr\Http\Message\ServerRequestInterface;

Expand Down Expand Up @@ -152,7 +153,8 @@ public function get($key): string {
);

$rules = [
new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"])
new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"]),
new RequestMethodRule(ignore: ["OPTIONS"])
];
return new JwtAuthentication($options, $decoder, $rules);
});
Expand Down Expand Up @@ -207,9 +209,10 @@ public static function addCORSheaders(Request $request, $response) {
$methods = $routingResults->getAllowedMethods();
$requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers');

if (getenv('HASHTOPOLIS_FRONTEND_URLS') !== false) {
if(in_array($request->getHeaderLine('HTTP_ORIGIN'), explode(',', getenv('HASHTOPOLIS_FRONTEND_URLS')), true)) {
$response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN'));
$frontend_urls = getenv('HASHTOPOLIS_FRONTEND_URLS');
if ($frontend_urls !== false) {
if(in_array($request->getHeaderLine('Origin'), explode(',', $frontend_urls), true)) {
$response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin'));
}
else {
error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file.");
Expand Down