diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-09-10 11:45:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 11:45:12 +0100 |
| commit | a3a90ee031d3942c04ab0d985678caf30a94f9e8 (patch) | |
| tree | f67077b00520119d640f8b914a6f59631e28cc3a /synapse/rest/__init__.py | |
| parent | Merge branch 'release-v1.20.0' into develop (diff) | |
| download | synapse-a3a90ee031d3942c04ab0d985678caf30a94f9e8.tar.xz | |
Show a confirmation page during user password reset (#8004)
This PR adds a confirmation step to resetting your user password between clicking the link in your email and your password actually being reset. This is to better align our password reset flow with the industry standard of requiring a confirmation from the user after email validation.
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index 87f927890c..40f5c32db2 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -13,8 +13,8 @@ # 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. -import synapse.rest.admin from synapse.http.server import JsonResource +from synapse.rest import admin from synapse.rest.client import versions from synapse.rest.client.v1 import ( directory, @@ -123,9 +123,7 @@ class ClientRestResource(JsonResource): password_policy.register_servlets(hs, client_resource) # moving to /_synapse/admin - synapse.rest.admin.register_servlets_for_client_rest_resource( - hs, client_resource - ) + admin.register_servlets_for_client_rest_resource(hs, client_resource) # unstable shared_rooms.register_servlets(hs, client_resource) |