d_s_bisht/devsofttech_hms_ci4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(abdm): allow Bearer auth fallback and safe getJSON parsing in recordsDiscover

Browse Source
This commit is contained in:
DevSoftTech Server 2026-09-23 15:21:56 +05:30
parent 3f1e89d4be
commit 0d71ce5ee4
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controllers/AbdmGateway.php
View File

@ -4608,9 +4608,14 @@ class AbdmGateway extends BaseController
return $this->response->setJSON(['ok' => 1, 'careContexts' => [], 'count' => 0]);
}
$payload = $this->request->getJSON(true);
try {
$payload = $this->request->getJSON(true);
} catch (\Throwable) {
$payload = null;
}
if (! is_array($payload)) {
$payload = [];
$raw = (string) $this->request->getBody();
$payload = json_decode($raw, true) ?? [];
}
$requestId = trim((string) ($payload['requestId'] ?? $payload['request_id'] ?? $this->request->getHeaderLine('X-Request-Id')));
@ -5364,10 +5369,13 @@ class AbdmGateway extends BaseController
if (hash_equals($expected, $sigLower)) {
return null;
}
return $this->response->setStatusCode(401)->setJSON([
'ok' => 0,
'error_text' => 'Invalid webhook signature',
]);
// If signature failed but Authorization Bearer header is present, fall through to Bearer check
if (trim((string) $this->request->getHeaderLine('Authorization')) === '') {
return $this->response->setStatusCode(401)->setJSON([
'ok' => 0,
'error_text' => 'Invalid webhook signature',
]);
}
}
// 2. If Authorization header is present, validate Bearer token