@atlassian/atlassian-connect-js 5.3.191 → 5.3.193

package/.envrc

@@ -1,7 +1,7 @@
-PACKAGES_USERNAME=mi-ar-oi-bb-_c-58-43-9f-de-93-43-9d-ab
-PACKAGES_PASSWORD=eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLTkzLTQzLTlkLWFiIiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc0ODMxMjE5MSwiaWF0IjoxNzQ4MzA4NTkxLCJqdGkiOiI5YTE1N2E5Yi0wNzVjLTRkZDktYWI2NS0zNDlmMjQ3OTExN2UifQ.NkUZlI-xvaQLcXwSdn25c8h2iOEbyzUdfaCwHpBmpT5HZKT8FVd_lV65c-TRd5oS71q2M6VOeOls_Cf7DB_X1qGKqdB-iwgALtUtK0efog3cJ68f-d_FAHILNCsUhh7BL2goPyIU6X3S7CM8N9H4E0aLOub2QT5NG1TfKJKFbxuEPslfEhQxexTjCTdjxBZcs17OXKh5PPGlTUoAw45bV1WUDyZEpuqkKGYv6SKrFA-w0-VjwzL26zF9_hzgAnMpuxZT4AYHEX50ljslwDx0-ssmRid07xUkmKmLTCo2mNvLr6PyZQVIIO_LelYDYI9qErvArAA2YP6yZ97FjPn33g
-PACKAGES_ACCESS_TOKEN=eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLTkzLTQzLTlkLWFiIiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc0ODMxMjE5MSwiaWF0IjoxNzQ4MzA4NTkxLCJqdGkiOiI5YTE1N2E5Yi0wNzVjLTRkZDktYWI2NS0zNDlmMjQ3OTExN2UifQ.NkUZlI-xvaQLcXwSdn25c8h2iOEbyzUdfaCwHpBmpT5HZKT8FVd_lV65c-TRd5oS71q2M6VOeOls_Cf7DB_X1qGKqdB-iwgALtUtK0efog3cJ68f-d_FAHILNCsUhh7BL2goPyIU6X3S7CM8N9H4E0aLOub2QT5NG1TfKJKFbxuEPslfEhQxexTjCTdjxBZcs17OXKh5PPGlTUoAw45bV1WUDyZEpuqkKGYv6SKrFA-w0-VjwzL26zF9_hzgAnMpuxZT4AYHEX50ljslwDx0-ssmRid07xUkmKmLTCo2mNvLr6PyZQVIIO_LelYDYI9qErvArAA2YP6yZ97FjPn33g
-PACKAGES_PASSWORD_BASE64=ZXlKMlpYSWlPaUl5SWl3aWRIbHdJam9pU2xkVUlpd2lZV3huSWpvaVVsTXlOVFlpTENKcmFXUWlPaUpDTUdrd1FXSjVZVEJyV0RoSGNtNDJjekZ6YjIxb1ptUm5hWGRaVWtWU1pGbFZYMk5yTTFsSE5YTkZJbjAuZXlKemRXSWlPaUpxWm1GalFEQXhaWFpyWldZeE5XRTBNWGRtTUROd09XUnJObW93YUhOMEwzVnpaWEp6TDIxcExXRnlMVzlwTFdKaUxWOWpMVFU0TFRRekxUbG1MV1JsTFRrekxUUXpMVGxrTFdGaUlpd2ljMk53SWpvaVlYQndiR2xsWkMxd1pYSnRhWE56YVc5dWN5OW5jbTkxY0hNNmIzQmxibk52ZFhKalpTMXdkV0pzYVhOb0lpd2lZWFZrSWpvaUtrQXFJaXdpYVhOeklqb2lhbVpoWTBBd01XVjJhMlZtTVRWaE5ERjNaakF6Y0Rsa2F6WnFNR2h6ZENJc0ltVjRjQ0k2TVRjME9ETXhNakU1TVN3aWFXRjBJam94TnpRNE16QTROVGt4TENKcWRHa2lPaUk1WVRFMU4yRTVZaTB3TnpWakxUUmtaRGt0WVdJMk5TMHpORGxtTWpRM09URXhOMlVpZlEuTmtVWmxJLXh2YVFMY1h3U2RuMjVjOGgyaU9FYnl6VWRmYUN3SHBCbXBUNUhaS1Q4RlZkX2xWNjVjLVRSZDVvUzcxcTJNNlZPZU9sc19DZjdEQl9YMXFHS3FkQi1pd2dBTHRVdEswZWZvZzNjSjY4Zi1kX0ZBSElMTkNzVWhoN0JMMmdvUHlJVTZYM1M3Q004TjlINEUwYUxPdWIyUVQ1TkcxVGZLSktGYnh1RVBzbGZFaFF4ZXhUakNUZGp4QlpjczE3T1hLaDVQUEdsVFVvQXc0NWJWMVdVRHlaRXB1cWtLR1l2NlNLckZBLXcwLVZqd3pMMjZ6RjlfaHpnQW5NcHV4WlQ0QVlIRVg1MGxqc2x3RHgwLXNzbVJpZDA3eFVrbUttTFRDbzJtTnZMcjZQeVpRVklJT19MZWxZRFlJOXFFcnZBckFBMllQNnlaOTdGalBuMzNnCg==
+PACKAGES_USERNAME=mi-ar-oi-bb-_c-58-43-9f-de-1d-4c-93-17
+PACKAGES_PASSWORD=eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLTFkLTRjLTkzLTE3Iiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc0ODk5ODYyMiwiaWF0IjoxNzQ4OTk1MDIyLCJqdGkiOiIwYTQ2MmUzNC1iNGM4LTQ3N2YtOTQ5My0wN2M5NTA0ODdhZDMifQ.HqnmGqUTA_twxwUuNYQxSzi7HrE_x2VXavGm3UufU5z-8gyep8Xf1k3ufmLWLCR4KzLxeM6Wa26RP8Gqkdb4uCC_iBtYlpLc0y1Ig9cjE6FshWewI5FIjIRQa7o87qLmNeA6IXwV4kDT6Q7_7pQz8GkzxLwemlS1AHblrJ7xLmy2SmRIHPVJx87vrW6ijePPQxCdzXFLZrPGA3U8YjRl5lBbCE5ImMAdczEI1FbHJsDiA_inIDRnltT2nPGFe4yqhsl-UVkMDeu3e6aqm3E23uTF9gsliwtdQNNg7LnQKfBnCQqLAPgEYWp4irPkD5VsJkxOZPI6IAgGQCKM5dgOYw
+PACKAGES_ACCESS_TOKEN=eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLTFkLTRjLTkzLTE3Iiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc0ODk5ODYyMiwiaWF0IjoxNzQ4OTk1MDIyLCJqdGkiOiIwYTQ2MmUzNC1iNGM4LTQ3N2YtOTQ5My0wN2M5NTA0ODdhZDMifQ.HqnmGqUTA_twxwUuNYQxSzi7HrE_x2VXavGm3UufU5z-8gyep8Xf1k3ufmLWLCR4KzLxeM6Wa26RP8Gqkdb4uCC_iBtYlpLc0y1Ig9cjE6FshWewI5FIjIRQa7o87qLmNeA6IXwV4kDT6Q7_7pQz8GkzxLwemlS1AHblrJ7xLmy2SmRIHPVJx87vrW6ijePPQxCdzXFLZrPGA3U8YjRl5lBbCE5ImMAdczEI1FbHJsDiA_inIDRnltT2nPGFe4yqhsl-UVkMDeu3e6aqm3E23uTF9gsliwtdQNNg7LnQKfBnCQqLAPgEYWp4irPkD5VsJkxOZPI6IAgGQCKM5dgOYw
+PACKAGES_PASSWORD_BASE64=ZXlKMlpYSWlPaUl5SWl3aWRIbHdJam9pU2xkVUlpd2lZV3huSWpvaVVsTXlOVFlpTENKcmFXUWlPaUpDTUdrd1FXSjVZVEJyV0RoSGNtNDJjekZ6YjIxb1ptUm5hWGRaVWtWU1pGbFZYMk5yTTFsSE5YTkZJbjAuZXlKemRXSWlPaUpxWm1GalFEQXhaWFpyWldZeE5XRTBNWGRtTUROd09XUnJObW93YUhOMEwzVnpaWEp6TDIxcExXRnlMVzlwTFdKaUxWOWpMVFU0TFRRekxUbG1MV1JsTFRGa0xUUmpMVGt6TFRFM0lpd2ljMk53SWpvaVlYQndiR2xsWkMxd1pYSnRhWE56YVc5dWN5OW5jbTkxY0hNNmIzQmxibk52ZFhKalpTMXdkV0pzYVhOb0lpd2lZWFZrSWpvaUtrQXFJaXdpYVhOeklqb2lhbVpoWTBBd01XVjJhMlZtTVRWaE5ERjNaakF6Y0Rsa2F6WnFNR2h6ZENJc0ltVjRjQ0k2TVRjME9EazVPRFl5TWl3aWFXRjBJam94TnpRNE9UazFNREl5TENKcWRHa2lPaUl3WVRRMk1tVXpOQzFpTkdNNExUUTNOMll0T1RRNU15MHdOMk01TlRBME9EZGhaRE1pZlEuSHFubUdxVVRBX3R3eHdVdU5ZUXhTemk3SHJFX3gyVlhhdkdtM1V1ZlU1ei04Z3llcDhYZjFrM3VmbUxXTENSNEt6THhlTTZXYTI2UlA4R3FrZGI0dUNDX2lCdFlscExjMHkxSWc5Y2pFNkZzaFdld0k1RklqSVJRYTdvODdxTG1OZUE2SVh3VjRrRFQ2UTdfN3BRejhHa3p4THdlbWxTMUFIYmxySjd4TG15MlNtUklIUFZKeDg3dnJXNmlqZVBQUXhDZHpYRkxaclBHQTNVOFlqUmw1bEJiQ0U1SW1NQWRjekVJMUZiSEpzRGlBX2luSURSbmx0VDJuUEdGZTR5cWhzbC1VVmtNRGV1M2U2YXFtM0UyM3VURjlnc2xpd3RkUU5OZzdMblFLZkJuQ1FxTEFQZ0VZV3A0aXJQa0Q1VnNKa3hPWlBJNklBZ0dRQ0tNNWRnT1l3Cg==
 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 +1 @@
-machine packages.atlassian.com login mi-ar-oi-bb-_c-58-43-9f-de-93-43-9d-ab password eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLTkzLTQzLTlkLWFiIiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc0ODMxMjE5MSwiaWF0IjoxNzQ4MzA4NTkxLCJqdGkiOiI5YTE1N2E5Yi0wNzVjLTRkZDktYWI2NS0zNDlmMjQ3OTExN2UifQ.NkUZlI-xvaQLcXwSdn25c8h2iOEbyzUdfaCwHpBmpT5HZKT8FVd_lV65c-TRd5oS71q2M6VOeOls_Cf7DB_X1qGKqdB-iwgALtUtK0efog3cJ68f-d_FAHILNCsUhh7BL2goPyIU6X3S7CM8N9H4E0aLOub2QT5NG1TfKJKFbxuEPslfEhQxexTjCTdjxBZcs17OXKh5PPGlTUoAw45bV1WUDyZEpuqkKGYv6SKrFA-w0-VjwzL26zF9_hzgAnMpuxZT4AYHEX50ljslwDx0-ssmRid07xUkmKmLTCo2mNvLr6PyZQVIIO_LelYDYI9qErvArAA2YP6yZ97FjPn33g
+machine packages.atlassian.com login mi-ar-oi-bb-_c-58-43-9f-de-1d-4c-93-17 password eyJ2ZXIiOiIyIiwidHlwIjoiSldUIiwiYWxnIjoiUlMyNTYiLCJraWQiOiJCMGkwQWJ5YTBrWDhHcm42czFzb21oZmRnaXdZUkVSZFlVX2NrM1lHNXNFIn0.eyJzdWIiOiJqZmFjQDAxZXZrZWYxNWE0MXdmMDNwOWRrNmowaHN0L3VzZXJzL21pLWFyLW9pLWJiLV9jLTU4LTQzLTlmLWRlLTFkLTRjLTkzLTE3Iiwic2NwIjoiYXBwbGllZC1wZXJtaXNzaW9ucy9ncm91cHM6b3BlbnNvdXJjZS1wdWJsaXNoIiwiYXVkIjoiKkAqIiwiaXNzIjoiamZhY0AwMWV2a2VmMTVhNDF3ZjAzcDlkazZqMGhzdCIsImV4cCI6MTc0ODk5ODYyMiwiaWF0IjoxNzQ4OTk1MDIyLCJqdGkiOiIwYTQ2MmUzNC1iNGM4LTQ3N2YtOTQ5My0wN2M5NTA0ODdhZDMifQ.HqnmGqUTA_twxwUuNYQxSzi7HrE_x2VXavGm3UufU5z-8gyep8Xf1k3ufmLWLCR4KzLxeM6Wa26RP8Gqkdb4uCC_iBtYlpLc0y1Ig9cjE6FshWewI5FIjIRQa7o87qLmNeA6IXwV4kDT6Q7_7pQz8GkzxLwemlS1AHblrJ7xLmy2SmRIHPVJx87vrW6ijePPQxCdzXFLZrPGA3U8YjRl5lBbCE5ImMAdczEI1FbHJsDiA_inIDRnltT2nPGFe4yqhsl-UVkMDeu3e6aqm3E23uTF9gsliwtdQNNg7LnQKfBnCQqLAPgEYWp4irPkD5VsJkxOZPI6IAgGQCKM5dgOYw

package/bitbucket-pipelines.yml

@@ -12,11 +12,16 @@ pipelines:
               - apt-get update && apt-get install -y jq
               - npm version patch --no-git-tag-version
               - npm ci # prepublish/build also runs at this stage
+              - PACKAGE_VERSION=$(node -p "require('./package.json').version")
               - NODE_OPTIONS=--openssl-legacy-provider npm run test-sl
-              - echo "Publishing to Atlassian Artifactory npm-public..."
+              - echo "Publishing new version $PACKAGE_VERSION to Atlassian Artifactory npm-public..."
               - npm publish --ddd --userconfig=./.npmrc-public --@atlassian/atlassian-connect-js:registry="https://packages.atlassian.com/api/npm/npm-public/"
-              - PACKAGE_VERSION=$(node -p "require('./package.json').version") && git add . && git commit -m "$PACKAGE_VERSION release [skip ci]"
-              - git push origin master
+              - echo "Commiting new version $PACKAGE_VERSION to git "
+              - TOKEN=`curl -s -S -f -X POST -u "${BUILDBOT_KEY}:${BUILDBOT_SECRET}" https://bitbucket.org/site/oauth2/access_token -d grant_type=client_credentials | jq '.access_token'`
+              - 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
 
     default:
         - step:

package/dist/connect-host.js

@@ -10064,7 +10064,7 @@
       $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) {
-        $error.append("<br><p class=\"error-trace-id\">Trace: " + traceId + "</p>");
+        $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);
     };
@@ -13895,7 +13895,7 @@
    * Add version
    */
   if (!window._AP.version) {
-    window._AP.version = '5.3.191';
+    window._AP.version = '5.3.193';
   }
   host$1.defineModule('messages', messages);
   host$1.defineModule('flag', flag);

package/dist/iframe-fedramp.js

@@ -1374,7 +1374,7 @@ var AP = (function () {
       _this._eventHandlers = {};
       _this._pendingCallbacks = {};
       _this._keyListeners = [];
-      _this._version = "5.3.191";
+      _this._version = "5.3.193";
       _this._apiTampered = undefined;
       _this._isSubIframe = _this._topHost !== window.parent;
       _this._onConfirmedFns = [];

package/dist/iframe.js

@@ -1374,7 +1374,7 @@ var AP = (function () {
       _this._eventHandlers = {};
       _this._pendingCallbacks = {};
       _this._keyListeners = [];
-      _this._version = "5.3.191";
+      _this._version = "5.3.193";
       _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.191",
+  "version": "5.3.193",
   "license": "Apache-2.0",
   "description": "Atlassian Connect JavaScript bridge",
   "main": "dist/connect-host.js",

package/spec/tests/iframe_spec.js

@@ -247,7 +247,7 @@ describe('Iframe component', () => {
       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('Trace: trace-123');
+      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', () => {

package/src/host/components/iframe.js

@@ -78,7 +78,7 @@ class Iframe {
     $error.append($additionalText);
 
     if (Flags.getBooleanFeatureFlag('display_trace_for_confluence_top_errors') && traceId) {
-      $error.append(`<br><p class="error-trace-id">Trace: ${traceId}</p>`);
+      $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);