@arcblock/ux 2.5.36 → 2.5.38

package/lib/SessionManager/index.js

@@ -92,8 +92,20 @@ const translations = {
   }
 };
 
+const getConnectedAccounts = user => {
+  var _user$extraConfigs;
+
+  return (user === null || user === void 0 ? void 0 : user.connectedAccounts) || (user === null || user === void 0 ? void 0 : (_user$extraConfigs = user.extraConfigs) === null || _user$extraConfigs === void 0 ? void 0 : _user$extraConfigs.connectedAccounts) || [];
+};
+
+const getSourceProvider = user => {
+  var _user$extraConfigs2;
+
+  return (user === null || user === void 0 ? void 0 : user.sourceProvider) || (user === null || user === void 0 ? void 0 : (_user$extraConfigs2 = user.extraConfigs) === null || _user$extraConfigs2 === void 0 ? void 0 : _user$extraConfigs2.sourceProvider) || 'wallet';
+};
+
 function SessionManager(_ref) {
-  var _session$user, _session$user$avatar, _session$user3, _session$user3$extraC, _session$user4, _session$user4$extraC, _session$user5, _session$user5$extraC, _session$user6, _session$user7;
+  var _session$user, _session$user$avatar, _session$user3, _session$user4;
 
   let {
     session,
@@ -138,8 +150,8 @@ function SessionManager(_ref) {
   } = (0, _User.useDid)({
     session
   });
-  const isRawWalletAccount = !((_session$user3 = session.user) !== null && _session$user3 !== void 0 && (_session$user3$extraC = _session$user3.extraConfigs) !== null && _session$user3$extraC !== void 0 && _session$user3$extraC.sourceProvider) || ((_session$user4 = session.user) === null || _session$user4 === void 0 ? void 0 : (_session$user4$extraC = _session$user4.extraConfigs) === null || _session$user4$extraC === void 0 ? void 0 : _session$user4$extraC.sourceProvider) === 'wallet';
-  const connectedAccounts = ((_session$user5 = session.user) === null || _session$user5 === void 0 ? void 0 : (_session$user5$extraC = _session$user5.extraConfigs) === null || _session$user5$extraC === void 0 ? void 0 : _session$user5$extraC.connectedAccounts) || [];
+  const isRawWalletAccount = getSourceProvider(session.user) === 'wallet';
+  const connectedAccounts = getConnectedAccounts(session.user);
   let hasBindWallet = false;
   let hasBindAccount = false;
 
@@ -330,8 +342,8 @@ function SessionManager(_ref) {
                 className: "session-manager-user-name",
                 children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
                   children: session.user.fullName
-                }), !!showRole && ((currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user6 = session.user) === null || _session$user6 === void 0 ? void 0 : _session$user6.role.toUpperCase())) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
-                  label: (currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user7 = session.user) === null || _session$user7 === void 0 ? void 0 : _session$user7.role.toUpperCase()),
+                }), !!showRole && ((currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user3 = session.user) === null || _session$user3 === void 0 ? void 0 : _session$user3.role.toUpperCase())) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
+                  label: (currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user4 = session.user) === null || _session$user4 === void 0 ? void 0 : _session$user4.role.toUpperCase()),
                   size: "small",
                   variant: "outlined",
                   sx: {
@@ -436,10 +448,17 @@ SessionManager.propTypes = {
       fullName: _propTypes.default.string,
       email: _propTypes.default.string,
       avatar: _propTypes.default.string,
+      sourceProvider: _propTypes.default.string,
+      connectedAccounts: _propTypes.default.arrayOf(_propTypes.default.shape({
+        provider: _propTypes.default.string.isRequired,
+        did: _propTypes.default.string.isRequired,
+        id: _propTypes.default.string
+      })),
       passports: _propTypes.default.arrayOf(_propTypes.default.shape({
         name: _propTypes.default.string.isRequired,
         title: _propTypes.default.string.isRequired
       })),
+      // Deprecated
       extraConfigs: _propTypes.default.object
     }),
     login: _propTypes.default.func.isRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.5.36",
+  "version": "2.5.38",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -45,11 +45,11 @@
   "peerDependencies": {
     "react": ">=18.1.0"
   },
-  "gitHead": "e48a6bcadaeabac677011d738aa52b51cba74cdc",
+  "gitHead": "86752e50a270541fbdcdd84713e84705b92e790a",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.36",
-    "@arcblock/react-hooks": "^2.5.36",
+    "@arcblock/icons": "^2.5.38",
+    "@arcblock/react-hooks": "^2.5.38",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/SessionManager/index.jsx

@@ -51,6 +51,9 @@ const translations = {
   },
 };
 
+const getConnectedAccounts = (user) => user?.connectedAccounts || user?.extraConfigs?.connectedAccounts || [];
+const getSourceProvider = (user) => user?.sourceProvider || user?.extraConfigs?.sourceProvider || 'wallet';
+
 function SessionManager({
   session,
   locale,
@@ -85,9 +88,8 @@ function SessionManager({
   const browser = useBrowser();
   const { walletDid } = useDid({ session });
 
-  const isRawWalletAccount =
-    !session.user?.extraConfigs?.sourceProvider || session.user?.extraConfigs?.sourceProvider === 'wallet';
-  const connectedAccounts = session.user?.extraConfigs?.connectedAccounts || [];
+  const isRawWalletAccount = getSourceProvider(session.user) === 'wallet';
+  const connectedAccounts = getConnectedAccounts(session.user);
   let hasBindWallet = false;
   let hasBindAccount = false;
   if (isRawWalletAccount) {
@@ -355,12 +357,21 @@ SessionManager.propTypes = {
       fullName: PropTypes.string,
       email: PropTypes.string,
       avatar: PropTypes.string,
+      sourceProvider: PropTypes.string,
+      connectedAccounts: PropTypes.arrayOf(
+        PropTypes.shape({
+          provider: PropTypes.string.isRequired,
+          did: PropTypes.string.isRequired,
+          id: PropTypes.string,
+        })
+      ),
       passports: PropTypes.arrayOf(
         PropTypes.shape({
           name: PropTypes.string.isRequired,
           title: PropTypes.string.isRequired,
         })
       ),
+      // Deprecated
       extraConfigs: PropTypes.object,
     }),
     login: PropTypes.func.isRequired,