Merge pull request #187 from RickyCook/fix-anon-projects

Fix getting auth token with anon user

Author: RickyCook

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### v0.0.4-1
+- Fix issue browsing anonymously #187
+
 ## v0.0.4
 - Upgrade YAML model #146
 - Fix email #147

dockci/templates/project.html

@@ -14,30 +14,32 @@
 <div class="checkbox"><label>
   <input id="filterStable" type="checkbox" {{ 'checked' if versioned else '' }}>Only stable releases
 </label></div>
-<div id="delete-dialog" class="modal fade" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h4 class="modal-title">Really delete {{ project.name }}?</h4>
-      </div>
-      <div class="modal-body">
-        <p>This will delete all job logs, artifacts, and GitHub hooks but not
-           any Docker images or containers.</p>
-      </div>
-      <div class="modal-footer">
-        <form action="{{ url_for('project_view', slug=project.slug) }}" method="POST">
-          <input type="hidden" name="operation" value="delete" />
-          <input type="hidden" name="auth_token" value="{{ auth_token_delete.auth_token }}" />
-          <input type="hidden" name="expiry" value="{{ auth_token_delete.expiry }}" />
+{% if current_user.is_authenticated() %}
+  <div id="delete-dialog" class="modal fade" tabindex="-1">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+          <h4 class="modal-title">Really delete {{ project.name }}?</h4>
+        </div>
+        <div class="modal-body">
+          <p>This will delete all job logs, artifacts, and GitHub hooks but not
+             any Docker images or containers.</p>
+        </div>
+        <div class="modal-footer">
+          <form action="{{ url_for('project_view', slug=project.slug) }}" method="POST">
+            <input type="hidden" name="operation" value="delete" />
+            <input type="hidden" name="auth_token" value="{{ auth_token_delete.auth_token }}" />
+            <input type="hidden" name="expiry" value="{{ auth_token_delete.expiry }}" />
 
-          <button class="btn" data-dismiss="modal">Cancel</button>
-          <input type="submit" class="btn btn-danger" value="Delete" />
-        </form>
+            <button class="btn" data-dismiss="modal">Cancel</button>
+            <input type="submit" class="btn btn-danger" value="Delete" />
+          </form>
+        </div>
       </div>
     </div>
   </div>
-</div>
+{% endif %}
 <table id="jobs-list" class="table table-striped">
   <tr><th>Created</th><th>Tag</th><th>Commit ref</th><th>Author</th><th>State</th></tr>
   {% for job in jobs -%}

dockci/views/project.py

@@ -63,8 +63,24 @@ def project_view(slug):
         if next_page_offset > len(jobs):
             next_page_offset = None
 
+        jobs = jobs[page_offset:page_offset + page_size]
+        return render_template(
+            'project.html',
+            project=project,
+            jobs=jobs,
+            versioned=versioned,
+            prev_page_offset=prev_page_offset,
+            next_page_offset=next_page_offset,
+            page_size=page_size,
+            auth_token_delete=get_auth_token_delete(project),
+        )
+
+
+def get_auth_token_delete(project):
+    """ Get an auth token to delete the project for the current user """
+    if current_user.is_authenticated():
         auth_token_expires = auth_token_expiry()
-        auth_token_delete = {
+        return {
             'auth_token': create_auth_token(
                 CONFIG.secret, auth_token_data(
                     current_user, project, 'delete', auth_token_expires
@@ -73,16 +89,7 @@ def project_view(slug):
             'expiry': auth_token_expires,
         }
 
-        jobs = jobs[page_offset:page_offset + page_size]
-        return render_template('project.html',
-                               project=project,
-                               jobs=jobs,
-                               versioned=versioned,
-                               prev_page_offset=prev_page_offset,
-                               next_page_offset=next_page_offset,
-                               page_size=page_size,
-                               auth_token_delete=auth_token_delete,
-                               )
+    return None
 
 
 @APP.route('/projects/<slug>/edit', methods=('GET', 'POST'))