feat: added check login required for hca export/download #4292

DataBiosphere · Feb 22, 2025 · 42527e7 · 42527e7
1 parent 3c7e64d
commit 42527e7
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 43 deletions.
diff --git a/...etail/components/GeneratedMatricesTables/components/FileLocationCopy/fileLocationCopy.tsx b/...etail/components/GeneratedMatricesTables/components/FileLocationCopy/fileLocationCopy.tsx
@@ -1,6 +1,7 @@
 import { ButtonGroupButton } from "@databiosphere/findable-ui/lib/components/common/ButtonGroup/components/ButtonGroupButton/buttonGroupButton";
 import { ContentCopyIconSmall } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/common/constants";
 import { useFileLocation } from "@databiosphere/findable-ui/lib/hooks/useFileLocation";
+import { useLoginGuard } from "@databiosphere/findable-ui/lib/providers/loginGuard/hook";
 import copy from "copy-to-clipboard";
 import { useEffect } from "react";
 import { ProjectMatrixView } from "../../../../../../viewModelBuilders/azul/hca-dcp/common/projectMatrixMapper/entities";
@@ -15,6 +16,9 @@ export const FileLocationCopy = ({
   const { url } = projectMatrixView;
   const { fileUrl, isLoading, isSuccess, run } = useFileLocation(url);
 
+  // Prompt user for login before download, if required.
+  const { requireLogin } = useLoginGuard();
+
   useEffect(() => {
     if (fileUrl && isSuccess) {
       copy(fileUrl);
@@ -26,7 +30,7 @@ export const FileLocationCopy = ({
       action="Copy project matrix"
       label={<ContentCopyIconSmall />}
       loading={isLoading}
-      onClick={run}
+      onClick={() => requireLogin(run)}
     />
   );
 };
diff --git a/...mponents/GeneratedMatricesTables/components/FileLocationDownload/fileLocationDownload.tsx b/...mponents/GeneratedMatricesTables/components/FileLocationDownload/fileLocationDownload.tsx
@@ -2,6 +2,7 @@ import { FileDownloadButton } from "@databiosphere/findable-ui/lib/components/co
 import { ButtonGroupButton } from "@databiosphere/findable-ui/lib/components/common/ButtonGroup/components/ButtonGroupButton/buttonGroupButton";
 import { DownloadIconSmall } from "@databiosphere/findable-ui/lib/components/common/CustomIcon/common/constants";
 import { useFileLocation } from "@databiosphere/findable-ui/lib/hooks/useFileLocation";
+import { useLoginGuard } from "@databiosphere/findable-ui/lib/providers/loginGuard/hook";
 import { ProjectMatrixView } from "../../../../../../viewModelBuilders/azul/hca-dcp/common/projectMatrixMapper/entities";
 
 export interface FileLocationDownloadProps {
@@ -13,13 +14,17 @@ export const FileLocationDownload = ({
 }: FileLocationDownloadProps): JSX.Element => {
   const { fileName, url } = projectMatrixView;
   const { fileUrl, isLoading, run } = useFileLocation(url);
+
+  // Prompt user for login before download, if required.
+  const { requireLogin } = useLoginGuard();
+
   return (
     <>
       <ButtonGroupButton
         action="Download project matrix"
         label={<DownloadIconSmall />}
         loading={isLoading}
-        onClick={run}
+        onClick={() => requireLogin(run)}
       />
       <FileDownloadButton fileName={fileName} fileUrl={fileUrl} />
     </>

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -15,6 +15,7 @@ import { ExploreStateProvider } from "@databiosphere/findable-ui/lib/providers/e
 import { FileManifestStateProvider } from "@databiosphere/findable-ui/lib/providers/fileManifestState";
 import { GoogleSignInAuthenticationProvider } from "@databiosphere/findable-ui/lib/providers/googleSignInAuthentication/provider";
 import { LayoutStateProvider } from "@databiosphere/findable-ui/lib/providers/layoutState";
+import { LoginGuardProvider } from "@databiosphere/findable-ui/lib/providers/loginGuard/provider";
 import { SystemStatusProvider } from "@databiosphere/findable-ui/lib/providers/systemStatus";
 import { createAppTheme } from "@databiosphere/findable-ui/lib/theme/theme";
 import { DataExplorerError } from "@databiosphere/findable-ui/lib/types/error";
@@ -75,47 +76,49 @@ function MyApp({ Component, pageProps }: AppPropsWithComponent): JSX.Element {
               SessionController={TerraProfileProvider}
               timeout={SESSION_TIMEOUT}
             >
-              <LayoutStateProvider>
-                <AppLayout>
-                  <ThemeProvider
-                    theme={(theme: Theme): Theme =>
-                      createTheme(
-                        deepmerge(theme, {
-                          breakpoints: createBreakpoints(BREAKPOINTS),
-                        })
-                      )
-                    }
-                  >
-                    <Header {...header} />
-                  </ThemeProvider>
-                  <ExploreStateProvider entityListType={entityListType}>
-                    <FileManifestStateProvider>
-                      <Main>
-                        <ErrorBoundary
-                          fallbackRender={({
-                            error,
-                            reset,
-                          }: {
-                            error: DataExplorerError;
-                            reset: () => void;
-                          }): JSX.Element => (
-                            <Error
-                              errorMessage={error.message}
-                              requestUrlMessage={error.requestUrlMessage}
-                              rootPath={redirectRootToPath}
-                              onReset={reset}
-                            />
-                          )}
-                        >
-                          <Component {...pageProps} />
-                          <Floating {...floating} />
-                        </ErrorBoundary>
-                      </Main>
-                    </FileManifestStateProvider>
-                  </ExploreStateProvider>
-                  <Footer {...footer} />
-                </AppLayout>
-              </LayoutStateProvider>
+              <LoginGuardProvider>
+                <LayoutStateProvider>
+                  <AppLayout>
+                    <ThemeProvider
+                      theme={(theme: Theme): Theme =>
+                        createTheme(
+                          deepmerge(theme, {
+                            breakpoints: createBreakpoints(BREAKPOINTS),
+                          })
+                        )
+                      }
+                    >
+                      <Header {...header} />
+                    </ThemeProvider>
+                    <ExploreStateProvider entityListType={entityListType}>
+                      <FileManifestStateProvider>
+                        <Main>
+                          <ErrorBoundary
+                            fallbackRender={({
+                              error,
+                              reset,
+                            }: {
+                              error: DataExplorerError;
+                              reset: () => void;
+                            }): JSX.Element => (
+                              <Error
+                                errorMessage={error.message}
+                                requestUrlMessage={error.requestUrlMessage}
+                                rootPath={redirectRootToPath}
+                                onReset={reset}
+                              />
+                            )}
+                          >
+                            <Component {...pageProps} />
+                            <Floating {...floating} />
+                          </ErrorBoundary>
+                        </Main>
+                      </FileManifestStateProvider>
+                    </ExploreStateProvider>
+                    <Footer {...footer} />
+                  </AppLayout>
+                </LayoutStateProvider>
+              </LoginGuardProvider>
             </GoogleSignInAuthenticationProvider>
           </SystemStatusProvider>
         </DXConfigProvider>

diff --git a/site-config/hca-dcp/cc-ma-dev/config.ts b/site-config/hca-dcp/cc-ma-dev/config.ts
@@ -33,6 +33,9 @@ export function makeManagedAccessConfig(config: SiteConfig): SiteConfig {
   // Add authentication to the config.
   cloneConfig.authentication = getAuthenticationConfig();
 
+  // Require authentication for exports
+  cloneConfig.exportsRequireAuth = true;
+
   // Update categoryGroupConfig.
   cloneConfig.categoryGroupConfig = getMACategoryGroupConfig(
     cloneConfig.categoryGroupConfig