From 11d0ed01629dd556025641095cc4d7c85a073e53 Mon Sep 17 00:00:00 2001
From: Theodlz <theophile.dulaz@gmail.com>
Date: Thu, 14 Mar 2024 16:34:26 -0700
Subject: [PATCH] do not move tokens around all the time, simply set them in
 the environment if provided

---
 frigate/__main__.py        | 7 +------
 frigate/utils/parsers.py   | 9 +++++++++
 frigate/utils/skyportal.py | 7 ++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frigate/__main__.py b/frigate/__main__.py
index 8f2e2a2..ce15653 100644
--- a/frigate/__main__.py
+++ b/frigate/__main__.py
@@ -39,12 +39,7 @@ def str_to_bool(value):
     print("Getting candidates from SkyPortal using the following groupIDs:")
     print(args.groupids)
     candids_per_filter, err = get_candids_per_filter_from_skyportal(
-        args.start,
-        args.end,
-        args.groupids,
-        args.filterids,
-        saved=False,
-        token=args.sp_token,
+        args.start, args.end, args.groupids, args.filterids, saved=False
     )
     if err or candids_per_filter is None:
         print(err)
diff --git a/frigate/utils/parsers.py b/frigate/utils/parsers.py
index 91a1e84..a261015 100644
--- a/frigate/utils/parsers.py
+++ b/frigate/utils/parsers.py
@@ -92,6 +92,15 @@ def main_parser_args():
         # if provided, we add the token in the environment instead
         os.environ["KOWALSKI_TOKEN"] = args.k_token
 
+    if not args.sp_token:
+        # we try to get the token from the environment if it is not provided here
+        sp_token_env = os.environ.get("SKYPORTAL_TOKEN")
+        if sp_token_env:
+            args.sp_token = sp_token_env
+    else:
+        # if provided, we add the token in the environment instead
+        os.environ["SKYPORTAL_TOKEN"] = args.sp_token
+
     # validate the output options
     try:
         validate_output_options(
diff --git a/frigate/utils/skyportal.py b/frigate/utils/skyportal.py
index 6093187..89e3cbf 100644
--- a/frigate/utils/skyportal.py
+++ b/frigate/utils/skyportal.py
@@ -13,12 +13,9 @@ def get_skyportal_token():
         raise ValueError(f"Failed to get SkyPortal token: {e}")
 
 
-def get_candids_per_filter_from_skyportal(
-    t_i, t_f, groupIDs, filterIDs, saved=False, token=None
-):
-    token = get_skyportal_token() if token is None else token
+def get_candids_per_filter_from_skyportal(t_i, t_f, groupIDs, filterIDs, saved=False):
     host = "https://fritz.science/api/candidates_filter"
-    headers = {"Authorization": f"token {token}"}
+    headers = {"Authorization": f"token {get_skyportal_token()}"}
     # compute the isoformat of the start and end dates
     start_date = Time(t_i, format="jd").iso
     end_date = Time(t_f, format="jd").iso