Add support for native oauth2 in Point

homeassistant/components/point/config_flow.py

@@ -57,9 +57,16 @@ async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResu
                 data={**data, CONF_WEBHOOK_ID: async_generate_id()},
             )
 
-        if self.reauth_entry.unique_id == user_id:
+        if self.reauth_entry.unique_id is None:
+            await self.async_set_unique_id(user_id)
+            self._abort_if_unique_id_configured()
+        if (
+            self.reauth_entry.unique_id is None
+            or self.reauth_entry.unique_id == user_id
+        ):
+            logging.info("user_id: %s", user_id)
             return self.async_update_reload_and_abort(
                 self.reauth_entry, data={**self.reauth_entry.data, **data}
             )
 
-        return self.async_abort(reason="missing_configuration")
+        return self.async_abort(reason="wrong_account")

homeassistant/components/point/strings.json

@@ -12,7 +12,8 @@
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
       "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "wrong_account": "You can only reauthenticate this account with the same user."
     },
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"

tests/components/point/test_config_flow.py

@@ -94,16 +94,27 @@ async def test_full_flow(
     assert "webhook_id" in result["result"].data
 
 
+@pytest.mark.parametrize(
+    ("unique_id", "expected"),
+    [
+        ("abcd", "reauth_successful"),
+        (None, "reauth_successful"),
+        ("abcde", "wrong_account"),
+    ],
+    ids=("correct-unique_id", "missing-unique_id", "wrong-unique_id-abort"),
+)
 @pytest.mark.usefixtures("current_request_with_host")
 async def test_reauthentication_flow(
+    unique_id: str | None,
+    expected: str,
     hass: HomeAssistant,
     hass_client_no_auth: ClientSessionGenerator,
     aioclient_mock: AiohttpClientMocker,
 ) -> None:
     """Test reauthentication flow."""
     old_entry = MockConfigEntry(
         domain=DOMAIN,
-        unique_id="abcd",
+        unique_id=unique_id,
         version=1,
         data={"id": "timmo", "auth_implementation": DOMAIN},
     )
@@ -143,61 +154,9 @@ async def test_reauthentication_flow(
         result = await hass.config_entries.flow.async_configure(result["flow_id"])
 
     assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "reauth_successful"
-
-    assert len(mock_setup.mock_calls) == 1
-
-
-@pytest.mark.usefixtures("current_request_with_host")
-async def test_wrong_account_in_reauth(
-    hass: HomeAssistant,
-    hass_client_no_auth: ClientSessionGenerator,
-    aioclient_mock: AiohttpClientMocker,
-) -> None:
-    """Test reauthentication flow."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        unique_id="abcde",
-        version=1,
-        data={"id": "timmo", "auth_implementation": DOMAIN},
-    )
-    entry.add_to_hass(hass)
-
-    result = await entry.start_reauth_flow(hass)
-
-    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-
-    state = config_entry_oauth2_flow._encode_jwt(
-        hass,
-        {
-            "flow_id": result["flow_id"],
-            "redirect_uri": REDIRECT_URL,
-        },
-    )
-    client = await hass_client_no_auth()
-    await client.get(f"/auth/external/callback?code=abcd&state={state}")
-
-    aioclient_mock.post(
-        OAUTH2_TOKEN,
-        json={
-            "refresh_token": "mock-refresh-token",
-            "access_token": "mock-access-token",
-            "type": "Bearer",
-            "expires_in": 60,
-            "user_id": "abcd",
-        },
-    )
-
-    with (
-        patch("homeassistant.components.point.api.AsyncConfigEntryAuth"),
-        patch(
-            f"homeassistant.components.{DOMAIN}.async_setup_entry", return_value=True
-        ),
-    ):
-        result = await hass.config_entries.flow.async_configure(result["flow_id"])
-
-    assert result["type"] is FlowResultType.ABORT
-    assert result["reason"] == "missing_configuration"
+    assert result["reason"] == expected
+    if expected == "reauth_successful":
+        assert len(mock_setup.mock_calls) == 1
 
 
 async def test_import_flow(