Skip to content

Commit

Permalink
Enlève un middleware inutile (zestedesavoir#3983)
Browse files Browse the repository at this point in the history
* Enlève un middleware inutile

On force l'https chez tout le monde depuis quelques mois.

* victor, nettoyeur
  • Loading branch information
vhf authored and gustavi committed Nov 18, 2016
1 parent 4f74cba commit b3736ea
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 48 deletions.
11 changes: 11 additions & 0 deletions update.md
Original file line number Diff line number Diff line change
Expand Up @@ -817,3 +817,14 @@ Actions à faire pour masquer la barre de recherche
--------------------------------------------------

Ajouter `ZDS_APP['display_search_bar'] = False` à `settings_prod.py`

`settings_prod.py`
------------------

```diff
'zds.utils.ThreadLocals',
'zds.middlewares.SetLastVisitMiddleware.SetLastVisitMiddleware',
'zds.middlewares.profile.ProfileMiddleware',
- 'zds.middlewares.ForceHttpsMembersMiddleware.ForceHttpsMembersMiddleware',
)
```
7 changes: 0 additions & 7 deletions zds/member/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
from zds.tutorialv2.models.models_database import PublishableContent
from zds.notification.models import TopicAnswerSubscription, NewPublicationSubscription
from zds.tutorialv2.models.models_database import PublishedContent
from zds.utils.decorators import https_required
from zds.utils.models import Comment, CommentVote
from zds.utils.mps import send_mp
from zds.utils.paginator import ZdSPagingListView
Expand Down Expand Up @@ -256,7 +255,6 @@ class RegisterView(CreateView, ProfileCreate, TokenGenerator):
form_class = RegisterForm
template_name = 'member/register/index.html'

@method_decorator(https_required)
def dispatch(self, *args, **kwargs):
return super(RegisterView, self).dispatch(*args, **kwargs)

Expand Down Expand Up @@ -612,7 +610,6 @@ def settings_mini_profile(request, user_name):
return render(request, "member/settings/profile.html", data)


@https_required
def login_view(request):
"""Log in user."""

Expand Down Expand Up @@ -685,7 +682,6 @@ def logout_view(request):
return redirect(reverse("homepage"))


@https_required
def forgot_password(request):
"""If the user forgot his password, he can have a new one."""

Expand Down Expand Up @@ -738,7 +734,6 @@ def forgot_password(request):
return render(request, "member/forgot_password/index.html", {"form": form})


@https_required
def new_password(request):
"""Create a new password for a user."""

Expand Down Expand Up @@ -766,7 +761,6 @@ def new_password(request):
return render(request, "member/new_password/index.html", {"form": form})


@https_required
def active_account(request):
"""Active token for a user."""

Expand Down Expand Up @@ -818,7 +812,6 @@ def active_account(request):
return render(request, "member/register/token_success.html", {"usr": usr, "form": form})


@https_required
def generate_token_account(request):
"""Generate token for account."""

Expand Down
17 changes: 0 additions & 17 deletions zds/middlewares/ForceHttpsMembersMiddleware.py

This file was deleted.

7 changes: 0 additions & 7 deletions zds/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
'zds.utils.ThreadLocals',
'zds.middlewares.SetLastVisitMiddleware.SetLastVisitMiddleware',
'zds.middlewares.profile.ProfileMiddleware',
'zds.middlewares.ForceHttpsMembersMiddleware.ForceHttpsMembersMiddleware',
)

ROOT_URLCONF = 'zds.urls'
Expand Down Expand Up @@ -322,12 +321,6 @@

SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"

# Change to True to force HTTPS for members
FORCE_HTTPS_FOR_MEMBERS = False
# Change to True to force HTTPS on views with `@https_required`
ENABLE_HTTPS_DECORATOR = False


LOGIN_URL = '/membres/connexion'

ABSOLUTE_URL_OVERRIDES = {
Expand Down
17 changes: 0 additions & 17 deletions zds/utils/decorators.py

This file was deleted.

0 comments on commit b3736ea

Please sign in to comment.