@blocklet/ui-react 2.13.4 → 2.13.6

package/lib/UserCenter/components/danger-zone.js

@@ -48,6 +48,7 @@ export default function DangerZone() {
           confirm: t("destroyMyself.confirm"),
           success: t("destroyMyself.success")
         },
+        // @ts-expect-error 该 did-connect 后端api 将结果塞在了 result 中，并做了加密，所以已经变成一个字符串了
         onSuccess: ({ result }, decrypt = (x) => x) => {
           const decryptResult = decrypt(result);
           resolve(decryptResult);

package/lib/UserCenter/components/third-party-login/third-party-item.js

@@ -21,10 +21,12 @@ import { useContext } from "react";
 import pick from "lodash/pick";
 import { getFederatedEnabled, getMaster } from "@arcblock/ux/lib/Util/federated";
 import { LOGIN_PROVIDER, LOGIN_PROVIDER_NAME } from "@arcblock/ux/lib/Util/constant";
+import { useStateContext } from "@arcblock/did-connect/lib/Connect/contexts/state";
 import { translations } from "../../libs/locales.js";
 export default function ThirdPartyItem({
   item
 }) {
+  const { blocklet: targetBlocklet } = useStateContext();
   const { confirmApi, confirmHolder } = useConfirm();
   const currentState = useReactive({
     loading: false
@@ -35,7 +37,7 @@ export default function ThirdPartyItem({
   });
   const { session } = useContext(SessionContext);
   const { bindOAuth, unbindOAuth, setBaseUrl, baseUrl: oauthBaseUrl } = session.useOAuth();
-  const { disconnectPasskey } = session.usePasskey();
+  const { disconnectPasskey, setTargetAppPid } = session.usePasskey();
   const iconMap = {
     // email: MailOutlineRoundedIcon,
     [LOGIN_PROVIDER.AUTH0]: MailOutlineRoundedIcon,
@@ -108,6 +110,7 @@ export default function ThirdPartyItem({
             baseUrl = master.appUrl;
           }
           setBaseUrl(baseUrl);
+          setTargetAppPid(targetBlocklet?.appPid);
           bindOAuth({
             session,
             oauthItem: {
@@ -116,6 +119,7 @@ export default function ThirdPartyItem({
             }
           }).then(resolve).catch(reject).finally(() => {
             setBaseUrl(backupBaseUrl);
+            setTargetAppPid();
           });
         }
       });

package/lib/UserSessions/components/user-sessions.d.ts

@@ -9,7 +9,7 @@ export default function UserSessions({ user, showAction, showUser, getUserSessio
     readonly getUserSessions: (params: {
         page: number;
         pageSize: number;
-        status: string;
+        status?: 'online' | 'expired';
     }) => Promise<{
         paging: {
             total: number;

package/lib/UserSessions/components/user-sessions.js

@@ -126,7 +126,11 @@ export default function UserSessions({
       },
       cancelButtonText: t("cancel"),
       onConfirm: async () => {
-        await client.user.logout({ visitorId });
+        await client.user.logout({
+          visitorId,
+          // @ts-expect-error js-sdk 1.16.43 中会包含这个参数
+          includeFederated: true
+        });
         pageState.refresh();
         confirmApi.close();
       }
@@ -147,9 +151,10 @@ export default function UserSessions({
       cancelButtonText: t("cancel"),
       onConfirm: async () => {
         await client.user.logout({
-          // @ts-expect-error js-sdk 发了新版后，会有这个类型定义
           status: filterParams.status,
-          visitorId: currentVisitorId
+          visitorId: currentVisitorId,
+          // @ts-expect-error js-sdk 1.16.43 中会包含这个参数
+          includeFederated: true
         });
         pageState.refresh();
         confirmApi.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.13.4",
+  "version": "2.13.6",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@abtnode/constant": "^1.16.42",
     "@abtnode/util": "^1.16.42",
-    "@arcblock/bridge": "^2.13.4",
-    "@arcblock/react-hooks": "^2.13.4",
+    "@arcblock/bridge": "^2.13.6",
+    "@arcblock/react-hooks": "^2.13.6",
     "@arcblock/ws": "^1.20.1",
     "@blocklet/constant": "^1.16.42",
     "@blocklet/did-space-react": "^1.0.48",
@@ -94,5 +94,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "c41220412330b6bc0cd20482261c501beb7ddd34"
+  "gitHead": "1cc41a6a655f93eb1536a9dd36fe3979a2c654c8"
 }

package/src/UserCenter/components/danger-zone.tsx

@@ -7,6 +7,7 @@ import { useConfirm } from '@arcblock/ux/lib/Dialog';
 import { SessionContext } from '@arcblock/did-connect/lib/Session';
 import { LOGIN_PROVIDER } from '@blocklet/constant';
 import Toast from '@arcblock/ux/lib/Toast';
+import type { ConnectProps } from '@arcblock/did-connect/lib/types';
 
 import { translations } from '../libs/locales';
 import { client } from '../../libs/client';
@@ -37,7 +38,7 @@ export default function DangerZone() {
     return new Promise<{ did: string }>((resolve, reject) => {
       const userDid = session?.user?.did;
       connectApi.open({
-        locale,
+        locale: locale as ConnectProps['locale'],
         action: 'destroy-myself',
         forceConnected: true,
         saveConnect: false,
@@ -53,6 +54,7 @@ export default function DangerZone() {
           confirm: t('destroyMyself.confirm'),
           success: t('destroyMyself.success'),
         },
+        // @ts-expect-error 该 did-connect 后端api 将结果塞在了 result 中，并做了加密，所以已经变成一个字符串了
         onSuccess: ({ result }: { result: string }, decrypt = (x: string) => x) => {
           const decryptResult = decrypt(result) as unknown as { did: string };
           resolve(decryptResult);
@@ -79,10 +81,7 @@ export default function DangerZone() {
         try {
           if (isNeedVerify) {
             result = await handleVerify();
-            // TODO: 等 js-sdk 新版后，就有这个方法，可以删除注释
-            // @ts-ignore
           } else if (client?.user?.destroyMyself instanceof Function) {
-            // @ts-ignore
             result = await client.user.destroyMyself();
           } else {
             Toast.error(t('notImplemented'));

package/src/UserCenter/components/settings.tsx

@@ -73,11 +73,7 @@ export default function Settings({
           <UserSessions
             user={user}
             showUser={false}
-            // FIXME: @zhanghan 暂时忽略类型不对的问题 (js-sdk 新版发布后，此处的类型就正确了)
-            // @ts-ignore
             getUserSessions={(params) => {
-              // FIXME: @zhanghan 暂时忽略类型不对的问题 (js-sdk 新版发布后，此处的类型就正确了)
-              // @ts-ignore
               return client.userSession.getMyLoginSessions({}, params);
             }}
           />

package/src/UserCenter/components/third-party-login/third-party-item.tsx

@@ -21,6 +21,7 @@ import { useContext } from 'react';
 import pick from 'lodash/pick';
 import { getFederatedEnabled, getMaster } from '@arcblock/ux/lib/Util/federated';
 import { LOGIN_PROVIDER, LOGIN_PROVIDER_NAME, OAUTH_PROVIDER } from '@arcblock/ux/lib/Util/constant';
+import { useStateContext } from '@arcblock/did-connect/lib/Connect/contexts/state';
 
 import { translations } from '../../libs/locales';
 import type { OAuthAccount, SessionContext as TSessionContext } from '../../../@types';
@@ -39,6 +40,7 @@ export default function ThirdPartyItem({
     _mainProvider?: boolean;
   };
 }) {
+  const { blocklet: targetBlocklet } = useStateContext();
   const { confirmApi, confirmHolder } = useConfirm();
   const currentState = useReactive({
     loading: false,
@@ -49,7 +51,7 @@ export default function ThirdPartyItem({
   });
   const { session } = useContext<TSessionContext>(SessionContext);
   const { bindOAuth, unbindOAuth, setBaseUrl, baseUrl: oauthBaseUrl } = session.useOAuth();
-  const { disconnectPasskey } = session.usePasskey();
+  const { disconnectPasskey, setTargetAppPid } = session.usePasskey();
 
   const iconMap = {
     // email: MailOutlineRoundedIcon,
@@ -128,6 +130,8 @@ export default function ThirdPartyItem({
             baseUrl = master.appUrl;
           }
           setBaseUrl(baseUrl);
+          // @ts-ignore
+          setTargetAppPid(targetBlocklet?.appPid);
           bindOAuth({
             session,
             oauthItem: {
@@ -139,6 +143,7 @@ export default function ThirdPartyItem({
             .catch(reject)
             .finally(() => {
               setBaseUrl(backupBaseUrl);
+              setTargetAppPid();
             });
         }
       });

package/src/UserSessions/components/user-sessions.tsx

@@ -94,7 +94,7 @@ export default function UserSessions({
   };
   readonly showAction?: boolean;
   readonly showUser?: boolean;
-  readonly getUserSessions: (params: { page: number; pageSize: number; status: string }) => Promise<{
+  readonly getUserSessions: (params: { page: number; pageSize: number; status?: 'online' | 'expired' }) => Promise<{
     paging: {
       total: number;
     };
@@ -122,7 +122,7 @@ export default function UserSessions({
     const result = await getUserSessions({
       page: filterParams.page,
       pageSize: filterParams.pageSize,
-      status: filterParams.status,
+      status: filterParams.status as 'online' | 'expired',
     });
 
     const total = result?.paging?.total || 0;
@@ -171,7 +171,11 @@ export default function UserSessions({
       },
       cancelButtonText: t('cancel'),
       onConfirm: async () => {
-        await client.user.logout({ visitorId });
+        await client.user.logout({
+          visitorId,
+          // @ts-expect-error js-sdk 1.16.43 中会包含这个参数
+          includeFederated: true,
+        });
         pageState.refresh();
         confirmApi.close();
       },
@@ -192,9 +196,10 @@ export default function UserSessions({
       cancelButtonText: t('cancel'),
       onConfirm: async () => {
         await client.user.logout({
-          // @ts-expect-error js-sdk 发了新版后，会有这个类型定义
           status: filterParams.status,
           visitorId: currentVisitorId as string,
+          // @ts-expect-error js-sdk 1.16.43 中会包含这个参数
+          includeFederated: true,
         });
         pageState.refresh();
         confirmApi.close();