Modify saveOnDisk to accept blobs

gravitational · Oct 31, 2024 · 5d0f966 · 5d0f966
1 parent efcd60b
commit 5d0f966
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/lib/modules/modules.go b/lib/modules/modules.go
@@ -326,12 +326,12 @@ var ErrCannotDisableSecondFactor = errors.New("cannot disable multi-factor authe
 // ValidateResource performs additional resource checks.
 func ValidateResource(res types.Resource) error {
 	if GetModules().Features().Cloud || !IsInsecureTestMode() {
-		// switch r := res.(type) {
-		// case types.AuthPreference:
-			// if !r.IsSecondFactorEnforced() {
-			// 	return trace.Wrap(ErrCannotDisableSecondFactor)
-			// }
-		// }
+		switch r := res.(type) {
+		case types.AuthPreference:
+			if !r.IsSecondFactorEnforced() {
+				return trace.Wrap(ErrCannotDisableSecondFactor)
+			}
+		}
 	}
 
 	// All checks below are Cloud-specific.

diff --git a/web/packages/shared/utils/saveOnDisk.ts b/web/packages/shared/utils/saveOnDisk.ts
@@ -18,17 +18,19 @@
 
 /**
  * saveOnDisk saves content to local disk.
- * @param content content to download.
+ * @param content content to download (string or Blob).
  * @param filename preset file name.
  * @param fileType file type.
  */
 export function saveOnDisk(
-  content: string,
+  content: string | Blob,
   filename: string,
   fileType: string
 ): void {
   const a = document.createElement('a');
-  const blob = new Blob([content], { type: fileType });
+
+ const blob =
+   content instanceof Blob ? content : new Blob([content], { type: fileType });
   a.href = window.URL.createObjectURL(blob);
   a.download = filename;
   document.body.appendChild(a);

diff --git a/web/packages/teleport/src/Integrations/IntegrationList.tsx b/web/packages/teleport/src/Integrations/IntegrationList.tsx
@@ -25,10 +25,12 @@ import { Box, Flex } from 'design';
 import Table, { Cell } from 'design/DataTable';
 import { MenuButton, MenuItem } from 'shared/components/MenuAction';
 import { ToolTipInfo } from 'shared/components/ToolTip';
+import { useAsync } from 'shared/hooks/useAsync';
 import { ResourceIcon } from 'design/ResourceIcon';
+import { saveOnDisk } from 'shared/utils/saveOnDisk';
+
 import useStickyClusterId from 'teleport/useStickyClusterId';
 import api from 'teleport/services/api';
-import { saveOnDisk } from 'shared/utils/saveOnDisk';
 
 import {
   getStatusCodeDescription,
@@ -68,6 +70,17 @@ export function IntegrationList(props: Props<IntegrationLike>) {
     return { cursor: 'pointer' };
   }
 
+  const [downloadAttempt, download] = useAsync(
+    async (clusterId: string, itemName: string) => {
+      return api
+        .fetch(cfg.getMsTeamsAppZipRoute(clusterId, itemName))
+        .then(response => response.blob())
+        .then(blob => {
+          saveOnDisk(blob, 'app.zip', 'application/zip');
+        });
+    }
+  );
+
   const { clusterId } = useStickyClusterId();
   return (
     <Table
@@ -116,13 +129,10 @@ export function IntegrationList(props: Props<IntegrationLike>) {
                       </MenuItem>
                     )}
                     {item.kind === 'msteams' && (
-                      <MenuItem onClick={() => {
-			  api.fetch(cfg.getMsTeamsAppZipRoute(clusterId, item.name))
-			      .then(response => response.blob())
-			      .then(blob => {
-				  saveOnDisk(blob, "app.zip", "application/zip")
-			      });
-		      }}>
+                      <MenuItem
+                        disabled={downloadAttempt.status === 'processing'}
+                        onClick={() => download(clusterId, item.name)}
+                      >
                         Download app.zip
 		      </MenuItem>
                     )}