Skip to content

Upgrade matrix-client to 0.0.6 #6808

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

Merged
fabaff merged 1 commit into from
Mar 27, 2017
Merged

Upgrade matrix-client to 0.0.6 #6808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 12 additions & 23 deletions homeassistant/components/notify/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService)
from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_VERIFY_SSL

REQUIREMENTS = ['matrix-client==0.0.5']
REQUIREMENTS = ['matrix-client==0.0.6']

_LOGGER = logging.getLogger(__name__)

SESSION_FILE = 'matrix.conf'
AUTH_TOKENS = dict()
Expand All @@ -31,8 +33,6 @@
vol.Required(CONF_DEFAULT_ROOM): cv.string,
})

_LOGGER = logging.getLogger(__name__)


def get_service(hass, config, discovery_info=None):
"""Get the Matrix notification service."""
Expand All @@ -49,7 +49,7 @@ def get_service(hass, config, discovery_info=None):


class MatrixNotificationService(BaseNotificationService):
"""Wrapper for the MatrixNotificationClient."""
"""Wrapper for the Matrix Notification Client."""

def __init__(self, homeserver, default_room, verify_ssl,
username, password):
Expand Down Expand Up @@ -107,47 +107,36 @@ def login_by_token():
valid_cert_check=verify_tls
)
except MatrixRequestError as ex:
_LOGGER.info(
'login_by_token: (%d) %s', ex.code, ex.content
)
_LOGGER.info("login_by_token: (%d) %s", ex.code, ex.content)

def login_by_password():
"""Login using password authentication."""
try:
_client = MatrixClient(
base_url=homeserver,
valid_cert_check=verify_tls
)
base_url=homeserver, valid_cert_check=verify_tls)
_client.login_with_password(username, password)
store_token(mx_id, _client.token)
return _client
except MatrixRequestError as ex:
_LOGGER.error(
'login_by_password: (%d) %s', ex.code, ex.content
)
_LOGGER.error("login_by_password: (%d) %s", ex.code, ex.content)

# this is as close as we can get to the mx_id, since there is no
# This is as close as we can get to the mx_id, since there is no
# homeserver discovery protocol we have to fall back to the homeserver url
# instead of the actual domain it serves.
mx_id = "{user}@{homeserver}".format(
user=username,
homeserver=homeserver
)
mx_id = "{user}@{homeserver}".format(user=username, homeserver=homeserver)

if mx_id in AUTH_TOKENS:
client = login_by_token()
if not client:
client = login_by_password()
if not client:
_LOGGER.error(
'login failed, both token and username/password '
'invalid'
)
"Login failed, both token and username/password invalid")
return
else:
client = login_by_password()
if not client:
_LOGGER.error('login failed, username/password invalid')
_LOGGER.error("Login failed, username/password invalid")
return

rooms = client.get_rooms()
Expand All @@ -161,6 +150,6 @@ def login_by_password():
_LOGGER.debug(room.send_text(message))
except MatrixRequestError as ex:
_LOGGER.error(
'Unable to deliver message to room \'%s\': (%d): %s',
"Unable to deliver message to room '%s': (%d): %s",
target_room, ex.code, ex.content
)
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ liveboxplaytv==1.4.9
lyft_rides==0.1.0b0

# homeassistant.components.notify.matrix
matrix-client==0.0.5
matrix-client==0.0.6

# homeassistant.components.maxcube
maxcube-api==0.1.0
Expand Down