@commercetools-frontend/mc-scripts 21.18.0 → 21.19.0

package/dist/{config-sync-27736a53.cjs.prod.js → config-sync-edec607e.cjs.prod.js}

@@ -6,26 +6,28 @@ var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var omit = require('lodash/omit');
 var prompts = require('prompts');
 var chalk = require('chalk');
 var applicationConfig = require('@commercetools-frontend/application-config');
-var userAgent = require('./user-agent-d9cc2dfa.cjs.prod.js');
-var graphqlRequest = require('graphql-request');
-var constants = require('@commercetools-frontend/constants');
+var userAgent = require('./user-agent-4b9aa874.cjs.prod.js');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _someInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/some');
+var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
 var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var graphql = require('graphql');
+var graphqlRequest = require('graphql-request');
+var constants = require('@commercetools-frontend/constants');
 var _repeatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/repeat');
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
-var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
 var _reduceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/reduce');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
-var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 require('@babel/runtime-corejs3/helpers/classCallCheck');
 require('@babel/runtime-corejs3/helpers/createClass');
 require('@babel/runtime-corejs3/core-js-stable/date/now');
@@ -33,7 +35,7 @@ require('fs');
 require('path');
 require('os');
 require('@commercetools/http-user-agent');
-require('./package-663c0f80.cjs.prod.js');
+require('./package-bbd49c17.cjs.prod.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -41,59 +43,159 @@ var _regeneratorRuntime__default = /*#__PURE__*/_interopDefault(_regeneratorRunt
 var _concatInstanceProperty__default = /*#__PURE__*/_interopDefault(_concatInstanceProperty);
 var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
+var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var omit__default = /*#__PURE__*/_interopDefault(omit);
 var prompts__default = /*#__PURE__*/_interopDefault(prompts);
 var chalk__default = /*#__PURE__*/_interopDefault(chalk);
+var _someInstanceProperty__default = /*#__PURE__*/_interopDefault(_someInstanceProperty);
+var _Object$keys__default = /*#__PURE__*/_interopDefault(_Object$keys);
 var _Object$getOwnPropertySymbols__default = /*#__PURE__*/_interopDefault(_Object$getOwnPropertySymbols);
 var _Object$getOwnPropertyDescriptor__default = /*#__PURE__*/_interopDefault(_Object$getOwnPropertyDescriptor);
+var _forEachInstanceProperty__default = /*#__PURE__*/_interopDefault(_forEachInstanceProperty);
 var _Object$getOwnPropertyDescriptors__default = /*#__PURE__*/_interopDefault(_Object$getOwnPropertyDescriptors);
 var _Object$defineProperties__default = /*#__PURE__*/_interopDefault(_Object$defineProperties);
 var _Object$defineProperty__default = /*#__PURE__*/_interopDefault(_Object$defineProperty);
 var _repeatInstanceProperty__default = /*#__PURE__*/_interopDefault(_repeatInstanceProperty);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
-var _forEachInstanceProperty__default = /*#__PURE__*/_interopDefault(_forEachInstanceProperty);
 var _reduceInstanceProperty__default = /*#__PURE__*/_interopDefault(_reduceInstanceProperty);
-var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
-var _Object$keys__default = /*#__PURE__*/_interopDefault(_Object$keys);
 
+function ownKeys$1(object, enumerableOnly) { var keys = _Object$keys__default["default"](object); if (_Object$getOwnPropertySymbols__default["default"]) { var symbols = _Object$getOwnPropertySymbols__default["default"](object); enumerableOnly && (symbols = _filterInstanceProperty__default["default"](symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor__default["default"](object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var _context7, _context8; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty__default["default"](_context7 = ownKeys$1(Object(source), !0)).call(_context7, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](target, _Object$getOwnPropertyDescriptors__default["default"](source)) : _forEachInstanceProperty__default["default"](_context8 = ownKeys$1(Object(source))).call(_context8, function (key) { _Object$defineProperty__default["default"](target, key, _Object$getOwnPropertyDescriptor__default["default"](source, key)); }); } return target; }
 var FetchCustomApplicationFromCli = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchCustomApplicationFromCli" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "entryPointUriPath" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "organizationExtensionForCustomApplication" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "entryPointUriPath" }, value: { kind: "Variable", name: { kind: "Name", value: "entryPointUriPath" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "organizationId" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "application" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "entryPointUriPath" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "description" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "url" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "icon" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "permissions" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "oAuthScopes" }, arguments: [], directives: [] }] } }, { kind: "Field", name: { kind: "Name", value: "mainMenuLink" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "defaultLabel" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "permissions" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "labelAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }, { kind: "Field", name: { kind: "Name", value: "submenuLinks" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "uriPath" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "defaultLabel" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "permissions" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "labelAllLocales" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "locale" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "value" }, arguments: [], directives: [] }] } }] } }] } }] } }] } }], loc: { start: 0, end: 647, source: { body: "query FetchCustomApplicationFromCli($entryPointUriPath: String!) {\n  organizationExtensionForCustomApplication(\n    entryPointUriPath: $entryPointUriPath\n  ) {\n    organizationId\n    application {\n      id\n      entryPointUriPath\n      name\n      description\n      url\n      icon\n      permissions {\n        name\n        oAuthScopes\n      }\n      mainMenuLink {\n        defaultLabel\n        permissions\n        labelAllLocales {\n          locale\n          value\n        }\n      }\n      submenuLinks {\n        uriPath\n        defaultLabel\n        permissions\n        labelAllLocales {\n          locale\n          value\n        }\n      }\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var UpdateCustomApplicationFromCli = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "mutation", name: { kind: "Name", value: "UpdateCustomApplicationFromCli" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "organizationId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "data" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "CustomApplicationDraftDataInput" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "applicationId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "ID" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "updateCustomApplication" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "organizationId" }, value: { kind: "Variable", name: { kind: "Name", value: "organizationId" } } }, { kind: "Argument", name: { kind: "Name", value: "data" }, value: { kind: "Variable", name: { kind: "Name", value: "data" } } }, { kind: "Argument", name: { kind: "Name", value: "applicationId" }, value: { kind: "Variable", name: { kind: "Name", value: "applicationId" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 268, source: { body: "mutation UpdateCustomApplicationFromCli(\n  $organizationId: String!\n  $data: CustomApplicationDraftDataInput!\n  $applicationId: ID!\n) {\n  updateCustomApplication(\n    organizationId: $organizationId\n    data: $data\n    applicationId: $applicationId\n  ) {\n    id\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var CreateCustomApplicationFromCli = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "mutation", name: { kind: "Name", value: "CreateCustomApplicationFromCli" }, variableDefinitions: [{ kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "organizationId" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "String" } } }, directives: [] }, { kind: "VariableDefinition", variable: { kind: "Variable", name: { kind: "Name", value: "data" } }, type: { kind: "NonNullType", type: { kind: "NamedType", name: { kind: "Name", value: "CustomApplicationDraftDataInput" } } }, directives: [] }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "createCustomApplication" }, arguments: [{ kind: "Argument", name: { kind: "Name", value: "organizationId" }, value: { kind: "Variable", name: { kind: "Name", value: "organizationId" } } }, { kind: "Argument", name: { kind: "Name", value: "data" }, value: { kind: "Variable", name: { kind: "Name", value: "data" } } }], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }] } }] } }], loc: { start: 0, end: 201, source: { body: "mutation CreateCustomApplicationFromCli(\n  $organizationId: String!\n  $data: CustomApplicationDraftDataInput!\n) {\n  createCustomApplication(organizationId: $organizationId, data: $data) {\n    id\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
 var FetchMyOrganizationsFromCli = { kind: "Document", definitions: [{ kind: "OperationDefinition", operation: "query", name: { kind: "Name", value: "FetchMyOrganizationsFromCli" }, variableDefinitions: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "myOrganizations" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "total" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "results" }, arguments: [], directives: [], selectionSet: { kind: "SelectionSet", selections: [{ kind: "Field", name: { kind: "Name", value: "id" }, arguments: [], directives: [] }, { kind: "Field", name: { kind: "Name", value: "name" }, arguments: [], directives: [] }] } }] } }] } }], loc: { start: 0, end: 112, source: { body: "query FetchMyOrganizationsFromCli {\n  myOrganizations {\n    total\n    results {\n      id\n      name\n    }\n  }\n}\n", name: "GraphQL request", locationOffset: { line: 1, column: 1 } } } };
+var credentialsStorage$1 = new userAgent.CredentialsStorage();
+var client = new graphqlRequest.GraphQLClient('', // <-- Set on demand
+{
+  headers: {
+    Accept: 'application/json',
+    'Content-Type': 'application/json',
+    'x-user-agent': userAgent.userAgent
+  }
+});
 
-var graphQLClient = function graphQLClient(url, token) {
-  var target = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : constants.GRAPHQL_TARGETS.SETTINGS_SERVICE;
-  return new graphqlRequest.GraphQLClient("".concat(url, "/graphql"), {
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-      'x-graphql-target': target,
-      'x-mc-cli-access-token': token,
-      'x-user-agent': userAgent.userAgent
-    }
-  });
-};
+function requestWithTokenRetry(_x, _x2) {
+  return _requestWithTokenRetry.apply(this, arguments);
+}
+
+function _requestWithTokenRetry() {
+  _requestWithTokenRetry = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee5(document, requestOptions) {
+    var retryCount,
+        token,
+        result,
+        refreshedSessionToken,
+        refreshedSessionTokenExpiresAt,
+        _context5,
+        isUnauthorizedError,
+        _args5 = arguments;
+
+    return _regeneratorRuntime__default["default"].wrap(function _callee5$(_context6) {
+      while (1) {
+        switch (_context6.prev = _context6.next) {
+          case 0:
+            retryCount = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : 0;
+            token = credentialsStorage$1.getToken(requestOptions.mcApiUrl);
+            client.setEndpoint("".concat(requestOptions.mcApiUrl, "/graphql"));
+            client.setHeaders(requestOptions.headers);
+
+            if (token) {
+              client.setHeader('x-mc-cli-access-token', token);
+            }
+
+            _context6.prev = 5;
+            _context6.next = 8;
+            return client.rawRequest(graphql.print(document), requestOptions.variables);
+
+          case 8:
+            result = _context6.sent;
+            // In case a new session token is returned from the server, save it.
+            refreshedSessionToken = result.headers.get('x-refreshed-session-token');
+
+            if (refreshedSessionToken) {
+              console.log(chalk__default["default"].green('Session token refreshed.'));
+              console.log();
+              refreshedSessionTokenExpiresAt = result.headers.get('x-refreshed-session-token-expires-at'); // Store the updated access token.
+
+              credentialsStorage$1.setToken(requestOptions.mcApiUrl, {
+                token: refreshedSessionToken,
+                expiresAt: Number(refreshedSessionTokenExpiresAt)
+              });
+            }
+
+            return _context6.abrupt("return", result.data);
+
+          case 14:
+            _context6.prev = 14;
+            _context6.t0 = _context6["catch"](5);
+
+            if (!(_context6.t0 instanceof graphqlRequest.ClientError)) {
+              _context6.next = 22;
+              break;
+            }
+
+            if (!(retryCount === 0 && _context6.t0.response.errors && _context6.t0.response.errors.length > 0)) {
+              _context6.next = 22;
+              break;
+            }
+
+            isUnauthorizedError = _someInstanceProperty__default["default"](_context5 = _context6.t0.response.errors).call(_context5, function (graphqlError) {
+              var _graphqlError$extensi;
+
+              return ((_graphqlError$extensi = graphqlError.extensions) === null || _graphqlError$extensi === void 0 ? void 0 : _graphqlError$extensi.code) === 'UNAUTHENTICATED';
+            });
+
+            if (!isUnauthorizedError) {
+              _context6.next = 22;
+              break;
+            }
+
+            console.log(chalk__default["default"].yellow('Expired or invalid session token, attempting to retry the request with a refreshed token...'));
+            return _context6.abrupt("return", requestWithTokenRetry(document, _objectSpread$1(_objectSpread$1({}, requestOptions), {}, {
+              headers: _objectSpread$1(_objectSpread$1({}, requestOptions.headers), {}, {
+                'X-Force-Token': 'true'
+              })
+            }), retryCount + 1));
+
+          case 22:
+            throw _context6.t0;
+
+          case 23:
+          case "end":
+            return _context6.stop();
+        }
+      }
+    }, _callee5, null, [[5, 14]]);
+  }));
+  return _requestWithTokenRetry.apply(this, arguments);
+}
 
 var fetchCustomApplication = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(_ref) {
-    var mcApiUrl, token, entryPointUriPath, variables, customAppData;
+    var mcApiUrl, entryPointUriPath, customAppData;
     return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            mcApiUrl = _ref.mcApiUrl, token = _ref.token, entryPointUriPath = _ref.entryPointUriPath;
-            variables = {
-              entryPointUriPath: entryPointUriPath
-            };
-            _context.next = 4;
-            return graphQLClient(mcApiUrl, token).request(FetchCustomApplicationFromCli, variables);
-
-          case 4:
+            mcApiUrl = _ref.mcApiUrl, entryPointUriPath = _ref.entryPointUriPath;
+            _context.next = 3;
+            return requestWithTokenRetry(FetchCustomApplicationFromCli, {
+              variables: {
+                entryPointUriPath: entryPointUriPath
+              },
+              mcApiUrl: mcApiUrl,
+              headers: {
+                'x-graphql-target': constants.GRAPHQL_TARGETS.SETTINGS_SERVICE
+              }
+            });
+
+          case 3:
             customAppData = _context.sent;
             return _context.abrupt("return", customAppData.organizationExtensionForCustomApplication);
 
-          case 6:
+          case 5:
           case "end":
             return _context.stop();
         }
@@ -101,32 +203,37 @@ var fetchCustomApplication = /*#__PURE__*/function () {
     }, _callee);
   }));
 
-  return function fetchCustomApplication(_x) {
+  return function fetchCustomApplication(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
 
 var updateCustomApplication = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(_ref3) {
-    var mcApiUrl, token, applicationId, organizationId, data, variables, updatedCustomAppsData;
+    var mcApiUrl, applicationId, organizationId, data, updatedCustomAppsData;
     return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            mcApiUrl = _ref3.mcApiUrl, token = _ref3.token, applicationId = _ref3.applicationId, organizationId = _ref3.organizationId, data = _ref3.data;
-            variables = {
-              organizationId: organizationId,
-              applicationId: applicationId,
-              data: data
-            };
-            _context2.next = 4;
-            return graphQLClient(mcApiUrl, token).request(UpdateCustomApplicationFromCli, variables);
+            mcApiUrl = _ref3.mcApiUrl, applicationId = _ref3.applicationId, organizationId = _ref3.organizationId, data = _ref3.data;
+            _context2.next = 3;
+            return requestWithTokenRetry(UpdateCustomApplicationFromCli, {
+              variables: {
+                organizationId: organizationId,
+                applicationId: applicationId,
+                data: data
+              },
+              mcApiUrl: mcApiUrl,
+              headers: {
+                'x-graphql-target': constants.GRAPHQL_TARGETS.SETTINGS_SERVICE
+              }
+            });
 
-          case 4:
+          case 3:
             updatedCustomAppsData = _context2.sent;
             return _context2.abrupt("return", updatedCustomAppsData.updateCustomApplication);
 
-          case 6:
+          case 5:
           case "end":
             return _context2.stop();
         }
@@ -134,31 +241,36 @@ var updateCustomApplication = /*#__PURE__*/function () {
     }, _callee2);
   }));
 
-  return function updateCustomApplication(_x2) {
+  return function updateCustomApplication(_x4) {
     return _ref4.apply(this, arguments);
   };
 }();
 
 var createCustomApplication = /*#__PURE__*/function () {
   var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee3(_ref5) {
-    var mcApiUrl, token, organizationId, data, variables, createdCustomAppData;
+    var mcApiUrl, organizationId, data, createdCustomAppData;
     return _regeneratorRuntime__default["default"].wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            mcApiUrl = _ref5.mcApiUrl, token = _ref5.token, organizationId = _ref5.organizationId, data = _ref5.data;
-            variables = {
-              organizationId: organizationId,
-              data: data
-            };
-            _context3.next = 4;
-            return graphQLClient(mcApiUrl, token).request(CreateCustomApplicationFromCli, variables);
+            mcApiUrl = _ref5.mcApiUrl, organizationId = _ref5.organizationId, data = _ref5.data;
+            _context3.next = 3;
+            return requestWithTokenRetry(CreateCustomApplicationFromCli, {
+              variables: {
+                organizationId: organizationId,
+                data: data
+              },
+              mcApiUrl: mcApiUrl,
+              headers: {
+                'x-graphql-target': constants.GRAPHQL_TARGETS.SETTINGS_SERVICE
+              }
+            });
 
-          case 4:
+          case 3:
             createdCustomAppData = _context3.sent;
             return _context3.abrupt("return", createdCustomAppData.createCustomApplication);
 
-          case 6:
+          case 5:
           case "end":
             return _context3.stop();
         }
@@ -166,21 +278,26 @@ var createCustomApplication = /*#__PURE__*/function () {
     }, _callee3);
   }));
 
-  return function createCustomApplication(_x3) {
+  return function createCustomApplication(_x5) {
     return _ref6.apply(this, arguments);
   };
 }();
 
 var fetchUserOrganizations = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee4(_ref7) {
-    var mcApiUrl, token, userOrganizations;
+    var mcApiUrl, userOrganizations;
     return _regeneratorRuntime__default["default"].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            mcApiUrl = _ref7.mcApiUrl, token = _ref7.token;
+            mcApiUrl = _ref7.mcApiUrl;
             _context4.next = 3;
-            return graphQLClient(mcApiUrl, token, constants.GRAPHQL_TARGETS.ADMINISTRATION_SERVICE).request(FetchMyOrganizationsFromCli);
+            return requestWithTokenRetry(FetchMyOrganizationsFromCli, {
+              mcApiUrl: mcApiUrl,
+              headers: {
+                'x-graphql-target': constants.GRAPHQL_TARGETS.ADMINISTRATION_SERVICE
+              }
+            });
 
           case 3:
             userOrganizations = _context4.sent;
@@ -194,7 +311,7 @@ var fetchUserOrganizations = /*#__PURE__*/function () {
     }, _callee4);
   }));
 
-  return function fetchUserOrganizations(_x4) {
+  return function fetchUserOrganizations(_x6) {
     return _ref8.apply(this, arguments);
   };
 }();
@@ -633,225 +750,230 @@ function run(_x) {
 
 function _run() {
   _run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(options) {
-    var _context6;
+    var _context5;
 
-    var applicationConfig$1, localCustomAppData, mcApiUrl, token, fetchedCustomApplication, _context4, _context5, userOrganizations, organizationId, organizationName, _userOrganizations$re, organization, _context3, organizationChoices, _yield$prompts, selectedOrganizationId, _yield$prompts2, _confirmation, _data, createdCustomApplication, _customAppLink, customAppLink, configDiff, _yield$prompts3, confirmation, data;
+    var applicationConfig$1, localCustomAppData, mcApiUrl, isSessionValid, fetchedCustomApplication, _context4, userOrganizations, organizationId, organizationName, _userOrganizations$re, organization, _context3, organizationChoices, _yield$prompts, selectedOrganizationId, _yield$prompts2, _confirmation, _data, createdCustomApplication, _customAppLink, customAppLink, configDiff, _yield$prompts3, confirmation, data;
 
-    return _regeneratorRuntime__default["default"].wrap(function _callee$(_context7) {
+    return _regeneratorRuntime__default["default"].wrap(function _callee$(_context6) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
             applicationConfig$1 = applicationConfig.processConfig();
             localCustomAppData = applicationConfig$1.data;
             mcApiUrl = applicationConfig$1.env.mcApiUrl;
-            token = credentialsStorage.getToken(mcApiUrl);
+            console.log("Using Merchant Center environment \"".concat(chalk__default["default"].green(mcApiUrl), "\"."));
+            console.log();
+            isSessionValid = credentialsStorage.isSessionValid(mcApiUrl);
 
-            if (token) {
-              _context7.next = 6;
+            if (isSessionValid) {
+              _context6.next = 8;
               break;
             }
 
-            throw new Error("You don't have a valid session for the ".concat(mcApiUrl, " environment. Please, run the \"mc-scripts login\" command to authenticate yourself."));
+            throw new Error("You don't have a valid session. Please, run the \"mc-scripts login\" command to authenticate yourself.");
 
-          case 6:
-            _context7.next = 8;
+          case 8:
+            _context6.next = 10;
             return fetchCustomApplication({
               mcApiUrl: mcApiUrl,
-              token: token,
               entryPointUriPath: localCustomAppData.entryPointUriPath
             });
 
-          case 8:
-            fetchedCustomApplication = _context7.sent;
+          case 10:
+            fetchedCustomApplication = _context6.sent;
 
             if (fetchedCustomApplication) {
-              _context7.next = 51;
+              _context6.next = 55;
               break;
             }
 
-            _context7.next = 12;
+            _context6.next = 14;
             return fetchUserOrganizations({
-              mcApiUrl: mcApiUrl,
-              token: token
+              mcApiUrl: mcApiUrl
             });
 
-          case 12:
-            userOrganizations = _context7.sent;
+          case 14:
+            userOrganizations = _context6.sent;
 
             if (!(userOrganizations.total === 0)) {
-              _context7.next = 15;
+              _context6.next = 17;
               break;
             }
 
             throw new Error("It seems you are not an admin of any Organization. Please make sure to be part of the Administrators team of the Organization you want the Custom Application to be configured to.");
 
-          case 15:
+          case 17:
             if (!(userOrganizations.total === 1)) {
-              _context7.next = 21;
+              _context6.next = 23;
               break;
             }
 
             _userOrganizations$re = _slicedToArray(userOrganizations.results, 1), organization = _userOrganizations$re[0];
             organizationId = organization.id;
             organizationName = organization.name;
-            _context7.next = 30;
+            _context6.next = 32;
             break;
 
-          case 21:
+          case 23:
             organizationChoices = _mapInstanceProperty__default["default"](_context3 = userOrganizations.results).call(_context3, function (organization) {
               return {
                 title: organization.name,
                 value: organization.id
               };
             });
-            _context7.next = 24;
+            _context6.next = 26;
             return prompts__default["default"]({
               type: 'select',
               name: 'organizationId',
-              message: 'Select Organization',
+              message: 'Select an Organization',
               choices: organizationChoices,
               initial: 0
             });
 
-          case 24:
-            _yield$prompts = _context7.sent;
+          case 26:
+            _yield$prompts = _context6.sent;
             selectedOrganizationId = _yield$prompts.organizationId;
 
             if (selectedOrganizationId) {
-              _context7.next = 28;
+              _context6.next = 30;
               break;
             }
 
             throw new Error("No Organization selected, aborting.");
 
-          case 28:
+          case 30:
             organizationId = selectedOrganizationId;
             organizationName = _findInstanceProperty__default["default"](organizationChoices).call(organizationChoices, function (_ref) {
               var value = _ref.value;
               return value === organizationId;
             }).title;
 
-          case 30:
-            _context7.next = 32;
+          case 32:
+            _context6.next = 34;
             return prompts__default["default"]({
               type: 'text',
               name: 'confirmation',
-              message: _concatInstanceProperty__default["default"](_context4 = "You are about to create a new Custom Application in the \"".concat(organizationName, "\" organization for the ")).call(_context4, mcApiUrl, " environment. Are you sure you want to proceed?"),
+              message: _filterInstanceProperty__default["default"](_context4 = ["You are about to create a new Custom Application in the \"".concat(chalk__default["default"].green(organizationName), "\" organization. Are you sure you want to proceed?"), options.dryRun && chalk__default["default"].gray('Using "--dry-run", no data will be created.')]).call(_context4, Boolean).join('\n'),
               initial: 'yes'
             });
 
-          case 32:
-            _yield$prompts2 = _context7.sent;
+          case 34:
+            _yield$prompts2 = _context6.sent;
             _confirmation = _yield$prompts2.confirmation;
 
             if (!(!_confirmation || _confirmation.toLowerCase().charAt(0) !== 'y')) {
-              _context7.next = 37;
+              _context6.next = 39;
               break;
             }
 
             console.log(chalk__default["default"].red('Aborted.'));
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
 
-          case 37:
+          case 39:
             _data = omit__default["default"](localCustomAppData, ['id']);
 
             if (!options.dryRun) {
-              _context7.next = 43;
+              _context6.next = 46;
               break;
             }
 
-            console.log(chalk__default["default"].gray('DRY RUN mode'));
-            console.log("A new Custom Application would be created for the Organization ".concat(organizationName, " with the following payload:"));
-            console.log(_JSON$stringify__default["default"](_data));
-            return _context7.abrupt("return");
+            console.log();
+            console.log("The following payload would be used to create a new Custom Application.");
+            console.log();
+            console.log(chalk__default["default"].gray(_JSON$stringify__default["default"](_data, null, 2)));
+            return _context6.abrupt("return");
 
-          case 43:
-            _context7.next = 45;
+          case 46:
+            _context6.next = 48;
             return createCustomApplication({
               mcApiUrl: mcApiUrl,
-              token: token,
               organizationId: organizationId,
               data: _data
             });
 
-          case 45:
-            createdCustomApplication = _context7.sent;
+          case 48:
+            createdCustomApplication = _context6.sent;
 
             if (createdCustomApplication) {
-              _context7.next = 48;
+              _context6.next = 51;
               break;
             }
 
             throw new Error('Failed to create the Custom Application.');
 
-          case 48:
+          case 51:
             _customAppLink = getMcUrlLink(mcApiUrl, organizationId, createdCustomApplication.id);
-            console.log(chalk__default["default"].green(_concatInstanceProperty__default["default"](_context5 = "Custom Application created.\nThe \"applicationId\" in your local Custom Application config file should be updated with the application ID: ".concat(createdCustomApplication.id, ".\nYou can see the Custom Application data in the Merchant Center at ")).call(_context5, _customAppLink, ".")));
-            return _context7.abrupt("return");
+            console.log(chalk__default["default"].green("Custom Application created.\nPlease update the \"env.production.applicationId\" field in your local Custom Application config file with the following value: \"".concat(chalk__default["default"].green(createdCustomApplication.id), "\".")));
+            console.log("You can inspect the Custom Application data in the Merchant Center at \"".concat(chalk__default["default"].gray(_customAppLink), "\"."));
+            return _context6.abrupt("return");
 
-          case 51:
+          case 55:
             customAppLink = getMcUrlLink(mcApiUrl, fetchedCustomApplication.organizationId, fetchedCustomApplication.application.id);
             configDiff = getConfigDiff(fetchedCustomApplication.application, localCustomAppData);
 
             if (configDiff) {
-              _context7.next = 56;
+              _context6.next = 61;
               break;
             }
 
-            console.log(chalk__default["default"].green("Custom Application is already up to date.\nYou can see the Custom Application data in the Merchant Center at ".concat(customAppLink, ".")));
-            return _context7.abrupt("return");
+            console.log(chalk__default["default"].green("Custom Application up-to-date."));
+            console.log("You can inspect the Custom Application data in the Merchant Center at \"".concat(chalk__default["default"].gray(customAppLink), "\"."));
+            return _context6.abrupt("return");
 
-          case 56:
+          case 61:
+            console.log('Changes detected:');
             console.log(configDiff);
-            _context7.next = 59;
+            console.log();
+            _context6.next = 66;
             return prompts__default["default"]({
               type: 'text',
               name: 'confirmation',
-              message: _concatInstanceProperty__default["default"](_context6 = "You are about to update the Custom Application \"".concat(localCustomAppData.entryPointUriPath, "\" with the changes above, in the ")).call(_context6, mcApiUrl, " environment. Are you sure you want to proceed?"),
+              message: _filterInstanceProperty__default["default"](_context5 = ["You are about to update the Custom Application \"".concat(chalk__default["default"].green(localCustomAppData.entryPointUriPath), "\" with the changes above. Are you sure you want to proceed?"), options.dryRun && chalk__default["default"].gray('Using "--dry-run", no data will be updated.')]).call(_context5, Boolean).join('\n'),
               initial: 'yes'
             });
 
-          case 59:
-            _yield$prompts3 = _context7.sent;
+          case 66:
+            _yield$prompts3 = _context6.sent;
             confirmation = _yield$prompts3.confirmation;
 
             if (!(!confirmation || confirmation.toLowerCase().charAt(0) !== 'y')) {
-              _context7.next = 64;
+              _context6.next = 71;
               break;
             }
 
             console.log(chalk__default["default"].red('Aborted.'));
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
 
-          case 64:
+          case 71:
             data = omit__default["default"](localCustomAppData, ['id']);
 
             if (!options.dryRun) {
-              _context7.next = 70;
+              _context6.next = 78;
               break;
             }
 
-            console.log(chalk__default["default"].gray('DRY RUN mode'));
-            console.log("The Custom Application ".concat(data.name, " would be updated with the following payload:"));
-            console.log(_JSON$stringify__default["default"](data));
-            return _context7.abrupt("return");
+            console.log();
+            console.log("The following payload would be used to update the Custom Application \"".concat(chalk__default["default"].green(data.entryPointUriPath), "\"."));
+            console.log();
+            console.log(chalk__default["default"].gray(_JSON$stringify__default["default"](data, null, 2)));
+            return _context6.abrupt("return");
 
-          case 70:
-            _context7.next = 72;
+          case 78:
+            _context6.next = 80;
             return updateCustomApplication({
               mcApiUrl: mcApiUrl,
-              token: token,
               organizationId: fetchedCustomApplication.organizationId,
               data: omit__default["default"](localCustomAppData, ['id']),
               applicationId: fetchedCustomApplication.application.id
             });
 
-          case 72:
-            console.log(chalk__default["default"].green("Custom Application updated.\nYou can see the Custom Application data in the Merchant Center at ".concat(customAppLink, ".")));
+          case 80:
+            console.log(chalk__default["default"].green("Custom Application updated."));
+            console.log("You can inspect the Custom Application data in the Merchant Center at \"".concat(chalk__default["default"].gray(customAppLink), "\"."));
 
-          case 73:
+          case 82:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
       }
     }, _callee);