Skip to content

Commit 8d179f6

Browse files
committed
fix: Set blank fields if family_name, given_name or upm_classif_codes missing for institutional accounts
1 parent 1bd54c5 commit 8d179f6

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

OpenID.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@ private function _user_from_claim(array $claim): WP_User
338338
'user_email' => $claim[$this->user_mapping['user_email']] ?? $claim['email'],
339339
'meta_input' => [
340340
'openid_id' => $claim['sub'],
341-
'upm_classif_codes' => implode(', ', $claim['upmClassifCode']) ?? '',
342-
'given_name' => $claim['given_name'],
343-
'family_name' => $claim['family_name'],
341+
'upm_classif_codes' => isset($claim['upmClassifCode']) ? implode(', ', $claim['upmClassifCode']) : '',
342+
'given_name' => $claim['given_name'] ?? '',
343+
'family_name' => $claim['family_name'] ?? '',
344344
],
345345
];
346346

@@ -368,9 +368,9 @@ private function _user_from_claim(array $claim): WP_User
368368
if ($user) {
369369
// Update user meta
370370
update_user_meta($user->ID, 'openid_id', $claim['sub']);
371-
update_user_meta($user->ID, 'upm_classif_codes', implode(', ', $claim['upmClassifCode']) ?? '');
372-
update_user_meta($user->ID, 'given_name', $claim['given_name']);
373-
update_user_meta($user->ID, 'family_name', $claim['family_name']);
371+
update_user_meta($user->ID, 'upm_classif_codes', isset($claim['upmClassifCode']) ? implode(', ', $claim['upmClassifCode']) : '');
372+
update_user_meta($user->ID, 'given_name', $claim['given_name'] ?? '');
373+
update_user_meta($user->ID, 'family_name', $claim['family_name'] ?? '');
374374

375375
// Update additional fields if they exist in the claim
376376
foreach ($this->user_mapping as $key => $value) {
@@ -395,9 +395,9 @@ private function _user_from_claim(array $claim): WP_User
395395
if ($user) {
396396
// Update user meta
397397
update_user_meta($user->ID, 'openid_id', $claim['sub']);
398-
update_user_meta($user->ID, 'upm_classif_codes', implode(', ', $claim['upmClassifCode']) ?? '');
399-
update_user_meta($user->ID, 'given_name', $claim['given_name']);
400-
update_user_meta($user->ID, 'family_name', $claim['family_name']);
398+
update_user_meta($user->ID, 'upm_classif_codes', isset($claim['upmClassifCode']) ? implode(', ', $claim['upmClassifCode']) : '');
399+
update_user_meta($user->ID, 'given_name', $claim['given_name'] ?? '');
400+
update_user_meta($user->ID, 'family_name', $claim['family_name'] ?? '');
401401

402402
// Update additional fields if they exist in the claim
403403
foreach ($this->user_mapping as $key => $value) {
@@ -423,9 +423,9 @@ private function _user_from_claim(array $claim): WP_User
423423
'role' => $this->default_role,
424424
'meta_input' => [
425425
'openid_id' => $claim['sub'],
426-
'upm_classif_codes' => implode(', ', $claim['upmClassifCode']) ?? '',
427-
'given_name' => $claim['given_name'],
428-
'family_name' => $claim['family_name'],
426+
'upm_classif_codes' => isset($claim['upmClassifCode']) ? implode(', ', $claim['upmClassifCode']) : '',
427+
'given_name' => $claim['given_name'] ?? '',
428+
'family_name' => $claim['family_name'] ?? '',
429429
],
430430
];
431431

0 commit comments

Comments
 (0)