Merge pull request #159 from gigya/develop

6.0.3

Author: Ynhockey

GigyaAction.php

@@ -39,6 +39,7 @@ public function __construct() {
 			define( 'GIGYA__PRIVATE_KEY', $this->global_options['rsa_private_key'] ?? '' );
 			define( 'GIGYA__API_DOMAIN', _gigya_data_center( $this->global_options ) );
 			define( 'GIGYA__API_DEBUG', $this->global_options['debug'] );
+			define( 'GIGYA__JS_CDN', 'https://cdns.' . GIGYA__API_DOMAIN . '/js/socialize.js' );
 		} else {
 			define( 'GIGYA__API_KEY', '' );
 			define( 'GIGYA__USER_KEY', '' );
@@ -48,6 +49,7 @@ public function __construct() {
 			define( 'GIGYA__PRIVATE_KEY', '' );
 			define( 'GIGYA__API_DOMAIN', '' );
 			define( 'GIGYA__API_DEBUG', '' );
+			define( 'GIGYA__JS_CDN', GIGYA__DEFAULT_JS_CDN );
 		}
 
 		add_action( 'init', array( $this, 'init' ) );
@@ -120,12 +122,10 @@ public function __construct() {
 	 */
 	public function init()
 	{
-		if (!file_exists(GIGYA__PLUGIN_DIR . 'vendor/autoload.php')) {
-			return;
-		}
-
 		/* Require SDK libraries */
-		require_once GIGYA__PLUGIN_DIR . 'vendor/autoload.php';
+		if ( file_exists( GIGYA__PLUGIN_DIR . 'vendor/autoload.php' ) ) { /* If the plugin is installed by Composer as a `wordpress-plugin`, this becomes unnecessary, but require_once makes sure it's not included again */
+			require_once GIGYA__PLUGIN_DIR . 'vendor/autoload.php';
+		}
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaJsonObject.php';
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaUserFactory.php';
 		require_once GIGYA__PLUGIN_DIR . 'cms_kit/GigyaProfile.php';
@@ -188,7 +188,7 @@ public function init()
 		if ( ! empty( $api_key ) ) {
 			/*	* Loads requirements for any Gigya's login
 				* Load Gigya's socialize.js from CDN */
-			wp_enqueue_script( 'gigya_cdn', GIGYA__JS_CDN . GIGYA__API_KEY . '&lang=' . $params['lang'] );
+			wp_enqueue_script( 'gigya_cdn', GIGYA__JS_CDN . '?apiKey=' . GIGYA__API_KEY . '&lang=' . $params['lang'] );
 
 			if ( ! empty( $this->login_options ) ) /* Empty only happens on initial plugin enable, before configuring it */ {
 				/* Social Login – load requirements  */

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "gigya/wordpress",
   "description": "Integrate your WordPress site with SAP Customer Data Cloud",
-  "type": "project",
+  "type": "wordpress-plugin",
   "license": "Apache 2.0",
   "authors": [
     {
@@ -15,6 +15,7 @@
   ],
   "minimum-stability": "stable",
   "require": {
+    "composer/installers": "^1.9",
     "gigya/php-sdk": "^3.0",
     "ext-json": "*",
     "ext-openssl": "*"

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: 5.11
+ * Version: 6.0.3
  * Author: SAP SE
  * Author URI: https://www.sap.com/products/crm/customer-data-management.html
  * License: Apache v2.0
@@ -20,11 +20,10 @@
  */
 define( 'GIGYA__MINIMUM_WP_VERSION', '4.7' );
 define( 'GIGYA__MINIMUM_PHP_VERSION', '5.6' );
-define( 'GIGYA__VERSION', '6.0.2' );
+define( 'GIGYA__VERSION', '6.0.3' );
 define( 'GIGYA__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'GIGYA__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
-define( 'GIGYA__CDN_PROTOCOL', ! empty( $_SERVER['HTTPS'] ) ? 'https://cdns' : 'http://cdn' );
-define( 'GIGYA__JS_CDN', GIGYA__CDN_PROTOCOL . '.gigya.com/js/socialize.js?apiKey=' );
+define( 'GIGYA__DEFAULT_JS_CDN', 'https://cdns.gigya.com/js/socialize.js' );
 define( 'GIGYA__LOG_LIMIT', 50 );
 define( 'GIGYA__DEFAULT_COOKIE_EXPIRATION', 1800 ); /* WordPress defaults to 172800 (48 hours) */
 define( 'GIGYA__DEFAULT_REMEMBER_COOKIE_EXPIRATION', 20000000 ); /* For Remember Me sessions */

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.0.2
+Stable tag: 6.0.3
 License: Apache v2.0
 
 Integrate your WordPress site with SAP Customer Data Cloud.
@@ -196,6 +196,11 @@ For question about installations or configuration, please contact your account m
 = 6.0.2 =
 * Allowed any RSA key format in client-side validation
 
+= 6.0.3 =
+* Fixed JavaScript loading from SAP CDN not under gigya.com domains
+* SAP JavaScript is now only retrieved via HTTPS
+* Added a new way to install SAP CDC plugin with Composer
+
 == FAQ ==
 
 Can I configure the design of the SAP Customer Data Cloud component?