@arcblock/ux 2.5.19 → 2.5.21

package/lib/SessionManager/index.js

@@ -58,10 +58,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-const USER_TYPE = Object.freeze({
-  DERIVED: 'derived',
-  WALLET: 'wallet'
-});
 const messages = {
   zh: {
     switchDid: '切换账户',
@@ -95,7 +91,7 @@ const translations = {
 };
 
 function SessionManager(_ref) {
-  var _session$user, _session$user$avatar, _session$user3, _session$user4, _session$user4$extraC, _session$user5, _session$user6, _session$user7, _session$user8, _session$user9;
+  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;
 
   let {
     session,
@@ -135,8 +131,18 @@ function SessionManager(_ref) {
     return (_session$user2 = session.user) === null || _session$user2 === void 0 ? void 0 : (_session$user2$passpo = _session$user2.passports) === null || _session$user2$passpo === void 0 ? void 0 : _session$user2$passpo.find(item => item.name === session.user.role);
   }, [session.user]);
   const browser = (0, _useBrowser.default)();
-  const hasBindOAuth = ((_session$user3 = session.user) === null || _session$user3 === void 0 ? void 0 : _session$user3.source) === USER_TYPE.WALLET && ((_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.derivedAccount);
-  const isDerivedAccount = ((_session$user5 = session.user) === null || _session$user5 === void 0 ? void 0 : _session$user5.source) === USER_TYPE.DERIVED;
+  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) || [];
+  let hasBindAccount = false;
+
+  if (isRawWalletAccount) {
+    if (connectedAccounts.some(item => item.provider !== 'wallet')) {
+      hasBindAccount = true;
+    }
+  } else if (connectedAccounts.some(item => item.provider === 'wallet')) {
+    hasBindAccount = true;
+  }
+
   const oauthConfigList = Object.entries(oauthConfigs).map(_ref2 => {
     let [key, value] = _ref2;
     return _objectSpread(_objectSpread({}, value), {}, {
@@ -228,27 +234,27 @@ function SessionManager(_ref) {
       user
     } = session;
 
-    if ((user === null || user === void 0 ? void 0 : user.source) === USER_TYPE.DERIVED) {
-      switchOAuthPassport(user);
-    } else {
+    if (isRawWalletAccount) {
       setUserOpen(false);
       session.switchPassport(function () {
         setUserOpen(false);
         onSwitchPassport(...arguments);
       });
+    } else {
+      switchOAuthPassport(user);
     }
   }
 
   function _onBindWallet() {
     setUserOpen(false);
 
-    if (session.user.source === USER_TYPE.DERIVED) {
+    if (isRawWalletAccount) {
+      bindOAuth();
+    } else {
       session.bindWallet(function () {
         setUserOpen(false);
         onBindWallet(...arguments);
       });
-    } else {
-      bindOAuth();
     }
   }
 
@@ -328,7 +334,7 @@ function SessionManager(_ref) {
                 })]
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
                 responsive: false,
-                children: isDerivedAccount ? (_session$user8 = session.user) === null || _session$user8 === void 0 ? void 0 : _session$user8.email : session.user.did
+                children: session.user.did
               })]
             }), Array.isArray(menu) && menu.map((menuItem, index) => {
               const {
@@ -386,21 +392,14 @@ function SessionManager(_ref) {
                 component: _VpnKeyOutlined.default,
                 className: "session-manager-menu-icon"
               }), message.switchPassport]
-            }), oauthConfigList.length > 0 && !hasBindOAuth && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
+            }), oauthConfigList.length > 0 && !hasBindAccount && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
               className: "session-manager-menu-item",
               onClick: _onBindWallet,
               "data-cy": "sessionManager-bind-trigger",
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.SvgIcon, {
                 component: _Link.default,
                 className: "session-manager-menu-icon"
-              }), ((_session$user9 = session.user) === null || _session$user9 === void 0 ? void 0 : _session$user9.source) === USER_TYPE.DERIVED ? "".concat(translations[locale].bind, "DID Wallet") : "".concat(translations[locale].bind).concat(translations[locale].thirdParty)]
-            }), oauthConfigList.length > 0 && hasBindOAuth && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
-              className: "session-manager-menu-item",
-              disabled: true,
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.SvgIcon, {
-                component: _Link.default,
-                className: "session-manager-menu-icon"
-              }), translations[locale].alreadyBindOAuth]
+              }), isRawWalletAccount ? "".concat(translations[locale].bind).concat(translations[locale].thirdParty) : "".concat(translations[locale].bind, "DID Wallet")]
             }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
               className: "session-manager-menu-item",
               onClick: _onLogout,
@@ -430,7 +429,6 @@ SessionManager.propTypes = {
         name: _propTypes.default.string.isRequired,
         title: _propTypes.default.string.isRequired
       })),
-      source: _propTypes.default.oneOf([USER_TYPE.DERIVED, USER_TYPE.WALLET, undefined]),
       extraConfigs: _propTypes.default.object
     }),
     login: _propTypes.default.func.isRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.5.19",
+  "version": "2.5.21",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,11 +47,11 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "64969d2186586d8fe4d43e34e82ee234d04e27be",
+  "gitHead": "e633e62c5c43e4ba063079001e226f48b84f81ab",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.19",
-    "@arcblock/react-hooks": "^2.5.19",
+    "@arcblock/icons": "^2.5.21",
+    "@arcblock/react-hooks": "^2.5.21",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/SessionManager/index.jsx

@@ -18,11 +18,6 @@ import { styled } from '../Theme';
 import DidAvatar from '../Avatar';
 import DidAddress from '../Address';
 
-const USER_TYPE = Object.freeze({
-  DERIVED: 'derived',
-  WALLET: 'wallet',
-});
-
 const messages = {
   zh: {
     switchDid: '切换账户',
@@ -88,8 +83,17 @@ function SessionManager({
   );
   const browser = useBrowser();
 
-  const hasBindOAuth = session.user?.source === USER_TYPE.WALLET && session.user?.extraConfigs?.derivedAccount;
-  const isDerivedAccount = session.user?.source === USER_TYPE.DERIVED;
+  const isRawWalletAccount =
+    !session.user?.extraConfigs?.sourceProvider || session.user?.extraConfigs?.sourceProvider === 'wallet';
+  const connectedAccounts = session.user?.extraConfigs?.connectedAccounts || [];
+  let hasBindAccount = false;
+  if (isRawWalletAccount) {
+    if (connectedAccounts.some((item) => item.provider !== 'wallet')) {
+      hasBindAccount = true;
+    }
+  } else if (connectedAccounts.some((item) => item.provider === 'wallet')) {
+    hasBindAccount = true;
+  }
 
   const oauthConfigList = Object.entries(oauthConfigs)
     .map(([key, value]) => {
@@ -158,26 +162,26 @@ function SessionManager({
   }
   function _onSwitchPassport() {
     const { user } = session;
-    if (user?.source === USER_TYPE.DERIVED) {
-      switchOAuthPassport(user);
-    } else {
+    if (isRawWalletAccount) {
       setUserOpen(false);
       session.switchPassport((...args) => {
         setUserOpen(false);
         onSwitchPassport(...args);
       });
+    } else {
+      switchOAuthPassport(user);
     }
   }
 
   function _onBindWallet() {
     setUserOpen(false);
-    if (session.user.source === USER_TYPE.DERIVED) {
+    if (isRawWalletAccount) {
+      bindOAuth();
+    } else {
       session.bindWallet((...args) => {
         setUserOpen(false);
         onBindWallet(...args);
       });
-    } else {
-      bindOAuth();
     }
   }
 
@@ -244,9 +248,7 @@ function SessionManager({
                       />
                     )}
                   </div>
-                  <DidAddress responsive={false}>
-                    {isDerivedAccount ? session.user?.email : session.user.did}
-                  </DidAddress>
+                  <DidAddress responsive={false}>{session.user.did}</DidAddress>
                 </div>
                 {Array.isArray(menu) &&
                   menu.map((menuItem, index) => {
@@ -311,21 +313,15 @@ function SessionManager({
                     {message.switchPassport}
                   </MenuItem>
                 )}
-                {oauthConfigList.length > 0 && !hasBindOAuth && (
+                {oauthConfigList.length > 0 && !hasBindAccount && (
                   <MenuItem
                     className="session-manager-menu-item"
                     onClick={_onBindWallet}
                     data-cy="sessionManager-bind-trigger">
                     <SvgIcon component={BindWalletIcon} className="session-manager-menu-icon" />
-                    {session.user?.source === USER_TYPE.DERIVED
-                      ? `${translations[locale].bind}DID Wallet`
-                      : `${translations[locale].bind}${translations[locale].thirdParty}`}
-                  </MenuItem>
-                )}
-                {oauthConfigList.length > 0 && hasBindOAuth && (
-                  <MenuItem className="session-manager-menu-item" disabled>
-                    <SvgIcon component={BindWalletIcon} className="session-manager-menu-icon" />
-                    {translations[locale].alreadyBindOAuth}
+                    {isRawWalletAccount
+                      ? `${translations[locale].bind}${translations[locale].thirdParty}`
+                      : `${translations[locale].bind}DID Wallet`}
                   </MenuItem>
                 )}
 
@@ -360,7 +356,6 @@ SessionManager.propTypes = {
           title: PropTypes.string.isRequired,
         })
       ),
-      source: PropTypes.oneOf([USER_TYPE.DERIVED, USER_TYPE.WALLET, undefined]),
       extraConfigs: PropTypes.object,
     }),
     login: PropTypes.func.isRequired,