Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added user credentials to current_user ws endpoint. #15558

Merged
merged 3 commits into from
Jul 25, 2018
Merged

Added user credentials to current_user ws endpoint. #15558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54ba548
Added user credentials to current_user ws endpoint.
jeradM Jul 19, 2018
5d39a3e
Comments. Added another test.
jeradM Jul 20, 2018
842cfcf
Return list of credentials.
jeradM Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions homeassistant/components/auth/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,4 +412,7 @@ def websocket_current_user(hass, connection, msg):
'id': user.id,
'name': user.name,
'is_owner': user.is_owner,
'credentials': [{'auth_provider_type': c.auth_provider_type,
'auth_provider_id': c.auth_provider_id}
for c in user.credentials]
}))
18 changes: 16 additions & 2 deletions tests/components/auth/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from datetime import timedelta
from unittest.mock import patch

from homeassistant.auth.models import Credentials
from homeassistant.setup import async_setup_component
from homeassistant.util.dt import utcnow
from homeassistant.components import auth
Expand Down Expand Up @@ -70,12 +71,20 @@ def test_credential_store_expiration():


async def test_ws_current_user(hass, hass_ws_client, hass_access_token):
"""Test the current user command."""
"""Test the current user command with homeassistant creds."""
assert await async_setup_component(hass, 'auth', {
'http': {
'api_password': 'bla'
}
})

user = hass_access_token.refresh_token.user
credential = Credentials(auth_provider_type='homeassistant',
auth_provider_id=None,
data={}, id='test-id')
user.credentials.append(credential)
assert len(user.credentials) == 1

with patch('homeassistant.auth.AuthManager.active', return_value=True):
client = await hass_ws_client(hass, hass_access_token)

Expand All @@ -87,12 +96,17 @@ async def test_ws_current_user(hass, hass_ws_client, hass_access_token):
result = await client.receive_json()
assert result['success'], result

user = hass_access_token.refresh_token.user
user_dict = result['result']

assert user_dict['name'] == user.name
assert user_dict['id'] == user.id
assert user_dict['is_owner'] == user.is_owner
assert len(user_dict['credentials']) == 1

hass_cred = user_dict['credentials'][0]
assert hass_cred['auth_provider_type'] == 'homeassistant'
assert hass_cred['auth_provider_id'] is None
assert 'data' not in hass_cred


async def test_cors_on_token(hass, aiohttp_client):
Expand Down