From 5d5af8b8443b6377aca71ec6f1cb91804ccdfc36 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 4 Dec 2023 17:22:17 -0600 Subject: [PATCH 1/2] Fix send_verification_email args. --- verify_email/email_handler.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/verify_email/email_handler.py b/verify_email/email_handler.py index b3fae6f..dab14b1 100644 --- a/verify_email/email_handler.py +++ b/verify_email/email_handler.py @@ -29,15 +29,15 @@ def __send_email(self, msg, useremail): # Public : def send_verification_link(self, request, inactive_user=None, form=None): - + if form: inactive_user = form.save(commit=False) - + inactive_user.is_active = False inactive_user.save() try: - + useremail = form.cleaned_data.get(self.settings.get('email_field_name')) if form else inactive_user.email if not useremail: raise KeyError( @@ -49,7 +49,7 @@ def send_verification_link(self, request, inactive_user=None, form=None): verification_url = self.token_manager.generate_link(request, inactive_user, useremail) msg = render_to_string( self.settings.get('html_message_template', raise_exception=True), - {"link": verification_url, "inactive_user": inactive_user}, + {"link": verification_url, "inactive_user": inactive_user}, request=request ) @@ -67,7 +67,7 @@ def resend_verification_link(self, request, email, **kwargs): - UserAlreadyActive (by) get_user_by_token() - MaxRetryExceeded (by) request_new_link() - InvalidTokenOrEmail - + These exception should be handled in caller function. """ inactive_user = kwargs.get('user') @@ -94,7 +94,7 @@ def resend_verification_link(self, request, email, **kwargs): # These is supposed to be called outside of this module -def send_verification_email(request, form): +def send_verification_email(request, **kwargs): return _VerifyEmail().send_verification_link(request, form) From 4b6ecf70a94175d3813e03f33388678233fa8d49 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Mon, 4 Dec 2023 17:39:34 -0600 Subject: [PATCH 2/2] Finish fixing send_verification_email args. --- verify_email/email_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/verify_email/email_handler.py b/verify_email/email_handler.py index dab14b1..25945a9 100644 --- a/verify_email/email_handler.py +++ b/verify_email/email_handler.py @@ -95,7 +95,7 @@ def resend_verification_link(self, request, email, **kwargs): # These is supposed to be called outside of this module def send_verification_email(request, **kwargs): - return _VerifyEmail().send_verification_link(request, form) + return _VerifyEmail().send_verification_link(request, **kwargs) # These is supposed to be called outside of this module