Merge pull request #151 from gigya/develop

1.8.3
gigya · Aug 8, 2024 · c0c1036 · c0c1036
2 parents 675cdb8 + f802b9c
commit c0c1036
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/gigya_raas/src/Form/GigyaFieldmappingForm.php b/gigya_raas/src/Form/GigyaFieldmappingForm.php
@@ -140,6 +140,9 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
       if ($this->jsonFormValidation($fieldmapping_config) !== TRUE) {
         $form_state->setErrorByName('fieldmapping', $this->t($this->jsonFormValidation($fieldmapping_config)));
       }
+      if (is_array(json_decode($fieldmapping_config)) and !empty(json_decode($fieldmapping_config))) {
+        $form_state->setErrorByName('fieldmapping', $this->t('The field mapping configuration cannot be an array. Please follow the <a href="@documentation"><u>documentation</u></a>', ['@documentation.' => 'https://github.com/gigya/drupal8/wiki#field-mapping']));
+      }
 
       /* Offline sync */
 

diff --git a/gigya_raas/src/Helper/GigyaRaasHelper.php b/gigya_raas/src/Helper/GigyaRaasHelper.php
@@ -178,10 +178,11 @@ public function checkProfileEmail($profile_email, $loginIds) {
    */
   public function getFieldMappingConfig() {
     $config = json_decode(\Drupal::config('gigya_raas.fieldmapping')
-                                 ->get('gigya.fieldmapping_config') ?? '');
+      ->get('gigya.fieldmapping_config') ?? '');
+
     if (empty($config) or empty(get_object_vars($config))) {
       $config = (object) \Drupal::config('gigya.global')
-                                ->get('gigya.fieldMapping');
+        ->get('gigya.fieldMapping');
     }
 
     return $config;