From 61b720fe688a44e7b04f2e3dfd336b65b25a3f67 Mon Sep 17 00:00:00 2001
From: Andrew Dryga <andrew@dryga.com>
Date: Tue, 30 Apr 2024 09:12:53 -0600
Subject: [PATCH] hotfix(portal): add account_id to token refresh logs metadata

---
 .../google_workspace/jobs/refresh_access_tokens.ex | 14 ++++++--------
 .../microsoft_entra/jobs/refresh_access_tokens.ex  | 14 ++++++--------
 .../adapters/okta/jobs/refresh_access_tokens.ex    | 14 ++++++--------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/elixir/apps/domain/lib/domain/auth/adapters/google_workspace/jobs/refresh_access_tokens.ex b/elixir/apps/domain/lib/domain/auth/adapters/google_workspace/jobs/refresh_access_tokens.ex
index f4a3e54ee..765ff021a 100644
--- a/elixir/apps/domain/lib/domain/auth/adapters/google_workspace/jobs/refresh_access_tokens.ex
+++ b/elixir/apps/domain/lib/domain/auth/adapters/google_workspace/jobs/refresh_access_tokens.ex
@@ -13,22 +13,20 @@ defmodule Domain.Auth.Adapters.GoogleWorkspace.Jobs.RefreshAccessTokens do
     Logger.debug("Refreshing access tokens for #{length(providers)} providers")
 
     Enum.each(providers, fn provider ->
-      Logger.debug("Refreshing access token",
+      Logger.metadata(
+        account_id: provider.account_id,
         provider_id: provider.id,
-        account_id: provider.account_id
+        provider_adapter: provider.adapter
       )
 
+      Logger.debug("Refreshing access token")
+
       case GoogleWorkspace.refresh_access_token(provider) do
         {:ok, provider} ->
-          Logger.debug("Finished refreshing access token",
-            provider_id: provider.id,
-            account_id: provider.account_id
-          )
+          Logger.debug("Finished refreshing access token")
 
         {:error, reason} ->
           Logger.error("Failed refreshing access token",
-            provider_id: provider.id,
-            account_id: provider.account_id,
             reason: inspect(reason)
           )
       end
diff --git a/elixir/apps/domain/lib/domain/auth/adapters/microsoft_entra/jobs/refresh_access_tokens.ex b/elixir/apps/domain/lib/domain/auth/adapters/microsoft_entra/jobs/refresh_access_tokens.ex
index 435d54f35..4dea75264 100644
--- a/elixir/apps/domain/lib/domain/auth/adapters/microsoft_entra/jobs/refresh_access_tokens.ex
+++ b/elixir/apps/domain/lib/domain/auth/adapters/microsoft_entra/jobs/refresh_access_tokens.ex
@@ -13,22 +13,20 @@ defmodule Domain.Auth.Adapters.MicrosoftEntra.Jobs.RefreshAccessTokens do
     Logger.debug("Refreshing access tokens for #{length(providers)} Microsoft Entra providers")
 
     Enum.each(providers, fn provider ->
-      Logger.debug("Refreshing access token",
+      Logger.metadata(
+        account_id: provider.account_id,
         provider_id: provider.id,
-        account_id: provider.account_id
+        provider_adapter: provider.adapter
       )
 
+      Logger.debug("Refreshing access token")
+
       case MicrosoftEntra.refresh_access_token(provider) do
         {:ok, provider} ->
-          Logger.debug("Finished refreshing access token",
-            provider_id: provider.id,
-            account_id: provider.account_id
-          )
+          Logger.debug("Finished refreshing access token")
 
         {:error, reason} ->
           Logger.error("Failed refreshing access token",
-            provider_id: provider.id,
-            account_id: provider.account_id,
             reason: inspect(reason)
           )
       end
diff --git a/elixir/apps/domain/lib/domain/auth/adapters/okta/jobs/refresh_access_tokens.ex b/elixir/apps/domain/lib/domain/auth/adapters/okta/jobs/refresh_access_tokens.ex
index eaaffb87d..20bd537cf 100644
--- a/elixir/apps/domain/lib/domain/auth/adapters/okta/jobs/refresh_access_tokens.ex
+++ b/elixir/apps/domain/lib/domain/auth/adapters/okta/jobs/refresh_access_tokens.ex
@@ -13,22 +13,20 @@ defmodule Domain.Auth.Adapters.Okta.Jobs.RefreshAccessTokens do
     Logger.debug("Refreshing access tokens for #{length(providers)} Okta providers")
 
     Enum.each(providers, fn provider ->
-      Logger.debug("Refreshing access token",
+      Logger.metadata(
+        account_id: provider.account_id,
         provider_id: provider.id,
-        account_id: provider.account_id
+        provider_adapter: provider.adapter
       )
 
+      Logger.debug("Refreshing access token")
+
       case Okta.refresh_access_token(provider) do
         {:ok, provider} ->
-          Logger.debug("Finished refreshing access token",
-            provider_id: provider.id,
-            account_id: provider.account_id
-          )
+          Logger.debug("Finished refreshing access token")
 
         {:error, reason} ->
           Logger.error("Failed refreshing access token",
-            provider_id: provider.id,
-            account_id: provider.account_id,
             reason: inspect(reason)
           )
       end