@arcblock/ux 2.5.62 → 2.5.64

package/lib/SessionManager/index.js

@@ -216,27 +216,31 @@ function SessionManager(_ref) {
   }
   function _onSwitchPassport() {
     const {
-      user
+      user,
+      provider
     } = session;
-    if (isRawWalletAccount) {
+    if (provider === 'auth0') {
+      switchOAuthPassport(user);
+    } else {
       setUserOpen(false);
       session.switchPassport(function () {
         setUserOpen(false);
         onSwitchPassport(...arguments);
       });
-    } else {
-      switchOAuthPassport(user);
     }
   }
   function _onBindWallet() {
+    const {
+      provider
+    } = session;
     setUserOpen(false);
-    if (isRawWalletAccount) {
-      bindOAuth();
-    } else {
+    if (provider === 'auth0') {
       session.bindWallet(function () {
         setUserOpen(false);
         onBindWallet(...arguments);
       });
+    } else {
+      bindOAuth();
     }
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -362,7 +366,7 @@ function SessionManager(_ref) {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.SvgIcon, {
             component: _Link.default,
             className: "session-manager-menu-icon"
-          }), isRawWalletAccount ? "".concat(translation.bind).concat(translation.thirdParty) : "".concat(translation.bind, "DID Wallet")]
+          }), session.provider === 'auth0' ? "".concat(translation.bind, "DID Wallet") : "".concat(translation.bind).concat(translation.thirdParty)]
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
           className: "session-manager-menu-item",
           onClick: _onLogout,
@@ -380,7 +384,7 @@ function SessionManager(_ref) {
 SessionManager.propTypes = {
   session: _propTypes.default.shape({
     federatedMaster: _propTypes.default.object,
-    provider: _propTypes.default.oneOf(['wallet', 'federated', 'auth0']),
+    provider: _propTypes.default.oneOf(['wallet', 'federated', 'auth0', '']),
     user: _propTypes.default.shape({
       did: _propTypes.default.string.isRequired,
       role: _propTypes.default.string.isRequired,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.5.62",
+  "version": "2.5.64",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,11 +47,11 @@
   "peerDependencies": {
     "react": ">=18.1.0"
   },
-  "gitHead": "c3067dee4e427fcedbe7e2d254159dd99606823c",
+  "gitHead": "1f4e914738a7b804045c13e36be44d2fdad032cb",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.5.62",
-    "@arcblock/react-hooks": "^2.5.62",
+    "@arcblock/icons": "^2.5.64",
+    "@arcblock/react-hooks": "^2.5.64",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/SessionManager/index.jsx

@@ -171,27 +171,28 @@ function SessionManager({
     });
   }
   function _onSwitchPassport() {
-    const { user } = session;
-    if (isRawWalletAccount) {
+    const { user, provider } = session;
+    if (provider === 'auth0') {
+      switchOAuthPassport(user);
+    } else {
       setUserOpen(false);
       session.switchPassport((...args) => {
         setUserOpen(false);
         onSwitchPassport(...args);
       });
-    } else {
-      switchOAuthPassport(user);
     }
   }
 
   function _onBindWallet() {
+    const { provider } = session;
     setUserOpen(false);
-    if (isRawWalletAccount) {
-      bindOAuth();
-    } else {
+    if (provider === 'auth0') {
       session.bindWallet((...args) => {
         setUserOpen(false);
         onBindWallet(...args);
       });
+    } else {
+      bindOAuth();
     }
   }
 
@@ -305,7 +306,9 @@ function SessionManager({
               onClick={_onBindWallet}
               data-cy="sessionManager-bind-trigger">
               <SvgIcon component={BindWalletIcon} className="session-manager-menu-icon" />
-              {isRawWalletAccount ? `${translation.bind}${translation.thirdParty}` : `${translation.bind}DID Wallet`}
+              {session.provider === 'auth0'
+                ? `${translation.bind}DID Wallet`
+                : `${translation.bind}${translation.thirdParty}`}
             </MenuItem>
           )}
 
@@ -326,7 +329,7 @@ function SessionManager({
 SessionManager.propTypes = {
   session: PropTypes.shape({
     federatedMaster: PropTypes.object,
-    provider: PropTypes.oneOf(['wallet', 'federated', 'auth0']),
+    provider: PropTypes.oneOf(['wallet', 'federated', 'auth0', '']),
     user: PropTypes.shape({
       did: PropTypes.string.isRequired,
       role: PropTypes.string.isRequired,