Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Remove registration fallback code. #15405

Merged
merged 4 commits into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/15405.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove the broken, unspecced registration fallback. Note that the *login* fallback is unaffected by this change.
6 changes: 5 additions & 1 deletion synapse/res/templates/recaptcha.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

{% block header %}
<script src="https://www.recaptcha.net/recaptcha/api.js" async defer></script>
<link rel="stylesheet" href="/_matrix/static/client/register/style.css">
<style type="text/css">
.g-recaptcha div {
margin: auto;
}
</style>
<script>
function captchaDone() {
document.getElementById('registrationForm').submit();
Expand Down
6 changes: 1 addition & 5 deletions synapse/res/templates/registration_token.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
{% extends "_base.html" %}
{% block title %}Authentication{% endblock %}

{% block header %}
<link rel="stylesheet" href="/_matrix/static/client/register/style.css">
{% endblock %}

{% block body %}
<form id="registrationForm" method="post" action="{{ myurl }}">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In terms.html, we define a style registrationForm. Do we want to do the same here or the default style is ok ?
Beware that I am mostly clueless regarding HTML/CSS.

Visually it looks good to me so perhaps not needed ?

Copy link
Member Author

@clokep clokep Apr 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In terms.html, we define a style registrationForm. Do we want to do the same here or the default style is ok ?

The addition of the style on terms.html was to center the Accept button, otherwise it looked a bit odd hanging all the way to the left. Doing the same for registration_token.html made the input form look odd IMO.

These pages all probably need some love, but I don't think the changes are any worse than the previous iterations. 🤷

<form method="post" action="{{ myurl }}">
<div>
{% if error is defined %}
<p class="error"><strong>Error: {{ error }}</strong></p>
Expand Down
4 changes: 4 additions & 0 deletions synapse/res/templates/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ body {
h3 { font-size: .85rem; }
h4 { font-size: .8rem; }
}

.error {
color: red;
}
7 changes: 6 additions & 1 deletion synapse/res/templates/terms.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
{% block title %}Authentication{% endblock %}

{% block header %}
<link rel="stylesheet" href="/_matrix/static/client/register/style.css">
<style type="text/css">
#registrationForm input {
display: block;
margin: auto;
}
</style>
{% endblock %}

{% block body %}
Expand Down
34 changes: 0 additions & 34 deletions synapse/static/client/register/index.html

This file was deleted.

2 changes: 0 additions & 2 deletions synapse/static/client/register/js/jquery-3.4.1.min.js

This file was deleted.

117 changes: 0 additions & 117 deletions synapse/static/client/register/js/register.js

This file was deleted.

3 changes: 0 additions & 3 deletions synapse/static/client/register/register_config.sample.js

This file was deleted.

64 changes: 0 additions & 64 deletions synapse/static/client/register/style.css

This file was deleted.