From 97f7e56635691dc9a20471530d4fcefe97a68ecd Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 6 Oct 2015 15:31:11 -0400
Subject: [PATCH] add token to href of downloadable standard out

---
 awx/ui/client/src/helpers/LogViewer.js           | 4 ++--
 awx/ui/client/src/partials/job_stdout.html       | 2 +-
 awx/ui/client/src/partials/job_stdout_adhoc.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/helpers/LogViewer.js b/awx/ui/client/src/helpers/LogViewer.js
index bc2f7e6835..90e9a3f407 100644
--- a/awx/ui/client/src/helpers/LogViewer.js
+++ b/awx/ui/client/src/helpers/LogViewer.js
@@ -359,13 +359,13 @@ export default
             };
         }])
 
-        .factory('AddPreFormattedText', [function() {
+        .factory('AddPreFormattedText', ['$rootScope', function($rootScope) {
             return function(params) {
                 var id = params.id,
                     val = params.val,
                     html = "";
                 if (params.standardOut) {
-                    html += '<a href="' + params.jobUrl + 'stdout?format=txt_download" class="btn btn-primary btn-xs  DownloadStandardOut DownloadStandardOut--onModal" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="status === \'cancelled\' || status === \'failed\' || status === \'error\' || status === \'successful\'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>';
+                    html += '<a ng-href="' + params.jobUrl + 'stdout?format=txt_download&token=' + $rootScope.token + '" class="btn btn-primary btn-xs  DownloadStandardOut DownloadStandardOut--onModal" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="status === \'cancelled\' || status === \'failed\' || status === \'error\' || status === \'successful\'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>';
                     html += "<pre class='DownloadStandardOut-pre' ng-non-bindable>" + val + "</pre>\n";
                 } else {
                     html += "<pre ng-non-bindable>" + val + "</pre>\n";
diff --git a/awx/ui/client/src/partials/job_stdout.html b/awx/ui/client/src/partials/job_stdout.html
index 8c113d908c..9ec92b6706 100644
--- a/awx/ui/client/src/partials/job_stdout.html
+++ b/awx/ui/client/src/partials/job_stdout.html
@@ -22,7 +22,7 @@
             <div class="panel panel-default job-stdout-panel">
               <div class="panel-heading">
                 <h3 class="panel-title">Standard Output
-                <a href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'">
+                <a href="/api/v1/jobs/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'">
                         <i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download
                 </a>
               </div>
diff --git a/awx/ui/client/src/partials/job_stdout_adhoc.html b/awx/ui/client/src/partials/job_stdout_adhoc.html
index 3dcac4097e..52b51565d7 100644
--- a/awx/ui/client/src/partials/job_stdout_adhoc.html
+++ b/awx/ui/client/src/partials/job_stdout_adhoc.html
@@ -160,7 +160,7 @@
         <div class="panel panel-default">
           <div class="panel-heading">
             <h3 class="panel-title">Standard Output
-            <a href="/api/v1/ad_hoc_commands/{{ job.id }}/stdout?format=txt_download" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>
+            <a ng-href="/api/v1/ad_hoc_commands/{{ job.id }}/stdout?format=txt_download&token={{ token }}" class="btn btn-primary btn-xs DownloadStandardOut DownloadStandardOut--onStandardOutPage" id="download-stdout-button" type="button" aw-tool-tip="Download standard out as a .txt file" data-placement="top" ng-show="job.status === 'cancelled' || job.status === 'failed' || job.status === 'error' || job.status === 'successful'"><i class="fa fa-download DownloadStandardOut-icon DownloadStandardOut-icon--withText"></i>Download</a>
             </h3>
           </div>
           <div class="panel-body stdout-panel-body">