Merge remote-tracking branch 'origin/develop' into 140588_field_mapping_validation

shaharzillber · shaharzillber · commit 5ca9fd850d5f · 2021-05-10T11:05:03.000+03:00
# Conflicts:
#	admin/admin.GigyaSettings.php
diff --git a/admin/admin.GigyaSettings.php b/admin/admin.GigyaSettings.php
@@ -29,7 +29,6 @@ public function __construct() {
 		wp_enqueue_script( 'gigya_admin_js', GIGYA__PLUGIN_URL . 'admin/gigya_admin.js' );
 		wp_enqueue_script( 'gigya_jsonlint_js', GIGYA__PLUGIN_URL . 'admin/jsonlint.js' );
 
-
 		// Actions.
 		add_action( 'admin_init', array( $this, 'adminInit' ) );
 		add_action( 'admin_menu', array( $this, 'adminMenu' ) );
@@ -534,28 +533,28 @@ public static function fieldsMappingWarningsBuilder( $case_str, $fields, $soluti
 	 * Set the POSTed secret key.
 	 * If it's not submitted, take it from DB.
 	 *
-	 * @param string $field The obfuscated field
+	 * @param string $field	The obfuscated field
 	 *
 	 * @return bool
 	 */
 	private static function _setObfuscatedField( $field ) {
-		if ( empty( $_POST['gigya_global_settings'][ $field ] ) ) {
+		if ( empty( $_POST['gigya_global_settings'][$field] ) ) {
 			$options = static::_getSiteOptions();
 			if ( $options === false ) {
 				return false;
 			}
 
-			$_POST['gigya_global_settings'][ $field ] = $options[ $field ];
+			$_POST['gigya_global_settings'][$field] = $options[$field];
 		} else {
-			$_POST['gigya_global_settings'][ $field ] = GigyaApiHelper::encrypt( $_POST['gigya_global_settings'][ $field ], SECURE_AUTH_KEY );
+			$_POST['gigya_global_settings'][$field] = GigyaApiHelper::encrypt( $_POST['gigya_global_settings'][$field], SECURE_AUTH_KEY );
 		}
 
 		return true;
 	}
 
 	private static function setError( $errorCode, $errorMessage, $callId = null ) {
-		$errorLink = "<a href='https://developers.gigya.com/display/GD/Response+Codes+and+Errors+REST' target='_blank' rel='noopener noreferrer'>Response_Codes_and_Errors</a>";
-		$message   = "SAP CDC API error: {$errorCode} - {$errorMessage}.";
+		$errorLink  = "<a href='https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/416d41b170b21014bbc5a10ce4041860.html' target='_blank' rel='noopener noreferrer'>Response_Codes_and_Errors</a>";
+		$message     = "SAP CDC API error: {$errorCode} - {$errorMessage}.";
 		add_settings_error( 'gigya_global_settings', 'api_validate', __( $message . " For more information please refer to {$errorLink}", 'error' ) );
 		error_log( 'Error updating SAP CDC settings: ' . $message . ' Call ID: ' . $callId );
 	}
diff --git a/admin/forms/fieldMappingForm.php b/admin/forms/fieldMappingForm.php
@@ -9,7 +9,7 @@ function fieldMappingForm() {
 
 		if ( $login_options['mode'] == 'raas' ) {
 			$form['map_fieldmapping_desc'] = [
-				'markup' => __( '<p>Define which fields to map from SAP Customer Data Cloud to WordPress. The WordPress mapped target fields will be populated with data copied from the corresponding source fields. Learn more <a href="https://developers.gigya.com/display/GD/WordPress+Plugin#WordPressPlugin-UserManagementSettings" target="_blank" rel="noopener noreferrer" />here</a>.</p>' ),
+				'markup' => __( '<p>Define which fields to map from SAP Customer Data Cloud to WordPress. The WordPress mapped target fields will be populated with data copied from the corresponding source fields. Learn more <a href="https://github.com/gigya/wordpress/wiki#mapping-gigya-user-fields-to-wordpress-fields-1" target="_blank" rel="noopener noreferrer" />here</a>.</p>' ),
 			];
 
 			$gigya_full_map            = _gigParam( $values, 'map_raas_full_map', '' );
@@ -53,7 +53,7 @@ function fieldMappingForm() {
 			];
 		} elseif ( $login_options['mode'] == 'wp_sl' ) {
 			$form['map_social_title'] = [
-				'markup' => __( '<h4>Mapping SAP Customer Data Cloud user fields to WordPress fields</h4><p>Define which fields to map from SAP CDC to WordPress. The WordPress mapped target fields will be populated with data copied from the corresponding source fields. Learn more <a href="https://developers.gigya.com/display/GD/WordPress+Plugin#WordPressPlugin-UserManagementSettings" target="_blank" rel="noopener noreferrer" />here</a></p>' ),
+				'markup' => __( '<h4>Mapping SAP Customer Data Cloud user fields to WordPress fields</h4><p>Define which fields to map from SAP CDC to WordPress. The WordPress mapped target fields will be populated with data copied from the corresponding source fields. Learn more <a href="https://github.com/gigya/wordpress/wiki#mapping-gigya-user-fields-to-wordpress-fields-1" target="_blank" rel="noopener noreferrer" />here</a></p>' ),
 			];
 
 			$form['map_social_first_name']    = [
diff --git a/admin/forms/globalSettingsForm.php b/admin/forms/globalSettingsForm.php
@@ -101,7 +101,7 @@ function globalSettingsForm() {
 			'type'  => 'text',
 			'label' => __( 'List of providers' ),
 			'value' => _gigParam( $values, 'enabledProviders', '*' ),
-			'desc'  => __( 'Comma separated list of providers to include. For example: facebook,twitter,google. Leave empty or type * for all providers. See the entire ' ) . ' <a href="https://developers.gigya.com/display/GD/socialize.showLoginUI+JS">list of available providers</a>.'
+			'desc'  => __( 'Comma separated list of providers to include. For example: facebook,twitter,google. Leave empty or type * for all providers. See the entire ' ) . ' <a href="https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/417916f470b21014bbc5a10ce4041860.html">list of available providers</a>.'
 	);
 
 	$form['lang'] = array(
@@ -149,7 +149,7 @@ function globalSettingsForm() {
 			'class' => 'json',
 			'value' => _gigParam( $values, 'advanced', '' ),
 			'label' => __( 'Additional Parameters (advanced)' ),
-			'desc'  => sprintf( __( 'Enter valid %s. See list of available ' ), '<a class="gigya-json-example" href="javascript:void(0)">' . __( 'JSON format' ) . '</a>' ) . ' <a href="https://developers.gigya.com/display/GD/Global+Configuration#GlobalConfiguration-DataMembers" target="_blank" rel="noopener noreferrer">' . __( 'parameters' ) . '</a>'
+			'desc'  => sprintf( __( 'Enter valid %s. See list of available ' ), '<a class="gigya-json-example" href="javascript:void(0)">' . __( 'JSON format' ) . '</a>' ) . ' <a href="https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/417fa48b70b21014bbc5a10ce4041860.html" target="_blank" rel="noopener noreferrer">' . __( 'parameters' ) . '</a>'
 	);
 
 	$form['google_analytics'] = array(
@@ -182,7 +182,7 @@ function globalSettingsForm() {
 
 	if ( get_option( 'gigya_settings_fields' ) ) {
 		$form['clean_db'] = array(
-				'markup' => '<a href="javascript:void(0)" class="clean-db">Database cleaner after upgrade</a><br><small>Press this button to remove all unnecessary elements of the previous version from your database.Please make sure to backup your database before performing the clean. Learn more about upgrading from the previous version <a href="https://developers.gigya.com/display/GD/WordPress+Plugin#WordPressPlugin-InstallingtheGigyaPluginforWordPress">here.</a></small>'
+			'markup' => '<a href="javascript:void(0)" class="clean-db">Database cleaner after upgrade</a><br><small>Press this button to remove all unnecessary elements of the previous version from your database.Please make sure to backup your database before performing the clean.For more information about upgrading from the previous version <a href="https://github.com/gigya/wordpress/wiki#installing-the-gigya-plugin-for-wordpress-1">here.</a></small>'
 		);
 	}
 
diff --git a/admin/forms/loginSettingsForm.php b/admin/forms/loginSettingsForm.php
@@ -17,7 +17,7 @@ function loginSettingsForm() {
 		'options' => array(
 			'wp_only' => __( 'WordPress only' ),
 			'wp_sl'   => __( 'WordPress + Social Login <small class="gigya-raas-warn hidden">Warning: this site is configured on SAP CDC server to use Registration-as-a-Service. Please contact your SAP CDC account manager for migration instruction.</small>' ),
-			'raas'    => __( 'Registration-as-a-Service <small>Selecting this option overrides the WordPress user management system. This requires additional administration steps. Learn more <a href="https://developers.gigya.com/display/GD/WordPress#WordPress-UserManagementSettings">here</a></small>' )
+			'raas'    => __( 'Registration-as-a-Service <small>Selecting this option overrides the WordPress user management system. This requires additional administration steps. Learn more <a href="https://github.com/gigya/wordpress/wiki#user-management-settings">here</a></small>' )
 		),
 		'value'   => _gigParam( $values, 'mode', 'wp_only' ),
 		'class'   => 'raas_disabled'
@@ -30,16 +30,19 @@ function loginSettingsForm() {
 	}
 	catch ( GSException $e ) {
 		$is_raas = true;
-		$form['raas_error'] = [
-			'markup' => '<div id="setting-error-api_validate" class="error settings-error notice is-dismissible"> 
-							<p>
-							<strong>' . __( 'Error determining RaaS status. There could be an issue with your machine or SAP CDC account. Please contact support if the problem persists. Message from SAP CDC') . ': ' . $e->getMessage() . '.
-							For more information please refer to <a href="https://developers.gigya.com/display/GD/Response+Codes+and+Errors+REST" target="_blank" rel="noopener noreferrer">Response_Codes_and_Errors</a>.
-							</strong>
-							</p>
-							<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>
-						</div>',
-		];
+    
+		if ( ! empty( $global_settings ) ) {
+			$form['raas_error'] = [
+				'markup' => '<div id="setting-error-api_validate" class="error settings-error notice is-dismissible"> 
+								<p>
+								<strong>' . __( 'Error determining RaaS status. There could be an issue with your machine or SAP CDC account. Please contact support if the problem persists. Message from SAP CDC' ) . ': ' . $e->getMessage() . '.
+								For more information please refer to <a href="https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/416d41b170b21014bbc5a10ce4041860.html" target="_blank" rel="noopener noreferrer">Response_Codes_and_Errors</a>.
+								</strong>
+								</p>
+								<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>
+							</div>',
+			];
+		}
 	}
 
 	if ( $is_raas ) {
@@ -127,14 +130,14 @@ function loginSettingsForm() {
 			'type'  => 'textarea',
 			'label' => __( "Additional Parameters (advanced) LoginUI" ),
 			'value' => _gigParam( $values, 'advancedLoginUI', '' ),
-			'desc'  => sprintf( __( 'Enter valid %s. See list of available:' ), '<a class="gigya-json-example" href="javascript:void(0)">' . __( 'JSON format' ) . '</a>' ) . ' <a href="https://developers.gigya.com/display/GD/socialize.showLoginUI+JS" target="_blank" rel="noopener noreferrer">' . __( 'parameters' ) . '</a>'
+			'desc'  => sprintf( __( 'Enter valid %s. See list of available:' ), '<a class="gigya-json-example" href="javascript:void(0)">' . __( 'JSON format' ) . '</a>' ) . ' <a href="https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/417916f470b21014bbc5a10ce4041860.html" target="_blank" rel="noopener noreferrer">' . __( 'parameters' ) . '</a>'
 	);
 
 	$form['advancedAddConnectionsUI'] = array(
 			'type'  => 'textarea',
 			'label' => __( "Additional Parameters (advanced) AddConnectionsUI" ),
 			'value' => _gigParam( $values, 'advancedAddConnectionsUI', '' ),
-			'desc'  => sprintf( __( 'Enter valid %s. See list of available:' ), '<a class="gigya-json-example" href="javascript:void(0)">' . __( 'JSON format' ) . '</a>' ) . ' <a href="https://developers.gigya.com/display/GD/socialize.showAddConnectionsUI+JS" target="_blank" rel="noopener noreferrer">' . __( 'parameters' ) . '</a>'
+			'desc'  => sprintf( __( 'Enter valid %s. See list of available:' ), '<a class="gigya-json-example" href="javascript:void(0)">' . __( 'JSON format' ) . '</a>' ) . ' <a href="https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/4178f00d70b21014bbc5a10ce4041860.html" target="_blank" rel="noopener noreferrer">' . __( 'parameters' ) . '</a>'
 	);
 
 	$form['sl_end'] = array(
diff --git a/admin/forms/sessionManagementForm.php b/admin/forms/sessionManagementForm.php
@@ -89,7 +89,7 @@ function sessionManagementForm() {
 	if ( get_option( 'gigya_settings_fields' ) )
 	{
 		$form['clean_db'] = array(
-			'markup' => '<a href="javascript:void(0)" class="clean-db">Database cleaner after upgrade</a><br><small>Press this button to remove all unnecessary elements of the previous version from your database.Please make sure to backup your database before performing the clean. Learn more about upgrading from the previous version <a href="https://developers.gigya.com/display/GD/WordPress+Plugin#WordPressPlugin-InstallingtheGigyaPluginforWordPress">here.</a></small>',
+			'markup' => '<a href="javascript:void(0)" class="clean-db">Database cleaner after upgrade</a><br><small>Press this button to remove all unnecessary elements of the previous version from your database.Please make sure to backup your database before performing the clean. Learn more about upgrading from the previous version <a href="https://github.com/gigya/wordpress/wiki#installing-the-gigya-plugin-for-wordpress">here.</a></small>',
 		);
 	}
 
diff --git a/cms_kit/GigyaCMS.php b/cms_kit/GigyaCMS.php
@@ -269,7 +269,7 @@ public function userLogout( $guid ) {
 	 * @param array $params .
 	 *                      an associative array of params to pass to Gigya
 	 *
-	 * @see http://developers.gigya.com/020_Client_API/020_Methods/socialize.getFriends
+	 * @see https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/4174b27f70b21014bbc5a10ce4041860.html
 	 * @return array | false
 	 *      the response from gigya.
 	 *
diff --git a/gigya.php b/gigya.php
@@ -3,7 +3,7 @@
  * Plugin Name: SAP Customer Data Cloud
  * Plugin URI: https://www.sap.com/products/crm/customer-data-management.html
  * Description: Allows sites to utilize the SAP Customer Data Cloud API for authentication and social network updates.
- * Version: 6.1.1
+ * Version: 6.2.0
  * Author: SAP SE
  * Author URI: https://www.sap.com/products/crm/customer-data-management.html
  * License: Apache v2.0
@@ -20,7 +20,7 @@
  */
 define( 'GIGYA__MINIMUM_WP_VERSION', '4.7' );
 define( 'GIGYA__MINIMUM_PHP_VERSION', '7.0' );
-define( 'GIGYA__VERSION', '6.1.1' );
+define( 'GIGYA__VERSION', '6.2.0' );
 define( 'GIGYA__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'GIGYA__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'GIGYA__USER_FILES', GIGYA__PLUGIN_DIR . 'user_files/' );
diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Contributors: SAP SE/gigya.com konforti, luciodiri, ynhockey, shaharzillber.
 Tags: CIAM, CIM, Registration, Social Login, Oauth, OpenSocial, Graph API, Facebook Connect, Linkedin, Twitter, authentication, OpenID,  newsfeed, tweet, status update, registration, social APIs, sharing, plugin, social bookmark, social network, Facebook, community, comments, reactions, game mechanics, register, SAP Customer Data Cloud, Social Infrastructure, feed
 Requires at least: 4.2
 Tested up to: 4.9
-Stable tag: 6.1.1
+Stable tag: 6.2.0
 License: Apache v2.0
 
 Integrate your WordPress site with SAP Customer Data Cloud.
@@ -32,12 +32,12 @@ More than 700 of the world’s leading businesses such as Fox, Forbes, and Veriz
 
 
 
-For more information, installation steps and configuration options - please refer to SAP Customer Data Cloud's [WP Documentation](https://developers.gigya.com/display/GD/WordPress "SAP CDC WP documentation")
+For more information, installation steps and configuration options - please refer to SAP Customer Data Cloud's [WP Documentation](https://github.com/gigya/wordpress/wiki "SAP CDC WP documentation")
 
 
 == Installation ==
 
-You can read more about the installation steps and other advanced configuration options in SAP Customer Data Cloud's online [WP Documentation](https://developers.gigya.com/display/GD/WordPress "SAP CDC WP documentation")
+You can read more about the installation steps and other advanced configuration options in SAP Customer Data Cloud's online [WP Documentation](https://github.com/gigya/wordpress/wiki "SAP CDC WP documentation")
 
 1.	After downloading the SAP Customer Data Cloud plug-in, unpack and upload the folder to the the /wp-content/plugins/ directory on your blog.
 2.	Go to the Plug-in tab in the WordPress administration panel, find the SAP Customer Data Cloud plug-in on the list and click Activate.
@@ -82,19 +82,19 @@ For question about installations or configuration, please contact your account m
 
 
 = 4.0 =
-* Added [Reaction bar](https://developers.gigya.com/display/GD/Reactions)
-* Added [Gamification](https://developers.gigya.com/display/GD/Loyalty+-+Gamification+and+User+Behavior)
+* Added Reaction bar
+* Added Gamification
 * Activity Feed
-* Upgraded [Comments plugin](https://developers.gigya.com/display/GD/Comments)
+* Upgraded Comments plugin
 * Support connecting to an alternative data centers (e.g. Europe data center)
 * Improved administration
 * Integrated Google Analytics
 * Debug log
 
 = 5.0 =
 * The Plugin has been rewritten, providing improved architecture, administration and security.
-* [Registration-as-a-Service Integration](https://developers.gigya.com/display/GD/Customer+Identity).
-* [Ratings & Reviews](https://developers.gigya.com/display/GD/R+and+R).
+* [Registration-as-a-Service Integration](https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/414f36ba70b21014bbc5a10ce4041860.html).
+* Ratings & Reviews
 * Added SEO support in the Comments and Rating&Reviews plugins, meaning the comments/reviews content is searchable by the main search engines.
 * All social plugins are provides as WP widgets that can be placed anywhere on your site.
 
@@ -112,7 +112,7 @@ For question about installations or configuration, please contact your account m
 * Fixed breaking change: Strings must be enclosed with quotes in search queries
 
 = 5.2 =
-* For security reasons, the Secret Key can now only be viewed or edited by privileged users. By default only by <strong>network admins</strong> (in a multi-site installation) or <strong>admins</strong> (in a single-site installation). Learn more in (https://developers.gigya.com/display/GD/WordPress+Plugin#WordPressPlugin-RolesandPermissions) Roles and Permissions</a>.
+* For security reasons, the Secret Key can now only be viewed or edited by privileged users. By default only by <strong>network admins</strong> (in a multi-site installation) or <strong>admins</strong> (in a single-site installation). Learn more in (https://github.com/gigya/wordpress/wiki#roles-and-permissions)</a>.
 * Security enhancements
 
 = 5.2.2.2 =
@@ -208,11 +208,16 @@ For question about installations or configuration, please contact your account m
 * Updated CN data center host name
 * Fixed possible PHP notices/warnings in the admin UI
 
+= 6.2.0 =
+* Added a report that can be generated to find out which users are not synchronized between WordPress and SAP CDC
+* Added a configuration option for user verification by UID only (recommended)
+* Fixed an issue when the Override WordPress Link option was unchecked
+
 == FAQ ==
 
 Can I configure the design of the SAP Customer Data Cloud component?
 
-Yes, the design is fully configurable. You can read more about configuring the SAP Customer Data Cloud component design in our online [Documentation](https://developers.gigya.com/display/GD/WordPress )
+Yes, the design is fully configurable. You can read more about configuring the SAP Customer Data Cloud component design in our online [Documentation](https://github.com/gigya/wordpress/wiki )
 
 How can I get support for the SAP Customer Data Cloud Plugin?
 
diff --git a/user_files/.htaccess b/user_files/.htaccess
@@ -0,0 +1 @@
+Deny from all

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ function sessionManagementForm() {`
`89`	`89`	`if ( get_option( 'gigya_settings_fields' ) )`
`90`	`90`	`{`
`91`	`91`	`$form['clean_db'] = array(`
`92`		`- 'markup' => '<a href="javascript:void(0)" class="clean-db">Database cleaner after upgrade</a><br><small>Press this button to remove all unnecessary elements of the previous version from your database.Please make sure to backup your database before performing the clean. Learn more about upgrading from the previous version <a href="https://developers.gigya.com/display/GD/WordPress+Plugin#WordPressPlugin-InstallingtheGigyaPluginforWordPress">here.</a></small>',`
	`92`	`+ 'markup' => '<a href="javascript:void(0)" class="clean-db">Database cleaner after upgrade</a><br><small>Press this button to remove all unnecessary elements of the previous version from your database.Please make sure to backup your database before performing the clean. Learn more about upgrading from the previous version <a href="https://github.com/gigya/wordpress/wiki#installing-the-gigya-plugin-for-wordpress">here.</a></small>',`
`93`	`93`	`);`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ public function userLogout( $guid ) {`
`269`	`269`	`* @param array $params .`
`270`	`270`	`* an associative array of params to pass to Gigya`
`271`	`271`	`*`
`272`		`- * @see http://developers.gigya.com/020_Client_API/020_Methods/socialize.getFriends`
	`272`	`+ * @see https://help.sap.com/viewer/8b8d6fffe113457094a17701f63e3d6a/GIGYA/en-US/4174b27f70b21014bbc5a10ce4041860.html`
`273`	`273`	`* @return array \| false`
`274`	`274`	`* the response from gigya.`
`275`	`275`	`*`