refresh google auth as we go so token doesn't timeout for >1hr imports

Author: ewdurbin

lib/plausible/google/ga4/api.ex

@@ -79,18 +79,18 @@ defmodule Plausible.Google.GA4.API do
       "[#{inspect(__MODULE__)}:#{property}] Starting import from #{date_range.first} to #{date_range.last}"
     )
 
-    with {:ok, access_token} <- Google.API.maybe_refresh_token(auth) do
-      do_import_analytics(date_range, property, access_token, persist_fn, resume_opts)
-    end
+    do_import_analytics(date_range, property, auth, persist_fn, resume_opts)
   end
 
-  defp do_import_analytics(date_range, property, access_token, persist_fn, [] = _resume_opts) do
+  defp do_import_analytics(date_range, property, auth, persist_fn, [] = _resume_opts) do
     Enum.reduce_while(GA4.ReportRequest.full_report(), :ok, fn report_request, :ok ->
       Logger.debug(
         "[#{inspect(__MODULE__)}:#{property}] Starting to import #{report_request.dataset}"
       )
 
-      report_request = prepare_request(report_request, date_range, property, access_token)
+      with {:ok, access_token} <- Google.API.maybe_refresh_token(auth) do
+        report_request = prepare_request(report_request, date_range, property, access_token)
+      end
 
       case fetch_and_persist(report_request, persist_fn: persist_fn) do
         :ok -> {:cont, :ok}
@@ -99,7 +99,7 @@ defmodule Plausible.Google.GA4.API do
     end)
   end
 
-  defp do_import_analytics(date_range, property, access_token, persist_fn, resume_opts) do
+  defp do_import_analytics(date_range, property, auth, persist_fn, resume_opts) do
     dataset = Keyword.fetch!(resume_opts, :dataset)
     offset = Keyword.fetch!(resume_opts, :offset)
 
@@ -117,10 +117,12 @@ defmodule Plausible.Google.GA4.API do
           0
         end
 
-      report_request =
-        report_request
-        |> prepare_request(date_range, property, access_token)
-        |> Map.put(:offset, request_offset)
+      with {:ok, access_token} <- Google.API.maybe_refresh_token(auth) do
+        report_request =
+          report_request
+          |> prepare_request(date_range, property, access_token)
+          |> Map.put(:offset, request_offset)
+      end
 
       case fetch_and_persist(report_request, persist_fn: persist_fn) do
         :ok -> {:cont, :ok}