From c370fa0489557caad51ef4b02bae7a54552eb4a5 Mon Sep 17 00:00:00 2001
From: tronikos <tronikos@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:16:10 -0800
Subject: [PATCH] Use the external URL set in Settings > System > Network if my
 is disabled as redirect URL for Google Drive instructions (#137791)

* Use the Assistant URL set in Settings > System > Network if my is disabled

* fix

* Remove async_get_redirect_uri
---
 .../google_drive/application_credentials.py   | 12 +++++--
 .../test_application_credentials.py           | 36 +++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 tests/components/google_drive/test_application_credentials.py

diff --git a/homeassistant/components/google_drive/application_credentials.py b/homeassistant/components/google_drive/application_credentials.py
index 1c4421623d4..8bcab2b039c 100644
--- a/homeassistant/components/google_drive/application_credentials.py
+++ b/homeassistant/components/google_drive/application_credentials.py
@@ -2,7 +2,10 @@
 
 from homeassistant.components.application_credentials import AuthorizationServer
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    AUTH_CALLBACK_PATH,
+    MY_AUTH_CALLBACK_PATH,
+)
 
 
 async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
@@ -15,9 +18,14 @@ async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationSe
 
 async def async_get_description_placeholders(hass: HomeAssistant) -> dict[str, str]:
     """Return description placeholders for the credentials dialog."""
+    if "my" in hass.config.components:
+        redirect_url = MY_AUTH_CALLBACK_PATH
+    else:
+        ha_host = hass.config.external_url or "https://YOUR_DOMAIN:PORT"
+        redirect_url = f"{ha_host}{AUTH_CALLBACK_PATH}"
     return {
         "oauth_consent_url": "https://console.cloud.google.com/apis/credentials/consent",
         "more_info_url": "https://www.home-assistant.io/integrations/google_drive/",
         "oauth_creds_url": "https://console.cloud.google.com/apis/credentials",
-        "redirect_url": config_entry_oauth2_flow.async_get_redirect_uri(hass),
+        "redirect_url": redirect_url,
     }
diff --git a/tests/components/google_drive/test_application_credentials.py b/tests/components/google_drive/test_application_credentials.py
new file mode 100644
index 00000000000..ec46db510a5
--- /dev/null
+++ b/tests/components/google_drive/test_application_credentials.py
@@ -0,0 +1,36 @@
+"""Test the Google Drive application_credentials."""
+
+import pytest
+
+from homeassistant import setup
+from homeassistant.components.google_drive.application_credentials import (
+    async_get_description_placeholders,
+)
+from homeassistant.core import HomeAssistant
+
+
+@pytest.mark.parametrize(
+    ("additional_components", "external_url", "expected_redirect_uri"),
+    [
+        ([], "https://example.com", "https://example.com/auth/external/callback"),
+        ([], None, "https://YOUR_DOMAIN:PORT/auth/external/callback"),
+        (["my"], "https://example.com", "https://my.home-assistant.io/redirect/oauth"),
+    ],
+)
+async def test_description_placeholders(
+    hass: HomeAssistant,
+    additional_components: list[str],
+    external_url: str | None,
+    expected_redirect_uri: str,
+) -> None:
+    """Test description placeholders."""
+    for component in additional_components:
+        assert await setup.async_setup_component(hass, component, {})
+    hass.config.external_url = external_url
+    placeholders = await async_get_description_placeholders(hass)
+    assert placeholders == {
+        "oauth_consent_url": "https://console.cloud.google.com/apis/credentials/consent",
+        "more_info_url": "https://www.home-assistant.io/integrations/google_drive/",
+        "oauth_creds_url": "https://console.cloud.google.com/apis/credentials",
+        "redirect_url": expected_redirect_uri,
+    }