Merge pull request #8 from nsidc/tweaks-for-redirect-page

trey-stafford · web-flow · commit 806db3277593 · 2025-03-24T11:12:21.000-06:00
Tweaks for redirect page
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,18 @@
 services:
   api:
+    # TODO: remove this `build` option when we start supporting specific versions of images
     build: .
     ports:
       - "5000:5000"
     environment:
-      - EARTHDATA_APP_USERNAME
-      - EARTHDATA_APP_PASSWORD
-      - EARTHDATA_APP_CLIENT_ID
-      - DAT_FLASK_SECRET_KEY
+      - EARTHDATA_APP_USERNAME=${EARTHDATA_APP_USERNAME:?EARTHDATA_APP_USERNAME
+        must be set}
+      - EARTHDATA_APP_PASSWORD=${EARTHDATA_APP_PASSWORD:?EARTHDATA_APP_PASSWORD
+        must be set}
+      - EARTHDATA_APP_CLIENT_ID=${EARTHDATA_APP_CLIENT_ID:?EARTHDATA_APP_CLIENT_ID
+        must be set}
+      - DAT_FLASK_SECRET_KEY=${DAT_FLASK_SECRET_KEY:?DAT_FLASK_SECRET_KEY must
+        be set}
     networks:
       - dat
     dns_search: .
diff --git a/src/dat_backend/templates/edd_auth_callback.html.jinja b/src/dat_backend/templates/edd_auth_callback.html.jinja
@@ -2,12 +2,30 @@
 <html>
   <head>
     <script>
-      newwin = window.open("{{ redirect_uri }}", "_blank");
-      newwin.close()
-      window.close()
+      window.open("{{ redirect_uri }}", "_self");
     </script>
   </head>
   <body>
-    <p><a href="{{ redirect_uri }}">Click here if you are not automatically redirected!</a></p>
+    <div style="display: flex;">
+    <span style="width: 50%;">
+      <h2>Opening Earthdata Download to download your files...</h2>
+
+      <p>
+        Click <strong>Open Earthdata Download </strong>
+        in the dialog presented by your browser.
+        If the dialog does not open automatically, click
+        <strong> Open Earthdata Download </strong> below.
+        You can close this window once your download begins.
+      </p>
+
+      <p>
+        Don’t have Earthdata Download installed? Go To the
+        <a href="https://nasa.github.io/earthdata-download/" target="blank"
+        > Downloads Page</a>.
+      </p>
+
+      <p><a href="{{ redirect_uri }}">Open Earthdata Download</a></p>
+
+    <div style="display: flex;">
   </body>
 </html>
diff --git a/test/unit/test_python_script_template.py b/test/unit/test_python_script_template.py
@@ -139,7 +139,11 @@ def test_cmr_search():
         "-109,37,-102,37,-102,41,-109,41,-109,37",
         "*A2019*",
     )
-    assert len(actual) == 72
+    # TODO: the length of the query result used to consistently be 72, but a
+    # recent change to MODIS cloud colelctions result in the inclusion of an
+    # `s3credentials` file. While we try to figure out what the "right" thing to
+    # do here is, we accept either possibility.
+    assert len(actual) == 72 or len(actual) == 73
 
 
 def test_get_speed():
