Skip to content

Added nested array handling #3

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

Open
victorvanderhulst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added nested array handling #3

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
87 changes: 79 additions & 8 deletions src/credentialIssue/render.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@
session_start();
}

// Helper: get a value from a nested array using a path like "credentialSubject.given_name"
if (!function_exists('getByPath')) {
function getByPath(array $arr, string $path, string $separators = './') {
// Split on "." or "/"
$parts = preg_split('/[' . preg_quote($separators, '/') . ']+/', $path, -1, PREG_SPLIT_NO_EMPTY);
if (!$parts) {
return null;
}

$ref = $arr;
foreach ($parts as $p) {
if (!is_array($ref) || !array_key_exists($p, $ref)) {
return null;
}
$ref = $ref[$p];
}
return $ref;
}
}

// Helper: zet $value op een genest pad (bijv. "phone.value" of "email/value")
if (!function_exists('setByPath')) {
function setByPath(array &$arr, string $path, $value, string $separators='./'): void {
Expand Down Expand Up @@ -66,13 +86,17 @@ function setByPath(array &$arr, string $path, $value, string $separators='./'):
$type = $item->type;
$mapping = $item->mapping;

if (isset($presentationResponse[$type]['claims'][$mapping])) {
$val = $presentationResponse[$type]['claims'][$mapping];
// Read from the PID claims using the mapping as a nested path
$val = null;
if (isset($presentationResponse[$type]['claims']) && is_array($presentationResponse[$type]['claims'])) {
$val = getByPath($presentationResponse[$type]['claims'], (string) $mapping);
}

// Schrijf DIRECT in $claims op het geneste pad (overschrijft alleen die leaf)
setByPath($claims, (string)$item->key, $val);
if ($val !== null) {
// Write into the new credential using "key" as a nested path
setByPath($claims, (string) $item->key, $val);
}

}
}
} else {
echo $block_content = '<div ' . get_block_wrapper_attributes() . '><p>Er kunnen geen credentials opgehaald worden.</p></div>';
Expand Down Expand Up @@ -109,11 +133,48 @@ function setByPath(array &$arr, string $path, $value, string $separators='./'):
}

if(isset($_GET['qrrequest'])){
foreach($_GET as $name => $value) {
if($name !== 'qrrequest'){
$claims[$name] = $value;

// Extract the original form keys defined in the block attributes.
// These may contain dots or slashes (e.g. "credentialSubject.given_name").
// PHP automatically converts dots in form field names to underscores
// when populating $_GET and $_POST. Therefore, we need the original keys
// to map the "mangled" PHP keys back to the intended nested structure.
$originalFormKeys = [];
if (isset($attributes['formData']) && !empty($attributes['formData'])) {
$decodedForm = json_decode($attributes['formData']);
if ($decodedForm && (is_object($decodedForm) || is_array($decodedForm))) {
foreach ($decodedForm as $k => $label) {
$originalFormKeys[] = (string) $k; // Example: "credentialSubject.given_name"
}
}
}

foreach ($_GET as $name => $value) {
if ($name === 'qrrequest') {
continue;
}

$originalKey = $name;

// Try to find the original key:
foreach ($originalFormKeys as $formKey) {
// Exact match
if ($formKey === $name) {
$originalKey = $formKey;
break;
}

// Dots or slashes replaced by underscores
if (str_replace(['.', '/'], '_', $formKey) === $name) {
$originalKey = $formKey;
break;
}
}

// Write the submitted value into $claims using the *intended* nested path.
setByPath($claims, $originalKey, $value);
}

$response = sendVciRequest($claims, $attributes);

if ($response["success"] === false) {
Expand All @@ -122,6 +183,16 @@ function setByPath(array &$arr, string $path, $value, string $separators='./'):
}
do_action( 'wp_enqueue_script' );

if ( isset( $response['result']->credential ) ) {
error_log( '[openid4vci] SD-JWT credential response: ' . wp_json_encode( $response['result']->credential ) );
} else {
error_log( '[openid4vci] Credential response zonder sd-jwt veld: ' . wp_json_encode( $response['result'] ) );
}
if ( isset( $response['result']->credential ) ) {
error_log( '[openid4vci] SD-JWT credential response: ' . wp_json_encode( $response['result']->credential ) );
} else {
error_log( '[openid4vci] Credential response zonder sd-jwt veld: ' . wp_json_encode( $response['result'] ) );
}
$qr_content = $attributes['qrCodeEnabled'] ? '<img id="openid4vp_qrImage" src="data:' . $response["result"]->qr_uri . '"></>'. __( 'or ', 'fides' ) : '';
$block_content = '<div ' . get_block_wrapper_attributes() . '>' . $qr_content . __( 'click ', 'fides' ) . '<a href="' . $response["result"]->request_uri . '">link</a></div>';
} elseif($form){
Expand Down