Skip to content

Commit 528b634

Browse files
authored
update version attribute name to avoid it landing in the user_data (#131)
1 parent d25cbfd commit 528b634

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

bootstrap.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
Description: Official <a href="https://www.intercom.io">Intercom</a> support for WordPress.
66
Author: Intercom
77
Author URI: https://www.intercom.io
8-
Version: 3.0.1
8+
Version: 3.0.2
99
*/
1010

11-
define('INTERCOM_PLUGIN_VERSION', '3.0.1');
11+
define('INTERCOM_PLUGIN_VERSION', '3.0.2');
1212

1313
require_once __DIR__ . '/vendor/autoload.php';
1414
use Firebase\JWT\JWT;
@@ -406,7 +406,7 @@ private function getRawData()
406406
$settings = $messengerSecurityCalculator->messengerSecurityComponent();
407407
$result = $this->mergeConstants(apply_filters("intercom_settings", $settings));
408408
$result['installation_type'] = 'wordpress';
409-
$result['integration_version'] = INTERCOM_PLUGIN_VERSION;
409+
$result['installation_version'] = INTERCOM_PLUGIN_VERSION;
410410
return $result;
411411
}
412412

readme.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Requires at least: 4.7.0
55
Tested up to: 6.7.2
66
Requires PHP: 7.2
77
License: Apache 2.0
8-
Stable tag: 3.0.1
8+
Stable tag: 3.0.2
99

1010
Official Intercom WordPress plugin: Engage visitors in real time, power growth with AI, and convert leads into loyal customers.
1111

@@ -32,6 +32,11 @@ Note: This plugin injects a Javascript snippet on your website frontend containi
3232
2. Plugin settings successfully authenticated with Intercom settings_auth.png
3333
3. Intercom widget used by customers to communicate with the business widget.png
3434
== Changelog ==
35+
= 3.0.2 =
36+
37+
https://github.com/intercom/intercom-wordpress/pull/131
38+
* Updated version attribute to avoid it getting sent in the user data.
39+
3540
= 3.0.1 =
3641

3742
https://github.com/intercom/intercom-wordpress/pull/130
@@ -48,6 +53,8 @@ https://github.com/intercom/intercom-wordpress/pull/127
4853
* Added missing tests.
4954

5055
== Upgrade Notice ==
56+
= 3.0.1 =
57+
Updated version attribute name to avoid setting it as part of user data.
5158

5259
= 3.0.1 =
5360
Help Intercom provide better support by sharing the plugin version is in use.

test/SnippetSettingsTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected function tearDown(): void
2626
public function testJSONRendering()
2727
{
2828
$snippet_settings = new IntercomSnippetSettings(array("app_id" => "bar"));
29-
$this->assertEquals("{\"app_id\":\"bar\",\"installation_type\":\"wordpress\",\"integration_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
29+
$this->assertEquals("{\"app_id\":\"bar\",\"installation_type\":\"wordpress\",\"installation_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
3030
}
3131
public function testJSONRenderingWithIdentityVerification()
3232
{
@@ -37,23 +37,23 @@ public function testJSONRenderingWithIdentityVerification()
3737
"exp" => TimeProvider::getCurrentTime() + 3600
3838
);
3939
$jwt = JWT::encode($jwt_data, "s3cre7", 'HS256');
40-
$this->assertEquals('{"app_id":"bar","intercom_user_jwt":"'.$jwt.'","installation_type":"wordpress","integration_version":"' . INTERCOM_PLUGIN_VERSION . '"}', $snippet_settings->json());
40+
$this->assertEquals('{"app_id":"bar","intercom_user_jwt":"'.$jwt.'","installation_type":"wordpress","installation_version":"' . INTERCOM_PLUGIN_VERSION . '"}', $snippet_settings->json());
4141
}
4242
public function testJSONRenderingWithIdentityVerificationAndNoSecret()
4343
{
4444
$snippet_settings = new IntercomSnippetSettings(array("app_id" => "bar"), NULL, new FakeWordPressUserForSnippetTest());
45-
$this->assertEquals("{\"app_id\":\"bar\",\"email\":\"[email protected]\",\"installation_type\":\"wordpress\",\"integration_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
45+
$this->assertEquals("{\"app_id\":\"bar\",\"email\":\"[email protected]\",\"installation_type\":\"wordpress\",\"installation_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
4646
}
4747
public function testInstallationType()
4848
{
4949
$snippet_settings = new IntercomSnippetSettings(array("app_id" => "bar"));
50-
$this->assertEquals("{\"app_id\":\"bar\",\"installation_type\":\"wordpress\",\"integration_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
50+
$this->assertEquals("{\"app_id\":\"bar\",\"installation_type\":\"wordpress\",\"installation_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
5151
}
5252
public function testIclLanguageConstant()
5353
{
5454
define('ICL_LANGUAGE_CODE', 'fr');
5555
$snippet_settings = new IntercomSnippetSettings(array("app_id" => "bar"));
56-
$this->assertEquals("{\"app_id\":\"bar\",\"language_override\":\"fr\",\"installation_type\":\"wordpress\",\"integration_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
56+
$this->assertEquals("{\"app_id\":\"bar\",\"language_override\":\"fr\",\"installation_type\":\"wordpress\",\"installation_version\":\"" . INTERCOM_PLUGIN_VERSION . "\"}", $snippet_settings->json());
5757
}
5858

5959
public function testAppId()

test/SnippetTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function testGeneratedHtml()
2424
};
2525
</script>
2626
<script data-cfasync="false">
27-
window.intercomSettings = {"app_id":"foo","name":"Nikola Tesla","installation_type":"wordpress","integration_version":"3.0.1"};
27+
window.intercomSettings = {"app_id":"foo","name":"Nikola Tesla","installation_type":"wordpress","installation_version":"3.0.2"};
2828
</script>
2929
<script data-cfasync="false">(function(){var w=window;var ic=w.Intercom;if(typeof ic==="function"){ic('reattach_activator');ic('update',w.intercomSettings);}else{var d=document;var i=function(){i.c(arguments);};i.q=[];i.c=function(args){i.q.push(args);};w.Intercom=i;var l=function(){var s=d.createElement('script');s.type='text/javascript';s.async=true;s.src='https://widget.intercom.io/widget/foo';var x=d.getElementsByTagName('script')[0];x.parentNode.insertBefore(s, x);};if(document.readyState==='complete'){l();}else if(w.attachEvent){w.attachEvent('onload',l);}else{w.addEventListener('load',l,false);}}})()</script>
3030
HTML;

0 commit comments

Comments
 (0)