diff --git a/Post/test.py b/Post/test.py index d33cf97..77adc32 100755 --- a/Post/test.py +++ b/Post/test.py @@ -411,6 +411,16 @@ class SpecialSubmitterTest(TestCase): self.assertContains(client.get("/Errors/Latest/"), "Latest Autobuilder errors") +@override_settings(ALLOWED_HOSTS=["testhost"]) +class AccountPagesRemovedTest(TestCase): + def test_accounts_urls_are_gone(self): + client = Client(HTTP_HOST="testhost") + for url in ("/accounts/register/", "/accounts/login/"): + self.assertEqual(client.get(url).status_code, 404) + # The admin keeps its own login page. + self.assertEqual(client.get("/admin/login/").status_code, 200) + + @patch("Post.management.commands.culldb.time.sleep") class CullDbTest(TestCase): def setUp(self): diff --git a/project/settings.py b/project/settings.py index 529086b..28e526b 100644 --- a/project/settings.py +++ b/project/settings.py @@ -177,7 +177,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', # Uncomment the next line to enable admin documentation: 'django.contrib.admindocs', - # 'registration', ) # A sample logging configuration. The only tangible logging @@ -211,10 +210,8 @@ LOGGING = { BUGZILLA_URL = 'https://bugzilla.yoctoproject.org' -ACCOUNT_ACTIVATION_DAYS = 2 EMAIL_HOST = 'localhost' DEFAULT_FROM_EMAIL = 'noreply@example.com' -LOGIN_REDIRECT_URL = '/Errors' TEST_RUNNER = 'django.test.runner.DiscoverRunner' DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' diff --git a/project/settings.py.docker b/project/settings.py.docker index b98006e..bce1347 100644 --- a/project/settings.py.docker +++ b/project/settings.py.docker @@ -171,7 +171,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', # Uncomment the next line to enable admin documentation: 'django.contrib.admindocs', - # 'registration', ) # A sample logging configuration. The only tangible logging @@ -205,10 +204,8 @@ LOGGING = { BUGZILLA_URL = 'https://bugzilla.yoctoproject.org' -ACCOUNT_ACTIVATION_DAYS = 2 EMAIL_HOST = 'localhost' DEFAULT_FROM_EMAIL = 'noreply@example.com' -LOGIN_REDIRECT_URL = '/Errors' TEST_RUNNER = 'django.test.runner.DiscoverRunner' DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' diff --git a/project/urls.py b/project/urls.py index 16f5b6d..79b4d34 100644 --- a/project/urls.py +++ b/project/urls.py @@ -6,7 +6,7 @@ # # Licensed under the MIT license, see COPYING.MIT for details -from django.urls import include, re_path +from django.urls import re_path from django.contrib import admin from django.views.generic import TemplateView, RedirectView from django.conf import settings @@ -26,7 +26,6 @@ urlpatterns = [ # Uncomment the next line to enable the admin: re_path(r'^admin/', admin.site.urls), - re_path(r'^accounts/', include('django_registration.backends.activation.urls')), re_path(r'^Errors/Latest/$', post_views.search, { 'mode' : results_mode.LATEST }, name= "latest_errors"), re_path(r'^Errors/Latest/feed$', LatestEntriesFeed(), name="errors_feed"), re_path(r'^Errors/Latest/'+special_submitter+'/$', post_views.search, { 'mode' : results_mode.SPECIAL_SUBMITTER}, name= "latest_autobuilder_errors"), diff --git a/requirements.txt b/requirements.txt index f5022da..40f3433 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,3 @@ Django>=5.2.18,<5.3 python-Levenshtein==0.27.4 bleach==6.4.0 mysqlclient==2.3.0 -django-registration==5.2.1 diff --git a/templates/base.html b/templates/base.html index 88c110d..0d327d6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -31,27 +31,6 @@ Licensed under the MIT license, see COPYING.MIT for details
Error reports - {% comment %} - {% if user.is_authenticated %} -
- - {{ user.username }} - - - -
- {% endif %} - {% if not user.is_authenticated %} - - {% endif %} - {% endcomment %}
diff --git a/templates/registration/activate.html b/templates/registration/activate.html deleted file mode 100644 index 6e24890..0000000 --- a/templates/registration/activate.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} - -{% if account %} - -

{% trans "Account successfully activated" %}

- -

{% trans "Log in" %}

- -{% else %} - -

{% trans "Account activation failed" %}

- -{% endif %} - -{% endblock %} diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html deleted file mode 100644 index aef17be..0000000 --- a/templates/registration/activation_complete.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} - -{% blocktrans %} - -Activation is complete. -
-You can log in now. - -{% endblocktrans %} - -{% endblock %} diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt deleted file mode 100644 index fe8db74..0000000 --- a/templates/registration/activation_email.txt +++ /dev/null @@ -1,14 +0,0 @@ -{% load i18n %} -{% blocktrans with site.name as site_name %} -A request has been made to activate an account at {{ site_name }} using your email address. - -If you made this request, please click on the link below to activate your account. The -link is valid for {{ expiration_days }} days. - -{% endblocktrans %} - -http://{{ site.domain }}{% url "registration_activate" activation_key %} - -{% blocktrans %} -If you did not make this request, please ignore this message. -{% endblocktrans %} diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt deleted file mode 100644 index 24f477c..0000000 --- a/templates/registration/activation_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -{% load i18n %}{% trans "Account activation on" %} {{ site.name }} diff --git a/templates/registration/login.html b/templates/registration/login.html deleted file mode 100644 index a6ae44f..0000000 --- a/templates/registration/login.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-

Log in to the error reporting tool

-
- - {{ form.as_p }} - - - - {% csrf_token %} - - -

{% trans "Forgot password" %}? {% trans "Reset it" %}!

-

{% trans "Don't have an account" %}? {% trans "Create one now" %}!

-{% endblock %} diff --git a/templates/registration/logout.html b/templates/registration/logout.html deleted file mode 100644 index f8da51f..0000000 --- a/templates/registration/logout.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -

{% trans "Logged out" %}

-{% endblock %} diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html deleted file mode 100644 index 659be0a..0000000 --- a/templates/registration/password_change_done.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -

{% trans "Password changed" %}

-{% endblock %} diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html deleted file mode 100644 index d74f39e..0000000 --- a/templates/registration/password_change_form.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
- {{ form.as_p }} - - - {% csrf_token %} -
-{% endblock %} diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html deleted file mode 100644 index d9f3879..0000000 --- a/templates/registration/password_reset_complete.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} - -

{% trans "Password reset successfully" %}

- -

{% trans "Log in" %}

- -{% endblock %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html deleted file mode 100644 index 186ece5..0000000 --- a/templates/registration/password_reset_confirm.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} - -{% if validlink %} - -
- {{ form.as_p }} - - - {% csrf_token %} -
- -{% else %} - -

{% trans "Password reset failed" %}

- -{% endif %} - -{% endblock %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html deleted file mode 100644 index b8ef93c..0000000 --- a/templates/registration/password_reset_done.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -

{% trans "An email with password reset instructions has been sent." %}

-{% endblock %} diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html deleted file mode 100644 index f219c68..0000000 --- a/templates/registration/password_reset_email.html +++ /dev/null @@ -1,5 +0,0 @@ -{% load i18n %} -{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}: -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url "auth_password_reset_confirm" uidb36=uid, token=token %} -{% endblock %} diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html deleted file mode 100644 index 067f15e..0000000 --- a/templates/registration/password_reset_form.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-

Reset your password

-
-
- {{ form.as_p }} - - - {% csrf_token %} -
-{% endblock %} diff --git a/templates/registration/registration_base.html b/templates/registration/registration_base.html deleted file mode 100644 index 752ce7e..0000000 --- a/templates/registration/registration_base.html +++ /dev/null @@ -1,12 +0,0 @@ - {% load i18n %} - - - - - - - {% trans "log in" %} - - - diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html deleted file mode 100644 index 0d1b2ef..0000000 --- a/templates/registration/registration_complete.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -

{% trans "Your account has been created, however it must now be activated. An email has been sent with instructions on how to activate your account." %}

-{% endblock %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html deleted file mode 100644 index 32cb55b..0000000 --- a/templates/registration/registration_form.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block content %} -
-

Create an account

-
- -
- {{ form.as_p }} - - - {% csrf_token %} -
-{% endblock %}