@atlaskit/profilecard 24.19.0 → 24.20.1

package/dist/cjs/components/Agent/AgentProfileCardResourced.js

@@ -56,41 +56,57 @@ var AgentProfileCardResourced = exports.AgentProfileCardResourced = function Age
       cloudId: props.cloudId
     }),
     profileHref = _navigateToTeamsApp.href;
+
+  /**
+   * @TODO replace with `getAgentCreator` from `@atlassian/rovo-agent-components`
+   * @deprecated use `getAgentCreator` from `@atlassian/rovo-agent-components`
+   */
   var getCreator = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(creator_type, creator) {
-      var creatorInfo;
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
+      var creator_type, creator, authoringTeam, _authoringTeam$displa, _authoringTeam$profil, creatorInfo;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            creator_type = _ref.creator_type, creator = _ref.creator, authoringTeam = _ref.authoringTeam;
             if (creator) {
-              _context.next = 2;
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return", undefined);
-          case 2:
+          case 3:
             _context.t0 = creator_type;
-            _context.next = _context.t0 === 'SYSTEM' ? 5 : _context.t0 === 'THIRD_PARTY' ? 6 : _context.t0 === 'CUSTOMER' ? 7 : 19;
+            _context.next = _context.t0 === 'SYSTEM' ? 6 : _context.t0 === 'THIRD_PARTY' ? 7 : _context.t0 === 'CUSTOMER' ? 8 : 22;
             break;
-          case 5:
+          case 6:
             return _context.abrupt("return", {
               type: 'SYSTEM'
             });
-          case 6:
+          case 7:
             return _context.abrupt("return", {
               type: 'THIRD_PARTY',
               name: creator !== null && creator !== void 0 ? creator : ''
             });
-          case 7:
-            _context.prev = 7;
+          case 8:
+            _context.prev = 8;
             if (!(!creatorUserId || !props.cloudId)) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
             return _context.abrupt("return", undefined);
-          case 10:
-            _context.next = 12;
+          case 11:
+            if (!(authoringTeam && (0, _platformFeatureFlags.fg)('agent_studio_permissions_settings_m3_profiles'))) {
+              _context.next = 13;
+              break;
+            }
+            return _context.abrupt("return", {
+              type: 'CUSTOMER',
+              name: (_authoringTeam$displa = authoringTeam.displayName) !== null && _authoringTeam$displa !== void 0 ? _authoringTeam$displa : '',
+              profileLink: (_authoringTeam$profil = authoringTeam.profileUrl) !== null && _authoringTeam$profil !== void 0 ? _authoringTeam$profil : ''
+            });
+          case 13:
+            _context.next = 15;
             return props.resourceClient.getProfile(creatorUserId, props.cloudId, fireAnalytics, fireEventNext);
-          case 12:
+          case 15:
             creatorInfo = _context.sent;
             return _context.abrupt("return", {
               type: 'CUSTOMER',
@@ -98,24 +114,24 @@ var AgentProfileCardResourced = exports.AgentProfileCardResourced = function Age
               profileLink: (0, _platformFeatureFlags.fg)('platform-adopt-teams-nav-config') ? profileHref : "/people/".concat(creatorUserId),
               id: creatorUserId
             });
-          case 16:
-            _context.prev = 16;
-            _context.t1 = _context["catch"](7);
-            return _context.abrupt("return", undefined);
           case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](8);
+            return _context.abrupt("return", undefined);
+          case 22:
             return _context.abrupt("return", undefined);
-          case 20:
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[7, 16]]);
+      }, _callee, null, [[8, 19]]);
     }));
-    return function (_x, _x2) {
-      return _ref.apply(this, arguments);
+    return function (_x) {
+      return _ref2.apply(this, arguments);
     };
   }(), [creatorUserId, fireAnalytics, fireEventNext, props.cloudId, props.resourceClient, profileHref]);
   var fetchData = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-    var profileData, agentCreatorInfo;
+    var _profileResult$aggDat, _profileResult$aggDat2, profileResult, profileData, agentCreatorInfo;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -127,29 +143,34 @@ var AgentProfileCardResourced = exports.AgentProfileCardResourced = function Age
             value: props.accountId
           }, fireAnalytics, fireEventNext);
         case 4:
-          profileData = _context2.sent;
-          _context2.next = 7;
-          return getCreator(profileData === null || profileData === void 0 ? void 0 : profileData.creator_type, (profileData === null || profileData === void 0 ? void 0 : profileData.creator) || undefined);
-        case 7:
+          profileResult = _context2.sent;
+          profileData = profileResult.restData;
+          _context2.next = 8;
+          return getCreator({
+            creator_type: profileData === null || profileData === void 0 ? void 0 : profileData.creator_type,
+            creator: (profileData === null || profileData === void 0 ? void 0 : profileData.creator) || undefined,
+            authoringTeam: (_profileResult$aggDat = (_profileResult$aggDat2 = profileResult.aggData) === null || _profileResult$aggDat2 === void 0 ? void 0 : _profileResult$aggDat2.authoringTeam) !== null && _profileResult$aggDat !== void 0 ? _profileResult$aggDat : undefined
+          });
+        case 8:
           agentCreatorInfo = _context2.sent;
           setAgentData(_objectSpread(_objectSpread({}, profileData), {}, {
             creatorInfo: agentCreatorInfo
           }));
-          _context2.next = 14;
+          _context2.next = 15;
           break;
-        case 11:
-          _context2.prev = 11;
+        case 12:
+          _context2.prev = 12;
           _context2.t0 = _context2["catch"](1);
           setError(_context2.t0);
-        case 14:
-          _context2.prev = 14;
+        case 15:
+          _context2.prev = 15;
           setIsLoading(false);
-          return _context2.finish(14);
-        case 17:
+          return _context2.finish(15);
+        case 18:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 11, 14, 17]]);
+    }, _callee2, null, [[1, 12, 15, 18]]);
   })), [fireAnalytics, fireEventNext, getCreator, props.accountId, props.resourceClient]);
   (0, _react.useEffect)(function () {
     fetchData();

package/dist/cjs/components/Agent/AgentProfileCardTrigger.js

@@ -42,44 +42,60 @@ var AgentProfileCardTrigger = exports.AgentProfileCardTrigger = /*#__PURE__*/(0,
       (0, _analytics.fireEvent)(createAnalyticsEvent, payload);
     }
   }, [createAnalyticsEvent]);
+
+  /**
+   * @TODO replace with `getAgentCreator` from `@atlassian/rovo-agent-components`
+   * @deprecated use `getAgentCreator` from `@atlassian/rovo-agent-components`
+   */
   var getCreator = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(creator_type, creator) {
-      var _userId, _navigateToTeamsApp, profileHref, creatorInfo;
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref2) {
+      var creator_type, creator, authoringTeam, _userId, _authoringTeam$displa, _authoringTeam$profil, _navigateToTeamsApp, profileHref, creatorInfo;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            creator_type = _ref2.creator_type, creator = _ref2.creator, authoringTeam = _ref2.authoringTeam;
             if (creator) {
-              _context.next = 2;
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return", undefined);
-          case 2:
+          case 3:
             _context.t0 = creator_type;
-            _context.next = _context.t0 === 'SYSTEM' ? 5 : _context.t0 === 'THIRD_PARTY' ? 6 : _context.t0 === 'FORGE' ? 7 : _context.t0 === 'CUSTOMER' ? 8 : 22;
+            _context.next = _context.t0 === 'SYSTEM' ? 6 : _context.t0 === 'THIRD_PARTY' ? 7 : _context.t0 === 'FORGE' ? 8 : _context.t0 === 'CUSTOMER' ? 9 : 25;
             break;
-          case 5:
+          case 6:
             return _context.abrupt("return", {
               type: 'SYSTEM'
             });
-          case 6:
+          case 7:
             return _context.abrupt("return", {
               type: 'THIRD_PARTY',
               name: creator !== null && creator !== void 0 ? creator : ''
             });
-          case 7:
+          case 8:
             return _context.abrupt("return", {
               type: 'THIRD_PARTY',
               name: creator !== null && creator !== void 0 ? creator : ''
             });
-          case 8:
+          case 9:
             _userId = (0, _rovoAgentUtils.getAAIDFromARI)(creator) || '';
-            _context.prev = 9;
+            _context.prev = 10;
             if (!(!_userId || !cloudId)) {
-              _context.next = 12;
+              _context.next = 13;
               break;
             }
             return _context.abrupt("return", undefined);
-          case 12:
+          case 13:
+            if (!(authoringTeam && (0, _platformFeatureFlags.fg)('agent_studio_permissions_settings_m3_profiles'))) {
+              _context.next = 15;
+              break;
+            }
+            return _context.abrupt("return", {
+              type: 'CUSTOMER',
+              name: (_authoringTeam$displa = authoringTeam.displayName) !== null && _authoringTeam$displa !== void 0 ? _authoringTeam$displa : '',
+              profileLink: (_authoringTeam$profil = authoringTeam.profileUrl) !== null && _authoringTeam$profil !== void 0 ? _authoringTeam$profil : ''
+            });
+          case 15:
             _navigateToTeamsApp = (0, _navigation.navigateToTeamsApp)({
               type: 'USER',
               payload: {
@@ -87,9 +103,9 @@ var AgentProfileCardTrigger = exports.AgentProfileCardTrigger = /*#__PURE__*/(0,
               },
               cloudId: cloudId
             }), profileHref = _navigateToTeamsApp.href;
-            _context.next = 15;
+            _context.next = 18;
             return props.resourceClient.getProfile(cloudId, _userId, fireAnalytics, fireEventNext);
-          case 15:
+          case 18:
             creatorInfo = _context.sent;
             return _context.abrupt("return", {
               type: 'CUSTOMER',
@@ -97,25 +113,26 @@ var AgentProfileCardTrigger = exports.AgentProfileCardTrigger = /*#__PURE__*/(0,
               profileLink: (0, _platformFeatureFlags.fg)('platform-adopt-teams-nav-config') ? profileHref : "/people/".concat(_userId),
               id: _userId
             });
-          case 19:
-            _context.prev = 19;
-            _context.t1 = _context["catch"](9);
-            return _context.abrupt("return", undefined);
           case 22:
+            _context.prev = 22;
+            _context.t1 = _context["catch"](10);
+            return _context.abrupt("return", undefined);
+          case 25:
             return _context.abrupt("return", undefined);
-          case 23:
+          case 26:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9, 19]]);
+      }, _callee, null, [[10, 22]]);
     }));
-    return function getCreator(_x, _x2) {
-      return _ref2.apply(this, arguments);
+    return function getCreator(_x) {
+      return _ref3.apply(this, arguments);
     };
   }();
   var fetchAgentProfile = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-      var agentInfo, agentCreatorInfo;
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var _agentProfileResult$a, _agentProfileResult$a2;
+      var agentProfileResult, agentInfo, agentCreatorInfo;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -125,27 +142,32 @@ var AgentProfileCardTrigger = exports.AgentProfileCardTrigger = /*#__PURE__*/(0,
               value: userId
             }, fireAnalytics, fireEventNext);
           case 2:
-            agentInfo = _context2.sent;
-            _context2.next = 5;
-            return getCreator(agentInfo.creator_type, agentInfo.creator || undefined);
-          case 5:
+            agentProfileResult = _context2.sent;
+            agentInfo = agentProfileResult.restData;
+            _context2.next = 6;
+            return getCreator({
+              creator_type: agentInfo.creator_type,
+              creator: agentInfo.creator || undefined,
+              authoringTeam: (_agentProfileResult$a = (_agentProfileResult$a2 = agentProfileResult.aggData) === null || _agentProfileResult$a2 === void 0 ? void 0 : _agentProfileResult$a2.authoringTeam) !== null && _agentProfileResult$a !== void 0 ? _agentProfileResult$a : undefined
+            });
+          case 6:
             agentCreatorInfo = _context2.sent;
             return _context2.abrupt("return", _objectSpread(_objectSpread({}, agentInfo), {}, {
               creatorInfo: agentCreatorInfo
             }));
-          case 7:
+          case 8:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function fetchAgentProfile() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
-  var renderProfileCard = function renderProfileCard(_ref4) {
-    var profileData = _ref4.profileData,
-      error = _ref4.error;
+  var renderProfileCard = function renderProfileCard(_ref5) {
+    var profileData = _ref5.profileData,
+      error = _ref5.error;
     return /*#__PURE__*/_react.default.createElement(_react.Suspense, {
       fallback: null
     }, /*#__PURE__*/_react.default.createElement(_lazyAgentProfileCard.AgentProfileCardLazy, {

package/dist/cjs/mocks/agent-data.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.agentAggData = void 0;
 var agentData = {
   id: 'agentId',
   name: 'Profile card agent',
@@ -17,4 +17,10 @@ var agentData = {
   user_defined_conversation_starters: [],
   deactivated: false
 };
+var agentAggData = exports.agentAggData = {
+  authoringTeam: {
+    displayName: 'Profile card agent',
+    profileUrl: 'https://example.com/profile'
+  }
+};
 var _default = exports.default = agentData;

package/dist/cjs/mocks/simple-mock-clients.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,10 +16,11 @@ var _ProfileCardClient = _interopRequireDefault(require("../client/ProfileCardCl
 var _RovoAgentCardClient2 = _interopRequireDefault(require("../client/RovoAgentCardClient"));
 var _TeamProfileCardClient = _interopRequireDefault(require("../client/TeamProfileCardClient"));
 var _UserProfileCardClient = _interopRequireDefault(require("../client/UserProfileCardClient"));
-var _agentData = _interopRequireDefault(require("./agent-data"));
+var _agentData = _interopRequireWildcard(require("./agent-data"));
 var _profileData = _interopRequireDefault(require("./profile-data"));
 var _teamData = _interopRequireDefault(require("./team-data"));
 var _util = require("./util");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -68,8 +70,11 @@ var SimpleMockAgentClient = /*#__PURE__*/function (_RovoAgentCardClient) {
   (0, _inherits2.default)(SimpleMockAgentClient, _RovoAgentCardClient);
   return (0, _createClass2.default)(SimpleMockAgentClient, [{
     key: "makeRequest",
-    value: function makeRequest(id, cloudId) {
-      return Promise.resolve(_agentData.default);
+    value: function makeRequest(id) {
+      return Promise.resolve({
+        restData: _agentData.default,
+        aggData: _agentData.agentAggData
+      });
     }
   }]);
 }(_RovoAgentCardClient2.default);

package/dist/cjs/util/analytics.js

@@ -13,7 +13,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var ANALYTICS_CHANNEL = 'peopleTeams';
 var PACKAGE_META_DATA = exports.PACKAGE_META_DATA = {
   packageName: "@atlaskit/profilecard",
-  packageVersion: "24.18.1"
+  packageVersion: "24.20.0"
 };
 var runItLater = function runItLater(cb) {
   var requestIdleCallback = window.requestIdleCallback;
@@ -58,7 +58,7 @@ var createEvent = function createEvent(eventType, action, actionSubject, actionS
     actionSubjectId: actionSubjectId,
     attributes: _objectSpread(_objectSpread({
       packageName: "@atlaskit/profilecard",
-      packageVersion: "24.18.1"
+      packageVersion: "24.20.0"
     }, attributes), {}, {
       firedAt: Math.round((0, _performance.getPageTime)())
     })

package/dist/es2019/client/RovoAgentCardClient.js

@@ -3,6 +3,64 @@ import { agentRequestAnalytics, PACKAGE_META_DATA } from '../util/analytics';
 import { getPageTime } from '../util/performance';
 import CachingClient from './CachingClient';
 import { DEPRECATED_getErrorAttributes, getErrorAttributes } from './errorUtils';
+import { AGGQuery } from './graphqlUtils';
+const buildActivationIdQuery = (cloudId, product) => ({
+  query: `
+		query RovoAgentProfileCard_ActivationQuery($cloudId: ID!, $product: String!) {
+			tenantContexts(cloudIds: [$cloudId]) {
+				activationIdByProduct(product: $product) {
+					active
+				}
+			}
+		}
+	`,
+  variables: {
+    cloudId,
+    product
+  }
+});
+const buildRovoAgentQueryByAri = agentAri => ({
+  query: `
+	  query RovoAgentProfileCard_AgentQueryByAri($agentAri: ID!) {
+			agentStudio_agentById(id: $agentAri) @optIn(to: "AgentStudio") {
+			  __typename
+				... on AgentStudioAssistant {
+					authoringTeam {
+						displayName
+					}
+				}
+				... on QueryError {
+					message
+				}
+			}
+		}
+	`,
+  variables: {
+    agentAri
+  }
+});
+const buildRovoAgentQueryByAccountId = (identityAccountId, cloudId) => ({
+  query: `
+		query RovoAgentProfileCard_AgentQueryByAccountId($identityAccountId: ID!, $cloudId: ID!) {
+			agentStudio_agentByIdentityAccountId(identityAccountId: $identityAccountId, cloudId: $cloudId) @optIn(to: "AgentStudio") {
+			  __typename
+				... on AgentStudioAssistant {
+					authoringTeam {
+						displayName
+						profileUrl
+					}
+				}
+				... on QueryError {
+					message
+				}
+			}
+		}
+	`,
+  variables: {
+    identityAccountId,
+    cloudId
+  }
+});
 const createHeaders = (product, cloudId, isBodyJson) => {
   const headers = new Headers({
     'X-Product': product,
@@ -22,24 +80,92 @@ export default class RovoAgentCardClient extends CachingClient {
   basePath() {
     return fg('pt-deprecate-assistance-service') ? '/gateway/api/assist/rovo/v1/agents' : '/gateway/api/assist/agents/v1';
   }
-  makeRequest(id, cloudId) {
+  async getActivationId(cloudId, product) {
+    var _response$tenantConte, _response$tenantConte2, _response$tenantConte3, _response$tenantConte4;
+    const response = await AGGQuery('/gateway/api/graphql', buildActivationIdQuery(cloudId, product));
+    return (_response$tenantConte = response === null || response === void 0 ? void 0 : (_response$tenantConte2 = response.tenantContexts) === null || _response$tenantConte2 === void 0 ? void 0 : (_response$tenantConte3 = _response$tenantConte2[0]) === null || _response$tenantConte3 === void 0 ? void 0 : (_response$tenantConte4 = _response$tenantConte3.activationIdByProduct) === null || _response$tenantConte4 === void 0 ? void 0 : _response$tenantConte4.active) !== null && _response$tenantConte !== void 0 ? _response$tenantConte : null;
+  }
+  async getAgentByARIAgg(agentAri) {
+    var _response$agentStudio;
+    const response = await AGGQuery('/gateway/api/graphql', buildRovoAgentQueryByAri(agentAri));
+    if (((_response$agentStudio = response.agentStudio_agentById) === null || _response$agentStudio === void 0 ? void 0 : _response$agentStudio.__typename) === 'QueryError') {
+      throw new Error(`ProfileCard agentStudio_agentById returning QueryError: ${response.agentStudio_agentById.message}`);
+    }
+    return response === null || response === void 0 ? void 0 : response.agentStudio_agentById;
+  }
+  async getAgentByAccountIdAgg(identityAccountId, cloudId) {
+    var _response$agentStudio2;
+    const response = await AGGQuery('/gateway/api/graphql', buildRovoAgentQueryByAccountId(identityAccountId, cloudId));
+    if (((_response$agentStudio2 = response.agentStudio_agentByIdentityAccountId) === null || _response$agentStudio2 === void 0 ? void 0 : _response$agentStudio2.__typename) === 'QueryError') {
+      throw new Error(`ProfileCard agentStudio_agentByIdentityAccountId returning QueryError: ${response.agentStudio_agentByIdentityAccountId.message}`);
+    }
+    return response === null || response === void 0 ? void 0 : response.agentStudio_agentByIdentityAccountId;
+  }
+  makeRequest(id, analyticsNext) {
     const product = this.options.productIdentifier || 'rovo';
     const headers = createHeaders(product, this.options.cloudId);
+    let restPromise;
     if (id.type === 'identity') {
-      return fetch(new Request(`${this.basePath()}/accountid/${id.value}`, {
+      restPromise = fetch(new Request(`${this.basePath()}/accountid/${id.value}`, {
+        method: 'GET',
+        credentials: 'include',
+        mode: 'cors',
+        headers
+      })).then(response => response.json());
+    } else {
+      restPromise = fetch(new Request(`${this.basePath()}/${id.value}`, {
         method: 'GET',
         credentials: 'include',
         mode: 'cors',
         headers
       })).then(response => response.json());
     }
-    return fetch(new Request(`${this.basePath()}/${id.value}`, {
-      method: 'GET',
-      credentials: 'include',
-      mode: 'cors',
-      headers
-    })).then(response => response.json());
+    if (!fg('agent_studio_permissions_settings_m3_profiles')) {
+      return restPromise.then(restData => ({
+        restData,
+        aggData: null
+      }));
+    }
+    const aggStartTime = getPageTime();
+    const aggPromise = this.getActivationId(this.options.cloudId || '', this.options.productIdentifier || 'rovo').then(activationId => {
+      if (!activationId) {
+        throw new Error('ProfileCard Activation ID not found');
+      }
+      if (id.type === 'identity') {
+        return this.getAgentByAccountIdAgg(id.value, this.options.cloudId || '');
+      } else {
+        const agentAri = `ari:cloud:rovo::agent/activation/${activationId}/${id.value}`;
+        return this.getAgentByARIAgg(agentAri);
+      }
+    })
+    // We are not going to break the flow if the AGG endpoint fails for now
+    // @TODO once all the data moved to AGG, we can remove this catch
+    .catch(error => {
+      if (analyticsNext) {
+        analyticsNext('operational.rovoAgentProfilecard.failed.request', {
+          ...getErrorAttributes(error),
+          errorType: 'RovoAgentProfileCardAggError',
+          duration: getPageTime() - aggStartTime,
+          gateway: true,
+          firedAt: Math.round(getPageTime()),
+          ...PACKAGE_META_DATA
+        });
+      }
+      return Promise.resolve(null);
+    });
+    return Promise.all([restPromise, aggPromise]).then(([restData, aggData]) => ({
+      restData,
+      aggData
+    }));
   }
+
+  /**
+   * This function will call both REST and AGG endpoints to get the agent profile
+   * There are some data that is only available in the AGG endpoint, so we need to call both
+   * For any new fields, please only add them to the AGG endpoint
+   *
+   * @TODO migrate everything to AGG endpoint
+   */
   getProfile(id, analytics, analyticsNext) {
     if (!id.value) {
       return Promise.reject(new Error('Id is missing'));
@@ -65,7 +191,7 @@ export default class RovoAgentCardClient extends CachingClient {
           analytics(agentRequestAnalytics('triggered'));
         }
       }
-      this.makeRequest(id, this.options.cloudId || '').then(data => {
+      this.makeRequest(id, analyticsNext).then(data => {
         if (this.cache) {
           this.setCachedProfile(id.value, data);
         }

package/dist/es2019/client/getOrgIdForCloudIdFromAGG.js

@@ -6,7 +6,7 @@ const ORG_ID_FROM_CLOUD_ID_QUERY = `query OrgIdFromCloudId($cloudId: ID!) {
 }`;
 const addHeaders = headers => {
   headers.append('atl-client-name', "@atlaskit/profilecard");
-  headers.append('atl-client-version', "24.18.1");
+  headers.append('atl-client-version', "24.20.0");
   return headers;
 };
 export async function getOrgIdForCloudIdFromAGG(url, cloudId) {

package/dist/es2019/client/getTeamFromAGG.js

@@ -77,7 +77,7 @@ export const addHeaders = headers => {
   headers.append('X-ExperimentalApi', 'teams-beta');
   headers.append('X-ExperimentalApi', 'team-members-beta');
   headers.append('atl-client-name', "@atlaskit/profilecard");
-  headers.append('atl-client-version', "24.18.1");
+  headers.append('atl-client-version', "24.20.0");
   return headers;
 };
 export async function getTeamFromAGG(url, teamId, siteId) {

package/dist/es2019/components/Agent/AgentProfileCardResourced.js

@@ -33,7 +33,16 @@ export const AgentProfileCardResourced = props => {
     },
     cloudId: props.cloudId
   });
-  const getCreator = useCallback(async (creator_type, creator) => {
+
+  /**
+   * @TODO replace with `getAgentCreator` from `@atlassian/rovo-agent-components`
+   * @deprecated use `getAgentCreator` from `@atlassian/rovo-agent-components`
+   */
+  const getCreator = useCallback(async ({
+    creator_type,
+    creator,
+    authoringTeam
+  }) => {
     if (!creator) {
       return undefined;
     }
@@ -52,6 +61,14 @@ export const AgentProfileCardResourced = props => {
           if (!creatorUserId || !props.cloudId) {
             return undefined;
           }
+          if (authoringTeam && fg('agent_studio_permissions_settings_m3_profiles')) {
+            var _authoringTeam$displa, _authoringTeam$profil;
+            return {
+              type: 'CUSTOMER',
+              name: (_authoringTeam$displa = authoringTeam.displayName) !== null && _authoringTeam$displa !== void 0 ? _authoringTeam$displa : '',
+              profileLink: (_authoringTeam$profil = authoringTeam.profileUrl) !== null && _authoringTeam$profil !== void 0 ? _authoringTeam$profil : ''
+            };
+          }
           const creatorInfo = await props.resourceClient.getProfile(creatorUserId, props.cloudId, fireAnalytics, fireEventNext);
           return {
             type: 'CUSTOMER',
@@ -69,11 +86,17 @@ export const AgentProfileCardResourced = props => {
   const fetchData = useCallback(async () => {
     setIsLoading(true);
     try {
-      const profileData = await props.resourceClient.getRovoAgentProfile({
+      var _profileResult$aggDat, _profileResult$aggDat2;
+      const profileResult = await props.resourceClient.getRovoAgentProfile({
         type: 'identity',
         value: props.accountId
       }, fireAnalytics, fireEventNext);
-      const agentCreatorInfo = await getCreator(profileData === null || profileData === void 0 ? void 0 : profileData.creator_type, (profileData === null || profileData === void 0 ? void 0 : profileData.creator) || undefined);
+      const profileData = profileResult.restData;
+      const agentCreatorInfo = await getCreator({
+        creator_type: profileData === null || profileData === void 0 ? void 0 : profileData.creator_type,
+        creator: (profileData === null || profileData === void 0 ? void 0 : profileData.creator) || undefined,
+        authoringTeam: (_profileResult$aggDat = (_profileResult$aggDat2 = profileResult.aggData) === null || _profileResult$aggDat2 === void 0 ? void 0 : _profileResult$aggDat2.authoringTeam) !== null && _profileResult$aggDat !== void 0 ? _profileResult$aggDat : undefined
+      });
       setAgentData({
         ...profileData,
         creatorInfo: agentCreatorInfo