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,19 @@ 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)
+      report_request =
+        with {:ok, access_token} <- Google.API.maybe_refresh_token(auth) do
+          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 +100,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)
 
@@ -118,9 +119,11 @@ defmodule Plausible.Google.GA4.API do
         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
+          |> 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}

test/plausible/imported/google_analytics4_test.exs

@@ -58,19 +58,21 @@ defmodule Plausible.Imported.GoogleAnalytics4Test do
 
       opts = Keyword.put(opts, :flush_interval_ms, 10)
 
-      expect(Plausible.HTTPClient.Mock, :post, fn "https://www.googleapis.com/oauth2/v4/token",
-                                                  headers,
-                                                  body ->
-        assert [{"content-type", "application/x-www-form-urlencoded"}] == headers
-
-        assert %{
-                 grant_type: :refresh_token,
-                 redirect_uri: "http://localhost:8000/auth/google/callback",
-                 refresh_token: "redacted_refresh_token"
-               } = body
-
-        {:ok, %Finch.Response{status: 200, body: @refresh_token_body}}
-      end)
+      for _ <- Enum.take(@full_report_mock, 100) do
+        expect(Plausible.HTTPClient.Mock, :post, fn "https://www.googleapis.com/oauth2/v4/token",
+                                                    headers,
+                                                    body ->
+          assert [{"content-type", "application/x-www-form-urlencoded"}] == headers
+
+          assert %{
+                   grant_type: :refresh_token,
+                   redirect_uri: "http://localhost:8000/auth/google/callback",
+                   refresh_token: "redacted_refresh_token"
+                 } = body
+
+          {:ok, %Finch.Response{status: 200, body: @refresh_token_body}}
+        end)
+      end
 
       for report <- @full_report_mock do
         expect(Plausible.HTTPClient.Mock, :post, fn _url, headers, _body, _opts ->