fix(dcellar-web-ui): share file and offchainauth expired

node-real · Jul 31, 2023 · be5eefa · be5eefa
1 parent 5c04a11
commit be5eefa
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 16 deletions.
diff --git a/apps/dcellar-web-ui/src/facade/error.ts b/apps/dcellar-web-ui/src/facade/error.ts
@@ -1,4 +1,4 @@
-import { ErrorMsgMap } from "@/context/WalletConnectContext/error/error";
+import { ErrorMsgMap } from '@/context/WalletConnectContext/error/error';
 
 export type ErrorMsg = string;
 
@@ -56,9 +56,14 @@ export const createTxFault = (e: any): ErrorResponse => {
   console.error('CreateTxFault', e);
   // todo refactor
   if (
-    code === -1 &&
-    (e as any).statusCode === 500 &&
-    ['Get create object approval error.', 'Get create bucket approval error.'].includes(message)
+    (code === -1 &&
+      (e as any).statusCode === 500 &&
+      [
+        'Get create object approval error.',
+        'Get create bucket approval error.',
+        'user public key is expired',
+      ].includes(message)) ||
+    ((e as any).statusCode === 400 && ['user public key is expired'].includes(message))
   ) {
     return [null, E_OFF_CHAIN_AUTH];
   }
@@ -96,4 +101,3 @@ export const commonFault = (e: any): ErrorResponse => {
   }
   return [null, E_UNKNOWN_ERROR];
 };
-
diff --git a/apps/dcellar-web-ui/src/modules/buckets/List/components/CreateBucket.tsx b/apps/dcellar-web-ui/src/modules/buckets/List/components/CreateBucket.tsx
@@ -210,6 +210,11 @@ export const CreateBucket = ({ isOpen, onClose, refetch }: Props) => {
         isLoading: false,
       };
       if (e?.message) {
+        if (e.message.includes('user public key is expired')) {
+          onClose();
+          setOpenAuthModal();
+          return;
+        }
         if (e.message.includes('Bucket already exists') || e.message.includes('repeated bucket')) {
           result['name'] = {
             available: false,

diff --git a/apps/dcellar-web-ui/src/modules/share/SharedFile.tsx b/apps/dcellar-web-ui/src/modules/share/SharedFile.tsx
@@ -19,6 +19,7 @@ import { setupBucketQuota } from '@/store/slices/bucket';
 import { useOffChainAuth } from '@/hooks/useOffChainAuth';
 import { getSpUrlByBucketName, getVirtualGroupFamily } from '@/facade/virtual-group';
 import { SpItem } from '@/store/slices/sp';
+import { VisibilityType } from '../file/type';
 
 interface SharedFileProps {
   fileName: string;
@@ -36,8 +37,7 @@ export const SharedFile = memo<SharedFileProps>(function SharedFile({
   loginAccount,
 }) {
   const dispatch = useAppDispatch();
-  const { oneSp, spInfo, allSps } = useAppSelector((root) => root.sp);
-  const { bucketInfo } = useAppSelector((root) => root.bucket);
+  const { allSps } = useAppSelector((root) => root.sp);
   const [action, setAction] = useState<ActionType>('');
   const [statusModalIcon, setStatusModalIcon] = useState<string>('');
   const [statusModalTitle, setStatusModalTitle] = useState('');
@@ -85,15 +85,18 @@ export const SharedFile = memo<SharedFileProps>(function SharedFile({
     if (!primarySp) return onError(E_SP_NOT_FOUND);
     const operator = primarySp.operatorAddress;
     const { seedString } = await dispatch(getSpOffChainData(loginAccount, operator));
-    const [_, accessError] = await getCanObjectAccess(
-      bucketName,
-      objectName,
-      primarySpEndpoint,
-      loginAccount,
-      seedString,
-    );
-    const errType = accessError as ShareErrorType;
-    if (errType) return onError(errType);
+    const isPrivate = objectInfo.visibility === VisibilityType.VISIBILITY_TYPE_PRIVATE;
+    if (isPrivate) {
+      const [_, accessError] = await getCanObjectAccess(
+        bucketName,
+        objectName,
+        primarySpEndpoint,
+        loginAccount,
+        seedString,
+      );
+      const errType = accessError as ShareErrorType;
+      if (errType) return onError(errType);
+    }
     const params = {
       primarySp,
       objectInfo,

diff --git a/apps/dcellar-web-ui/src/pages/share/index.tsx b/apps/dcellar-web-ui/src/pages/share/index.tsx
@@ -24,6 +24,7 @@ import { useAppDispatch, useAppSelector } from '@/store';
 import { getSpOffChainData } from '@/store/slices/persist';
 import { getSpUrlByBucketName, getVirtualGroupFamily } from '@/facade/virtual-group';
 import { SpItem } from '@/store/slices/sp';
+import { headObject } from '@/facade/object';
 
 const Container = styled.main`
   min-height: calc(100vh - 48px);
@@ -53,6 +54,13 @@ const SharePage: NextPage<InferGetServerSidePropsType<typeof getServerSideProps>
       seedString,
       address: loginAccount,
     }
+    if (!loginAccount) {
+      const objectInfo = await headObject(bucketName, objectName);
+      setObjectInfo(objectInfo);
+      setQuotaData({} as IQuotaProps);
+      return;
+    }
+
     const [objectInfo, quotaData] = await getObjectInfoAndBucketQuota(params);
     setObjectInfo(objectInfo);
     setQuotaData(quotaData);