forked from MirrorHub/synapse
Merge branch 'master' into develop
This commit is contained in:
commit
789606577a
10
CHANGES.md
10
CHANGES.md
|
@ -1,3 +1,13 @@
|
|||
Synapse 1.15.1 (2020-06-16)
|
||||
===========================
|
||||
|
||||
Bugfixes
|
||||
--------
|
||||
|
||||
- Fix a bug introduced in v1.15.0 that would crash Synapse on start when using certain password auth providers. ([\#7684](https://github.com/matrix-org/synapse/issues/7684))
|
||||
- Fix a bug introduced in v1.15.0 which meant that some 3PID management endpoints were not accessible on the correct URL. ([\#7685](https://github.com/matrix-org/synapse/issues/7685))
|
||||
|
||||
|
||||
Synapse 1.15.0 (2020-06-11)
|
||||
===========================
|
||||
|
||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
|||
matrix-synapse-py3 (1.15.1) stable; urgency=medium
|
||||
|
||||
* New synapse release 1.15.1.
|
||||
|
||||
-- Synapse Packaging team <packages@matrix.org> Tue, 16 Jun 2020 10:27:50 +0100
|
||||
|
||||
matrix-synapse-py3 (1.15.0) stable; urgency=medium
|
||||
|
||||
* New synapse release 1.15.0.
|
||||
|
|
|
@ -36,7 +36,7 @@ try:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
__version__ = "1.15.0"
|
||||
__version__ = "1.15.1"
|
||||
|
||||
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
|
||||
# We import here so that we don't have to install a bunch of deps when
|
||||
|
|
|
@ -126,7 +126,7 @@ class ModuleApi(object):
|
|||
'errcode' property for more information on the reason for failure
|
||||
|
||||
Returns:
|
||||
Deferred[str]: user_id
|
||||
defer.Deferred[str]: user_id
|
||||
"""
|
||||
return defer.ensureDeferred(
|
||||
self._hs.get_registration_handler().register_user(
|
||||
|
@ -149,10 +149,12 @@ class ModuleApi(object):
|
|||
Returns:
|
||||
defer.Deferred[tuple[str, str]]: Tuple of device ID and access token
|
||||
"""
|
||||
return self._hs.get_registration_handler().register_device(
|
||||
user_id=user_id,
|
||||
device_id=device_id,
|
||||
initial_display_name=initial_display_name,
|
||||
return defer.ensureDeferred(
|
||||
self._hs.get_registration_handler().register_device(
|
||||
user_id=user_id,
|
||||
device_id=device_id,
|
||||
initial_display_name=initial_display_name,
|
||||
)
|
||||
)
|
||||
|
||||
def record_user_external_id(
|
||||
|
|
|
@ -682,7 +682,7 @@ class ThreepidRestServlet(RestServlet):
|
|||
|
||||
|
||||
class ThreepidAddRestServlet(RestServlet):
|
||||
PATTERNS = client_patterns("/account/3pid/add$", releases=(), unstable=True)
|
||||
PATTERNS = client_patterns("/account/3pid/add$")
|
||||
|
||||
def __init__(self, hs):
|
||||
super(ThreepidAddRestServlet, self).__init__()
|
||||
|
@ -733,7 +733,7 @@ class ThreepidAddRestServlet(RestServlet):
|
|||
|
||||
|
||||
class ThreepidBindRestServlet(RestServlet):
|
||||
PATTERNS = client_patterns("/account/3pid/bind$", releases=(), unstable=True)
|
||||
PATTERNS = client_patterns("/account/3pid/bind$")
|
||||
|
||||
def __init__(self, hs):
|
||||
super(ThreepidBindRestServlet, self).__init__()
|
||||
|
@ -762,7 +762,7 @@ class ThreepidBindRestServlet(RestServlet):
|
|||
|
||||
|
||||
class ThreepidUnbindRestServlet(RestServlet):
|
||||
PATTERNS = client_patterns("/account/3pid/unbind$", releases=(), unstable=True)
|
||||
PATTERNS = client_patterns("/account/3pid/unbind$")
|
||||
|
||||
def __init__(self, hs):
|
||||
super(ThreepidUnbindRestServlet, self).__init__()
|
||||
|
|
0
tests/module_api/__init__.py
Normal file
0
tests/module_api/__init__.py
Normal file
54
tests/module_api/test_api.py
Normal file
54
tests/module_api/test_api.py
Normal file
|
@ -0,0 +1,54 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2020 The Matrix.org Foundation C.I.C.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from synapse.module_api import ModuleApi
|
||||
|
||||
from tests.unittest import HomeserverTestCase
|
||||
|
||||
|
||||
class ModuleApiTestCase(HomeserverTestCase):
|
||||
def prepare(self, reactor, clock, homeserver):
|
||||
self.store = homeserver.get_datastore()
|
||||
self.module_api = ModuleApi(homeserver, homeserver.get_auth_handler())
|
||||
|
||||
def test_can_register_user(self):
|
||||
"""Tests that an external module can register a user"""
|
||||
# Register a new user
|
||||
user_id, access_token = self.get_success(
|
||||
self.module_api.register(
|
||||
"bob", displayname="Bobberino", emails=["bob@bobinator.bob"]
|
||||
)
|
||||
)
|
||||
|
||||
# Check that the new user exists with all provided attributes
|
||||
self.assertEqual(user_id, "@bob:test")
|
||||
self.assertTrue(access_token)
|
||||
self.assertTrue(self.store.get_user_by_id(user_id))
|
||||
|
||||
# Check that the email was assigned
|
||||
emails = self.get_success(self.store.user_get_threepids(user_id))
|
||||
self.assertEqual(len(emails), 1)
|
||||
|
||||
email = emails[0]
|
||||
self.assertEqual(email["medium"], "email")
|
||||
self.assertEqual(email["address"], "bob@bobinator.bob")
|
||||
|
||||
# Should these be 0?
|
||||
self.assertEqual(email["validated_at"], 0)
|
||||
self.assertEqual(email["added_at"], 0)
|
||||
|
||||
# Check that the displayname was assigned
|
||||
displayname = self.get_success(self.store.get_profile_displayname("bob"))
|
||||
self.assertEqual(displayname, "Bobberino")
|
Loading…
Reference in a new issue