Merge pull request #42 from lincbrain/ak-auth-move

Include logic to properly authenticate a user upon the move command
lincbrain · Apr 10, 2024 · 5995675 · 5995675
2 parents 9ad0699 + 40a8c76
commit 5995675
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lincbrain/move.py b/lincbrain/move.py
@@ -801,6 +801,10 @@ def move(
     if dandiset is None:
         dandiset = Path()
     with ExitStack() as stack:
+        client = DandiAPIClient.for_dandi_instance(dandi_instance)
+        client.dandi_authenticate()
+        stack.enter_context(client)
+
         mover: Mover
         client: DandiAPIClient | None = None
         if work_on is MoveWorkOn.AUTO:
@@ -811,8 +815,6 @@ def move(
             if isinstance(dandiset, str):
                 raise TypeError("`dandiset` must be a Path when work_on='both'")
             local_ds, subpath = find_dandiset_and_subpath(dandiset)
-            client = DandiAPIClient.for_dandi_instance(dandi_instance)
-            stack.enter_context(client)
             remote_ds = client.get_dandiset(
                 local_ds.identifier, version_id="draft", lazy=False
             )
@@ -833,15 +835,14 @@ def move(
                 if not isinstance(url, DandisetURL):
                     raise ValueError("URL does not point to a Dandiset")
                 client = url.get_client()
+                client.dandi_authenticate()
                 stack.enter_context(client)
                 rds = url.get_dandiset(client, lazy=False)
                 assert rds is not None
                 remote_ds = rds
                 subpath = Path()
             else:
                 local_ds, subpath = find_dandiset_and_subpath(dandiset)
-                client = DandiAPIClient.for_dandi_instance(dandi_instance)
-                stack.enter_context(client)
                 remote_ds = client.get_dandiset(
                     local_ds.identifier, version_id="draft", lazy=False
                 )