From b2ff48851911f5906fdbfafae4f617ed8e8cc536 Mon Sep 17 00:00:00 2001 From: Jan Bouwhuis Date: Wed, 6 Aug 2025 09:30:01 +0200 Subject: [PATCH] Revert "Do not allow overriding users when uuid is duplicate (#149408)" This reverts commit 08ea64062900c9cfe3848bc5f73303580c8b1a85. --- homeassistant/auth/auth_store.py | 3 --- tests/auth/test_auth_store.py | 16 +--------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/homeassistant/auth/auth_store.py b/homeassistant/auth/auth_store.py index 429aad09edb..1c2e8b0dfab 100644 --- a/homeassistant/auth/auth_store.py +++ b/homeassistant/auth/auth_store.py @@ -120,9 +120,6 @@ class AuthStore: new_user = models.User(**kwargs) - while new_user.id in self._users: - new_user = models.User(**kwargs) - self._users[new_user.id] = new_user if credentials is None: diff --git a/tests/auth/test_auth_store.py b/tests/auth/test_auth_store.py index e5d3cf04a37..65bc35a5ff8 100644 --- a/tests/auth/test_auth_store.py +++ b/tests/auth/test_auth_store.py @@ -2,7 +2,7 @@ import asyncio from typing import Any -from unittest.mock import PropertyMock, patch +from unittest.mock import patch from freezegun.api import FrozenDateTimeFactory import pytest @@ -300,20 +300,6 @@ async def test_loading_does_not_write_right_away( assert hass_storage[auth_store.STORAGE_KEY] != {} -async def test_duplicate_uuid( - hass: HomeAssistant, hass_storage: dict[str, Any] -) -> None: - """Test we don't override user if we have a duplicate user ID.""" - hass_storage[auth_store.STORAGE_KEY] = MOCK_STORAGE_DATA - store = auth_store.AuthStore(hass) - await store.async_load() - with patch("uuid.UUID.hex", new_callable=PropertyMock) as hex_mock: - hex_mock.side_effect = ["user-id", "new-id"] - user = await store.async_create_user("Test User") - assert len(hex_mock.mock_calls) == 2 - assert user.id == "new-id" - - async def test_add_remove_user_affects_tokens( hass: HomeAssistant, hass_storage: dict[str, Any] ) -> None: