fix: get domain list with iam and hide share dir for iam and share bu…

…cket
qiniu · Jun 26, 2024 · 8459721 · 8459721
1 parent a746d12
commit 8459721
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kodo-browser",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "license": "Apache-2.0",
   "author": {
     "name": "Rong Zhou",
@@ -111,7 +111,7 @@
     "form-data": "^4.0.0",
     "js-base64": "^3.4.5",
     "js-md5": "^0.7.3",
-    "kodo-s3-adapter-sdk": "0.6.0",
+    "kodo-s3-adapter-sdk": "0.6.1",
     "lockfile": "^1.0.4",
     "lodash": "^4.17.21",
     "mime": "^2.3.1",

diff --git a/src/renderer/modules/auth/functions.ts b/src/renderer/modules/auth/functions.ts
@@ -3,7 +3,7 @@ import lodash from "lodash";
 import * as LocalLogger from "@renderer/modules/local-logger";
 import * as QiniuClient from "@renderer/modules/qiniu-client";
 
-import {AkItem, EndpointType, ShareSession} from "./types";
+import {AkItem, AkSpecialType, EndpointType, ShareSession} from "./types";
 import {authPersistence} from "./persistence";
 
 let currentUser: AkItem | null = null;
@@ -32,6 +32,7 @@ export async function signIn(akItem: AkItem, remember: boolean) {
     QiniuClient.clearAllCache();
     throw err;
   }
+  akItem.specialType = getAkSpecialType(akItem.accessKey);
   currentUser = akItem;
   if (remember) {
     await authPersistence.save(akItem);
@@ -78,6 +79,7 @@ export async function signInWithShareLink({
     endpointType: EndpointType.ShareSession,
     accessKey: verifyShareResult.federated_ak,
     accessSecret: verifyShareResult.federated_sk,
+    specialType: getAkSpecialType(verifyShareResult.federated_ak),
   };
   shareSession = {
     sessionToken: verifyShareResult.session_token,
@@ -108,6 +110,7 @@ export async function signInWithShareSession({
   currentUser = {
     ...akItem,
     endpointType: EndpointType.ShareSession,
+    specialType: getAkSpecialType(akItem.accessKey),
   };
   shareSession = session;
   // do not remember always;
@@ -124,6 +127,15 @@ export function getCurrentUser(): AkItem | null {
   return currentUser;
 }
 
+export function getAkSpecialType(accessKey: string = ""): AkSpecialType | undefined {
+  if (accessKey.length === 44 && accessKey.startsWith("IAM-")) {
+    return AkSpecialType.IAM;
+  } else if (accessKey.startsWith("STS-")) {
+    return AkSpecialType.STS;
+  }
+  return;
+}
+
 export function getShareSession(): ShareSession | null {
   return shareSession;
 }

diff --git a/src/renderer/modules/auth/types.ts b/src/renderer/modules/auth/types.ts
@@ -4,10 +4,16 @@ export enum EndpointType {
   ShareSession = "shareSession",
 }
 
+export enum AkSpecialType {
+  IAM = "IAM",
+  STS = "STS",
+}
+
 export interface AkItem {
   endpointType: EndpointType,
   accessKey: string,
   accessSecret: string,
+  specialType?: AkSpecialType,
   description?: string,
 }
 

diff --git a/src/renderer/pages/browse/files/file-table/columns/file-operations.tsx b/src/renderer/pages/browse/files/file-table/columns/file-operations.tsx
@@ -31,7 +31,12 @@ const FileOperations: React.FC<RowCellDataProps & FileOperationsCellCallbackProp
   const canRestore = isFile && ["Archive", "DeepArchive"].includes(file.storageClass);
 
   const shouldShowShareDirButton = useMemo(() => {
-    if (isFile || !currentUser) {
+    if (
+      isFile ||
+      !currentUser ||
+      currentUser.specialType ||
+      bucketGrantedPermission
+    ) {
       return false;
     }