From 8932e94e0ee89d5f1d0ef6de13ac94422cd3ab2d Mon Sep 17 00:00:00 2001 From: AtmegaBuzz Date: Sun, 28 Aug 2022 00:08:58 +0530 Subject: [PATCH 1/4] wrong credentials error message showing --- bugheist/urls.py | 2 ++ website/views.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/bugheist/urls.py b/bugheist/urls.py index bb25d0e49b..5dce760027 100644 --- a/bugheist/urls.py +++ b/bugheist/urls.py @@ -49,6 +49,7 @@ GithubLogin, GoogleLogin, GoogleConnect, + CustomLoginView ) from website.api.views import ( IssueViewSet, @@ -305,6 +306,7 @@ ), re_path(r"^accounts/profile/", website.views.profile, name="account_profile"), re_path(r"^delete_issue/(?P\w+)/$", website.views.delete_issue, name="delete_issue"), + re_path(r"^accounts/login/",CustomLoginView.as_view(),name="login"), re_path(r"^accounts/", include("allauth.urls")), re_path(r"^start/$", TemplateView.as_view(template_name="hunt.html")), re_path(r"^hunt/$", login_required(HuntCreate.as_view()), name="hunt"), diff --git a/website/views.py b/website/views.py index e5f90adf8c..d3426092ed 100644 --- a/website/views.py +++ b/website/views.py @@ -20,6 +20,7 @@ #from django_cron import CronJobBase, Schedule from allauth.account.models import EmailAddress from allauth.account.signals import user_logged_in +from allauth.account.views import LoginView,_ajax_response from bs4 import BeautifulSoup from django.contrib import messages from django.contrib.auth import get_user_model @@ -3058,3 +3059,16 @@ def handler500(request, exception=None): # ) # mail.logout() +class CustomLoginView(LoginView): + + def post(self, request, *args, **kwargs): + form_class = self.get_form_class() + form = self.get_form(form_class) + if form.is_valid(): + response = self.form_valid(form) + else: + response = self.form_invalid(form) + messages.error(request,"Invalid Credentials") + return _ajax_response( + self.request, response, form=form, data=self._get_ajax_data_if() + ) \ No newline at end of file From 621feae89a43ab4760cb25659d94acec5e760618 Mon Sep 17 00:00:00 2001 From: AtmegaBuzz Date: Wed, 31 Aug 2022 13:58:22 +0530 Subject: [PATCH 2/4] fix login error not showing --- bugheist/urls.py | 2 -- website/templates/account/login.html | 8 ++++++++ website/views.py | 16 +--------------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/bugheist/urls.py b/bugheist/urls.py index 5dce760027..bb25d0e49b 100644 --- a/bugheist/urls.py +++ b/bugheist/urls.py @@ -49,7 +49,6 @@ GithubLogin, GoogleLogin, GoogleConnect, - CustomLoginView ) from website.api.views import ( IssueViewSet, @@ -306,7 +305,6 @@ ), re_path(r"^accounts/profile/", website.views.profile, name="account_profile"), re_path(r"^delete_issue/(?P\w+)/$", website.views.delete_issue, name="delete_issue"), - re_path(r"^accounts/login/",CustomLoginView.as_view(),name="login"), re_path(r"^accounts/", include("allauth.urls")), re_path(r"^start/$", TemplateView.as_view(template_name="hunt.html")), re_path(r"^hunt/$", login_required(HuntCreate.as_view()), name="hunt"), diff --git a/website/templates/account/login.html b/website/templates/account/login.html index 9727703a17..4cc471a34a 100644 --- a/website/templates/account/login.html +++ b/website/templates/account/login.html @@ -102,7 +102,15 @@

Login

{% trans "Forgot Password?" %} | Not yet a member? Join + {% if form.errors %} +
+ {% for _, error in form.errors.items %} + {{ error }} + {% endfor %} +
+ {% endif %} + {% endblock %} \ No newline at end of file diff --git a/website/views.py b/website/views.py index d3426092ed..51e026f2db 100644 --- a/website/views.py +++ b/website/views.py @@ -3057,18 +3057,4 @@ def handler500(request, exception=None): # data=json.dumps(data), # headers=headers, # ) -# mail.logout() - -class CustomLoginView(LoginView): - - def post(self, request, *args, **kwargs): - form_class = self.get_form_class() - form = self.get_form(form_class) - if form.is_valid(): - response = self.form_valid(form) - else: - response = self.form_invalid(form) - messages.error(request,"Invalid Credentials") - return _ajax_response( - self.request, response, form=form, data=self._get_ajax_data_if() - ) \ No newline at end of file +# mail.logout() \ No newline at end of file From ec083f3ab55d7bc252fc2f520a3e4ec39fc59aeb Mon Sep 17 00:00:00 2001 From: swapnil shinde Date: Wed, 31 Aug 2022 15:22:24 +0530 Subject: [PATCH 3/4] large filename error fix (#943) --- website/views.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/website/views.py b/website/views.py index 51e026f2db..608cf589f3 100644 --- a/website/views.py +++ b/website/views.py @@ -555,8 +555,16 @@ def get_initial(self): ) return initial - def form_valid(self, form): + def post(self, request, *args, **kwargs): + if len(request.FILES['screenshot'].name)>99: + filename = request.FILES['screenshot'].name + extension = filename.split(".")[-1] + request.FILES['screenshot'].name = filename[:88] + "." + extension + + return super().post(request, *args, **kwargs) + + def form_valid(self, form): tokenauth = False obj = form.save(commit=False) if self.request.user.is_authenticated: From ad81c99d15928f1a008c453f0ec3b47477f0f717 Mon Sep 17 00:00:00 2001 From: AtmegaBuzz Date: Wed, 31 Aug 2022 15:26:50 +0530 Subject: [PATCH 4/4] deps removed --- website/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/website/views.py b/website/views.py index 608cf589f3..8061f2cddf 100644 --- a/website/views.py +++ b/website/views.py @@ -20,7 +20,6 @@ #from django_cron import CronJobBase, Schedule from allauth.account.models import EmailAddress from allauth.account.signals import user_logged_in -from allauth.account.views import LoginView,_ajax_response from bs4 import BeautifulSoup from django.contrib import messages from django.contrib.auth import get_user_model