From 1474f144fec88c25d7b406b30b326fefefd0ca6c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 18 Mar 2018 23:01:23 -0700
Subject: [PATCH] View sent newsletters without authentication

---
 .../default/newsletter_preview.html           |  4 ---
 plexpy/webserve.py                            | 28 ++++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/data/interfaces/default/newsletter_preview.html b/data/interfaces/default/newsletter_preview.html
index 7496e631..61219ea4 100644
--- a/data/interfaces/default/newsletter_preview.html
+++ b/data/interfaces/default/newsletter_preview.html
@@ -27,11 +27,7 @@
 <script>
 $(document).ready(function () {
     var frame = $('<iframe></iframe>', {
-        % if newsletter_uuid:
-        src: '${http_root}real_newsletter?newsletter_uuid=${newsletter_uuid}',
-        % else:
         src: '${http_root}real_newsletter?newsletter_id=${newsletter_id}&preview=true',
-        % endif
         frameborder: '0',
         style: 'display: none; height: 100vh; width: 100vw;'
     });
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index c2fb0071..f840beae 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -5599,23 +5599,25 @@ class WebInterface(object):
             return "No newsletter id received."
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
     def newsletter(self, *args, **kwargs):
-        newsletter_uuid = args[0] if args else None
-        newsletter_id = kwargs.pop('newsletter_id', None)
-        return serve_template(templatename="newsletter_preview.html",
-                              title="Newsletter",
-                              newsletter_id=newsletter_id,
-                              newsletter_uuid=newsletter_uuid)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def real_newsletter(self, newsletter_id=None, newsletter_uuid=None, start_date=None, end_date=None,
-                        preview=False, master=False, raw=False, **kwargs):
-        if newsletter_uuid:
+        if args:
+            newsletter_uuid = args[0]
             newsletter = newsletter_handler.get_newsletter(newsletter_uuid=newsletter_uuid)
             return newsletter
 
+        return self._newsletter(**kwargs)
+
+    @cherrypy.expose
+    @requireAuth(member_of("admin"))
+    def _newsletter(self, newsletter_id=None, **kwargs):
+        return serve_template(templatename="newsletter_preview.html",
+                              title="Newsletter",
+                              newsletter_id=newsletter_id)
+
+    @cherrypy.expose
+    @requireAuth(member_of("admin"))
+    def real_newsletter(self, newsletter_id=None, start_date=None, end_date=None,
+                        preview=False, master=False, raw=False, **kwargs):
         if newsletter_id and newsletter_id != 'None':
             newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)