@atlassian/atlassian-connect-js 5.3.199 → 5.3.201

package/bitbucket-pipelines.yml

@@ -21,7 +21,7 @@ pipelines:
               - git remote set-url origin https://x-token-auth:${TOKEN}@bitbucket.org/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}.git
               - git config user.email "${BUILDBOT_EMAIL}"
               - git config user.name "${BUILDBOT_NAME}"
-              - git add . && git commit -m "$PACKAGE_VERSION release [skip ci]" && git push origin master
+              - git add package.json package-lock.json dist/ && git commit -m "$PACKAGE_VERSION release [skip ci]" && git push origin master
 
     default:
         - step:

package/dist/connect-host.js

@@ -9760,9 +9760,6 @@
     }
     return getFeatureGateConfluenceLegacy(flagName);
   }
-  var Flags = {
-    getBooleanFeatureFlag: getBooleanFeatureFlag
-  };
 
   var performanceModuleDefined = false;
   var ADDON_KEY_CODEBARREL = 'com.codebarrel.addons.automation';
@@ -10030,7 +10027,7 @@
       var $additionalText = $('<p />').text(text);
       $error.append('<p class="error">Error: The content resolver threw the following error:</p>');
       $error.append($additionalText);
-      if (Flags.getBooleanFeatureFlag('display_trace_for_confluence_top_errors') && traceId) {
+      if (traceId) {
         $error.append("<br><p class=\"error-trace-id\">If this keeps happening, pass this information to your admin, who should contact support. Trace: " + traceId + ".</p>");
       }
       $container.prepend($error);
@@ -13862,7 +13859,7 @@
    * Add version
    */
   if (!window._AP.version) {
-    window._AP.version = '5.3.199';
+    window._AP.version = '5.3.201';
   }
   simpleXDM.defineModule('messages', messages);
   simpleXDM.defineModule('flag', flag);

package/dist/iframe-fedramp.js

@@ -1373,7 +1373,7 @@ var AP = (function () {
       _this._eventHandlers = {};
       _this._pendingCallbacks = {};
       _this._keyListeners = [];
-      _this._version = '5.3.199';
+      _this._version = '5.3.201';
       _this._apiTampered = undefined;
       _this._isSubIframe = _this._topHost !== window.parent;
       _this._onConfirmedFns = [];

package/dist/iframe.js

@@ -1373,7 +1373,7 @@ var AP = (function () {
       _this._eventHandlers = {};
       _this._pendingCallbacks = {};
       _this._keyListeners = [];
-      _this._version = '5.3.199';
+      _this._version = '5.3.201';
       _this._apiTampered = undefined;
       _this._isSubIframe = _this._topHost !== window.parent;
       _this._onConfirmedFns = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlassian/atlassian-connect-js",
-  "version": "5.3.199",
+  "version": "5.3.201",
   "license": "Apache-2.0",
   "description": "Atlassian Connect JavaScript bridge",
   "main": "dist/connect-host.js",

package/spec/tests/iframe_spec.js

@@ -226,35 +226,18 @@ describe('Iframe component', () => {
   });
 
   describe('_appendExtensionError', () => {
-    it('displays error message without trace ID when gate display_trace_for_confluence_top_errors is off', () => {
+    it('displays error message with trace ID when traceId is provided', () => {
       var $container = $('<div />');
       var traceId = 'trace-123';
-      spyOn(Flags, 'getBooleanFeatureFlag').and.callFake((flag) => (
-        !(flag === 'display_trace_for_confluence_top_errors')
-      ));
-      IframeComponent._appendExtensionError($container, 'test error message', traceId);
-      expect($container.find('.connect-resolve-error').length).toEqual(1);
-      expect($container.find('.error').text()).toContain('Error: The content resolver threw the following error:');
-      expect($container.find('.error-trace-id').length).toBe(0);
-    });
-
-    it('displays error message with trace ID when gate display_trace_for_confluence_top_errors is on', () => {
-      var $container = $('<div />');
-      var traceId = 'trace-123';
-      spyOn(Flags, 'getBooleanFeatureFlag').and.callFake((flag) => (
-        flag === 'display_trace_for_confluence_top_errors'
-      ));
       IframeComponent._appendExtensionError($container, 'test error message', traceId);
       expect($container.find('.connect-resolve-error').length).toEqual(1);
       expect($container.find('.error').text()).toContain('Error: The content resolver threw the following error:');
       expect($container.find('.error-trace-id').text()).toContain('If this keeps happening, pass this information to your admin, who should contact support. Trace: trace-123.');
     });
 
-    it('displays error message without trace ID when traceId is not provided and gate display_trace_for_confluence_top_errors is on', () => {
+
+    it('displays error message without trace ID when traceId is not provided', () => {
       var $container = $('<div />');
-      spyOn(Flags, 'getBooleanFeatureFlag').and.callFake((flag) => (
-        flag === 'display_trace_for_confluence_top_errors'
-      ));
       IframeComponent._appendExtensionError($container, 'test error message');
       expect($container.find('.connect-resolve-error').length).toEqual(1);
       expect($container.find('.error').text()).toContain('Error: The content resolver threw the following error:');

package/src/host/components/iframe.js

@@ -77,7 +77,7 @@ class Iframe {
     $error.append('<p class="error">Error: The content resolver threw the following error:</p>');
     $error.append($additionalText);
 
-    if (Flags.getBooleanFeatureFlag('display_trace_for_confluence_top_errors') && traceId) {
+    if (traceId) {
       $error.append(`<br><p class="error-trace-id">If this keeps happening, pass this information to your admin, who should contact support. Trace: ${traceId}.</p>`);
     }
 

package/.envrc

@@ -1,7 +0,0 @@
-PACKAGES_USERNAME=mi-ar-oi-bb-_c-58-43-9f-de-a4-4a-b3-8d
-PACKAGES_PASSWORD=eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLWE0LTRhLWIzLThkIiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc1NDQ0OTEyOSwiaWF0IjoxNzU0NDQ1NTI5LCJqdGkiOiJhMTA5MDA1Yi0zZTQyLTQ3MDYtYTMwYy1hMDEyNjYzMWUyY2EifQ.Gp10jVFIDA9lY6-5rx274LaiimS5OUSDSY9AP8h1Ubk6n7BNnEXbS7Q7J1TqTYFgOEk3dBUAJ4ToyMjOdARcy7jzlWhx5bqIaNaDcc6U1L97l7dwFoAYoTyM9BAEk8HslH0pZUtYhl_xE2p0wbBeoWB2a4Xe34y_F1Gb3cTS_pckViI5mvaeie9lZopvbOJvsRz8838bB7SawBX_xHd-QRDG9_6iv6_NFIbJZryafTm55q0we4NW_ZGYcyCFW2bp1MWB6nOOUmXS7Wp1C0wrZ9IeEObHZkXPzm2u9C89iLWsrNWq4CXPSY4G9vZN_crR7PxPEM3e_9YGeoZlWPz-2g
-PACKAGES_ACCESS_TOKEN=eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLWE0LTRhLWIzLThkIiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc1NDQ0OTEyOSwiaWF0IjoxNzU0NDQ1NTI5LCJqdGkiOiJhMTA5MDA1Yi0zZTQyLTQ3MDYtYTMwYy1hMDEyNjYzMWUyY2EifQ.Gp10jVFIDA9lY6-5rx274LaiimS5OUSDSY9AP8h1Ubk6n7BNnEXbS7Q7J1TqTYFgOEk3dBUAJ4ToyMjOdARcy7jzlWhx5bqIaNaDcc6U1L97l7dwFoAYoTyM9BAEk8HslH0pZUtYhl_xE2p0wbBeoWB2a4Xe34y_F1Gb3cTS_pckViI5mvaeie9lZopvbOJvsRz8838bB7SawBX_xHd-QRDG9_6iv6_NFIbJZryafTm55q0we4NW_ZGYcyCFW2bp1MWB6nOOUmXS7Wp1C0wrZ9IeEObHZkXPzm2u9C89iLWsrNWq4CXPSY4G9vZN_crR7PxPEM3e_9YGeoZlWPz-2g
-PACKAGES_PASSWORD_BASE64=ZXlKMlpYSWlPaUl5SWl3aWRIbHdJam9pU2xkVUlpd2lZV3huSWpvaVVsTXlOVFlpTENKcmFXUWlPaUpDTUdrd1FXSjVZVEJyV0RoSGNtNDJjekZ6YjIxb1ptUm5hWGRaVWtWU1pGbFZYMk5yTTFsSE5YTkZJbjAuZXlKemRXSWlPaUpxWm1GalFEQXhaWFpyWldZeE5XRTBNWGRtTUROd09XUnJObW93YUhOMEwzVnpaWEp6TDIxcExXRnlMVzlwTFdKaUxWOWpMVFU0TFRRekxUbG1MV1JsTFdFMExUUmhMV0l6TFRoa0lpd2ljMk53SWpvaVlYQndiR2xsWkMxd1pYSnRhWE56YVc5dWN5OW5jbTkxY0hNNmIzQmxibk52ZFhKalpTMXdkV0pzYVhOb0lpd2lZWFZrSWpvaUtrQXFJaXdpYVhOeklqb2lhbVpoWTBBd01XVjJhMlZtTVRWaE5ERjNaakF6Y0Rsa2F6WnFNR2h6ZENJc0ltVjRjQ0k2TVRjMU5EUTBPVEV5T1N3aWFXRjBJam94TnpVME5EUTFOVEk1TENKcWRHa2lPaUpoTVRBNU1EQTFZaTB6WlRReUxUUTNNRFl0WVRNd1l5MWhNREV5TmpZek1XVXlZMkVpZlEuR3AxMGpWRklEQTlsWTYtNXJ4Mjc0TGFpaW1TNU9VU0RTWTlBUDhoMVViazZuN0JObkVYYlM3UTdKMVRxVFlGZ09FazNkQlVBSjRUb3lNak9kQVJjeTdqemxXaHg1YnFJYU5hRGNjNlUxTDk3bDdkd0ZvQVlvVHlNOUJBRWs4SHNsSDBwWlV0WWhsX3hFMnAwd2JCZW9XQjJhNFhlMzR5X0YxR2IzY1RTX3Bja1ZpSTVtdmFlaWU5bFpvcHZiT0p2c1J6ODgzOGJCN1Nhd0JYX3hIZC1RUkRHOV82aXY2X05GSWJKWnJ5YWZUbTU1cTB3ZTROV19aR1ljeUNGVzJicDFNV0I2bk9PVW1YUzdXcDFDMHdyWjlJZUVPYkhaa1hQem0ydTlDODlpTFdzck5XcTRDWFBTWTRHOXZaTl9jclI3UHhQRU0zZV85WUdlb1psV1B6LTJnCg==
-export PACKAGES_USERNAME PACKAGES_PASSWORD PACKAGES_ACCESS_TOKEN PACKAGES_PASSWORD_BASE64
-mkdir -p /root/.m2
-mv /opt/atlassian/pipelines/agent/build/settings.xml /root/.m2/settings.xml

package/.netrc

@@ -1 +0,0 @@
-machine packages.atlassian.com login mi-ar-oi-bb-_c-58-43-9f-de-a4-4a-b3-8d password eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLWE0LTRhLWIzLThkIiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc1NDQ0OTEyOSwiaWF0IjoxNzU0NDQ1NTI5LCJqdGkiOiJhMTA5MDA1Yi0zZTQyLTQ3MDYtYTMwYy1hMDEyNjYzMWUyY2EifQ.Gp10jVFIDA9lY6-5rx274LaiimS5OUSDSY9AP8h1Ubk6n7BNnEXbS7Q7J1TqTYFgOEk3dBUAJ4ToyMjOdARcy7jzlWhx5bqIaNaDcc6U1L97l7dwFoAYoTyM9BAEk8HslH0pZUtYhl_xE2p0wbBeoWB2a4Xe34y_F1Gb3cTS_pckViI5mvaeie9lZopvbOJvsRz8838bB7SawBX_xHd-QRDG9_6iv6_NFIbJZryafTm55q0we4NW_ZGYcyCFW2bp1MWB6nOOUmXS7Wp1C0wrZ9IeEObHZkXPzm2u9C89iLWsrNWq4CXPSY4G9vZN_crR7PxPEM3e_9YGeoZlWPz-2g