@abtnode/ux 1.16.14-beta-dc99d0a2 → 1.16.14-beta-dd4f6a50

package/lib/blocklet/oauth/federated-detail-dialog.js

@@ -131,7 +131,7 @@ const FederatedDetailDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =
     await api.auditFederatedLogin({
       input: {
         appId: state.data.appId,
-        did: blocklet.meta.did,
+        did: blocklet.appPid,
         status: 'rejected'
       }
     });
@@ -140,8 +140,8 @@ const FederatedDetailDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =
   const onApprove = (0, _ahooks.useMemoizedFn)(async () => {
     await api.auditFederatedLogin({
       input: {
-        appId: state.data.appId,
-        did: blocklet.meta.did,
+        memberPid: state.data.appId,
+        did: blocklet.appPid,
         status: 'approved'
       }
     });

package/lib/blocklet/oauth/federated-join-dialog.js

@@ -19,7 +19,7 @@ var _node = require("../../contexts/node");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const FederatedJoinDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
-  var _blocklet$meta, _theme$transitions, _theme$transitions$du;
+  var _theme$transitions, _theme$transitions$du;
   const {
     t
   } = (0, _react.useContext)(_context.LocaleContext);
@@ -29,7 +29,7 @@ const FederatedJoinDialog = /*#__PURE__*/(0, _react.forwardRef)((props, ref) =>
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
-  const did = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did;
+  const did = blocklet === null || blocklet === void 0 ? void 0 : blocklet.appPid;
   const theme = (0, _Theme.useTheme)();
   const leavingScreen = (theme === null || theme === void 0 ? void 0 : (_theme$transitions = theme.transitions) === null || _theme$transitions === void 0 ? void 0 : (_theme$transitions$du = _theme$transitions.duration) === null || _theme$transitions$du === void 0 ? void 0 : _theme$transitions$du.leavingScreen) || 300;
   const state = (0, _ahooks.useReactive)({

package/lib/blocklet/oauth/federated-site-list.js

@@ -70,8 +70,8 @@ function FederatedSiteList(_ref) {
       async onConfirm(close) {
         await api.auditFederatedLogin({
           input: {
-            appId: row.appId,
-            did: blocklet.meta.did,
+            memberPid: row.appPid,
+            did: blocklet.appPid,
             status: 'revoked'
           }
         });
@@ -86,8 +86,8 @@ function FederatedSiteList(_ref) {
       async onConfirm(close) {
         await api.auditFederatedLogin({
           input: {
-            appId: row.appId,
-            did: blocklet.meta.did,
+            memberPid: row.appPid,
+            did: blocklet.appPid,
             status: 'approved'
           }
         });
@@ -259,7 +259,7 @@ function FederatedSiteList(_ref) {
       async onConfirm(close) {
         await api.configFederated({
           input: {
-            did: blocklet.meta.did,
+            did: blocklet.appPid,
             autoLogin: !checked
           }
         });
@@ -268,19 +268,53 @@ function FederatedSiteList(_ref) {
       }
     });
   }, [setChecked, checked]);
+  const quitFederatedLogin = (0, _ahooks.useMemoizedFn)(() => {
+    confirmApi.open({
+      title: t('federated.quitFederatedLogin'),
+      content: t('federated.quitFederatedLoginDescription'),
+      async onConfirm(close) {
+        await api.quitFederatedLogin({
+          input: {
+            did: blocklet.appPid
+          }
+        });
+        close();
+      }
+    });
+  });
+  const customButtons = [];
+  if (mode !== 'master') {
+    customButtons.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      size: "small",
+      variant: "contained",
+      color: "error",
+      onClick: quitFederatedLogin,
+      sx: {
+        ml: 1
+      },
+      children: t('federated.quitFederatedLogin')
+    }));
+  } else {
+    customButtons.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      size: "small",
+      variant: "contained",
+      onClick: showInvite,
+      sx: {
+        ml: 1
+      },
+      children: t('federated.inviteJoinFederatedLogin')
+    }));
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Datatable.default, {
       className: "main-table",
       locale: locale,
       data: federatedSites,
       columns: columns,
+      customButtons: customButtons,
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         className: "table-toolbar-left",
-        children: mode === 'master' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
-          variant: "contained",
-          onClick: showInvite,
-          children: t('federated.inviteJoinFederatedLogin')
-        }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
+        children: mode === 'master' ? t('oauth.federated') : /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
           sx: {
             ml: 0,
             '& span.MuiSwitch-switchBase': {

package/lib/locales/en.js

@@ -1491,6 +1491,8 @@ module.exports = {
     federatedLogin: 'Federated login',
     joinFederatedLogin: 'Join federated login',
     joinFederatedLoginDescription: 'Please enter the federated login address provided by Master Blocklet to join the federated login',
+    quitFederatedLogin: 'Quit federated login',
+    quitFederatedLoginDescription: 'After quit federated login, normal login is always available',
     federatedJoinAppUrl: 'Federated login join appUrl',
     federatedJoinAppUrlRequired: 'Please input federated login join appUrl',
     failedToGetFederatedLoginAppUrl: 'Failed to get federated login join appUrl',

package/lib/locales/zh.js

@@ -1494,6 +1494,8 @@ module.exports = {
     federatedLogin: '统一登录',
     joinFederatedLogin: '加入统一登录',
     joinFederatedLoginDescription: '请输入 Master Blocklet 提供的统一登录地址以加入统一登录',
+    quitFederatedLogin: '退出统一登录',
+    quitFederatedLoginDescription: '退出统一登录后，你仍可以使用普通的登录方式来登录',
     federatedJoinAppUrl: '统一登录地址',
     federatedJoinAppUrlRequired: '请输入统一登录地址',
     failedToGetFederatedLoginAppUrl: '获取统一登录地址失败',

package/lib/team/members/index.js

@@ -299,7 +299,8 @@ function MemberList(_ref2) {
         const source = e || _constant.USER_TYPE.WALLET;
         const providerNameMap = {
           auth0: 'Auth0',
-          wallet: 'DID wallet'
+          wallet: 'DID wallet',
+          federated: 'Federated'
         };
         return providerNameMap[source] || source;
       }

package/lib/team/members/member.js

@@ -169,7 +169,8 @@ function Member(_ref3) {
   };
   const providerNameMap = {
     auth0: 'Auth0',
-    wallet: 'DID wallet'
+    wallet: 'DID wallet',
+    federated: 'Federated'
   };
 
   // tab

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.14-beta-dc99d0a2",
+  "version": "1.16.14-beta-dd4f6a50",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,9 +23,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.14-beta-dc99d0a2",
-    "@abtnode/constant": "1.16.14-beta-dc99d0a2",
-    "@abtnode/util": "1.16.14-beta-dc99d0a2",
+    "@abtnode/auth": "1.16.14-beta-dd4f6a50",
+    "@abtnode/constant": "1.16.14-beta-dd4f6a50",
+    "@abtnode/util": "1.16.14-beta-dd4f6a50",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.87",
     "@arcblock/did-connect": "^2.5.65",
@@ -35,10 +35,10 @@
     "@arcblock/react-hooks": "^2.5.65",
     "@arcblock/terminal": "^2.5.65",
     "@arcblock/ux": "^2.5.65",
-    "@blocklet/constant": "1.16.14-beta-dc99d0a2",
+    "@blocklet/constant": "1.16.14-beta-dd4f6a50",
     "@blocklet/launcher-layout": "2.1.55",
     "@blocklet/list": "^0.12.10",
-    "@blocklet/meta": "1.16.14-beta-dc99d0a2",
+    "@blocklet/meta": "1.16.14-beta-dd4f6a50",
     "@blocklet/ui-react": "^2.5.65",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -97,5 +97,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "a00766d660ede97e2036f3a785f4f5cfb2e6d870"
+  "gitHead": "fb3858f842b221f0a8c298307b393d55c555af45"
 }