Update name legacy api password (#16455)

This commit is contained in:
Paulus Schoutsen 2018-09-08 22:10:42 +02:00 committed by GitHub
parent 9944c60311
commit e7b8d2e6df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions

View File

@ -24,7 +24,7 @@ USER_SCHEMA = vol.Schema({
CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({ CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend({
}, extra=vol.PREVENT_EXTRA) }, extra=vol.PREVENT_EXTRA)
LEGACY_USER = 'homeassistant' LEGACY_USER_NAME = 'Legacy API password user'
class InvalidAuthError(HomeAssistantError): class InvalidAuthError(HomeAssistantError):
@ -52,23 +52,21 @@ class LegacyApiPasswordAuthProvider(AuthProvider):
async def async_get_or_create_credentials( async def async_get_or_create_credentials(
self, flow_result: Dict[str, str]) -> Credentials: self, flow_result: Dict[str, str]) -> Credentials:
"""Return LEGACY_USER always.""" """Return credentials for this login."""
for credential in await self.async_credentials(): credentials = await self.async_credentials()
if credential.data['username'] == LEGACY_USER: if credentials:
return credential return credentials[0]
return self.async_create_credentials({ return self.async_create_credentials({})
'username': LEGACY_USER
})
async def async_user_meta_for_credentials( async def async_user_meta_for_credentials(
self, credentials: Credentials) -> UserMeta: self, credentials: Credentials) -> UserMeta:
""" """
Set name as LEGACY_USER always. Return info for the user.
Will be used to populate info when creating a new user. Will be used to populate info when creating a new user.
""" """
return UserMeta(name=LEGACY_USER, is_active=True) return UserMeta(name=LEGACY_USER_NAME, is_active=True)
class LegacyLoginFlow(LoginFlow): class LegacyLoginFlow(LoginFlow):

View File

@ -33,11 +33,10 @@ def manager(hass, store, provider):
async def test_create_new_credential(manager, provider): async def test_create_new_credential(manager, provider):
"""Test that we create a new credential.""" """Test that we create a new credential."""
credentials = await provider.async_get_or_create_credentials({}) credentials = await provider.async_get_or_create_credentials({})
assert credentials.data["username"] is legacy_api_password.LEGACY_USER
assert credentials.is_new is True assert credentials.is_new is True
user = await manager.async_get_or_create_user(credentials) user = await manager.async_get_or_create_user(credentials)
assert user.name == legacy_api_password.LEGACY_USER assert user.name == legacy_api_password.LEGACY_USER_NAME
assert user.is_active assert user.is_active
@ -46,7 +45,6 @@ async def test_only_one_credentials(manager, provider):
credentials = await provider.async_get_or_create_credentials({}) credentials = await provider.async_get_or_create_credentials({})
await manager.async_get_or_create_user(credentials) await manager.async_get_or_create_user(credentials)
credentials2 = await provider.async_get_or_create_credentials({}) credentials2 = await provider.async_get_or_create_credentials({})
assert credentials2.data["username"] == legacy_api_password.LEGACY_USER
assert credentials2.id == credentials.id assert credentials2.id == credentials.id
assert credentials2.is_new is False assert credentials2.is_new is False