fix: use inline type for disposition

Author: jrbenriquez

django_email_verification/confirm.py

@@ -82,18 +82,18 @@ def has_decorator(k):
         if not validators.url(context['link']):
             logger.warning(f'{DJANGO_EMAIL_VERIFICATION_MALFORMED_URL} - {context["link"]}')
 
-    subject = Template(subject).render(Context(context))
-
-    text = render_to_string(mail_plain, context)
-
-    html = render_to_string(mail_html, context)
-
     do_convert_base64_images = _get_validated_field(f'EMAIL_CONVERT_BASE64_IMAGES', default=False, use_default=True, default_type=bool)
 
     attachments = []
     if do_convert_base64_images:
         # Look for inline base64 images and converts them to attachments for email providers that require them i.e. Gmail
-        html, attachments = convert_base64_images(html, attachments)
+        mail_html, attachments = convert_base64_images(mail_html, attachments)
+
+    subject = Template(subject).render(Context(context))
+
+    text = render_to_string(mail_plain, context)
+
+    html = render_to_string(mail_html, context)
 
     msg = EmailMultiAlternatives(subject, text, sender, [user.email], attachments=attachments)
 

django_email_verification/utils.py

@@ -21,7 +21,7 @@ def repl(match):
                 "data": match.group("data"),
                 "subtype": subtype,
             }
-        return ' src="cid:image%s"' % key
+        return ' src="cid:image-%s"' % key
 
     # Compile pattern for base64 inline images
     RE_BASE64_SRC = re.compile(
@@ -44,8 +44,8 @@ def repl(match):
                 )
             else:
                 raise
-        image.add_header('Content-ID', '<image%s>' % key)
-        image.add_header('Content-Disposition', "attachment; filename=%s" % f'image_{random_string(length=6)}')
+        image.add_header('Content-ID', '<image-%s>' % key)
+        image.add_header('Content-Disposition', "inline; filename=%s" % f'image_{random_string(length=6)}')
         attachments.append(image)
 
     return body, attachments