You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/09/26 19:17:45 UTC
nifi git commit: NIFI-2822 - pass the JWT Authorization token i. This
closes #1065
Repository: nifi
Updated Branches:
refs/heads/master 886823599 -> 30f008d67
NIFI-2822 - pass the JWT Authorization token i. This closes #1065
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/30f008d6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/30f008d6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/30f008d6
Branch: refs/heads/master
Commit: 30f008d6764ac9f41c9bbdeec723ed09ac5c44a6
Parents: 8868235
Author: Yolanda M. Davis <yo...@gmail.com>
Authored: Mon Sep 26 12:11:28 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Sep 26 15:16:32 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/index.jsp | 2 ++
.../nifi-jolt-transform-json-ui/src/main/webapp/app/app.js | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/30f008d6/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
index 96eda99..26ba321 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -31,6 +31,8 @@
<script type="text/javascript" src="../nifi/js/codemirror/addon/lint/lint.js"></script>
<script type="text/javascript" src="../nifi/js/codemirror/addon/lint/json-lint.js"></script>
<script type="text/javascript" src="../nifi/js/jsonlint/jsonlint.min.js"></script>
+<script type="text/javascript" src="../nifi/js/nf/nf-namespace.js"></script>
+<script type="text/javascript" src="../nifi/js/nf/nf-storage.js"></script>
<script type="text/javascript" src="../nifi/assets/angular/angular.min.js"></script>
<script type="text/javascript" src="../nifi/assets/angular-animate/angular-animate.min.js"></script>
<script type="text/javascript" src="../nifi/assets/angular-aria/angular-aria.min.js"></script>
http://git-wip-us.apache.org/repos/asf/nifi/blob/30f008d6/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
index 67c440c..2e9cf0c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/app/app.js
@@ -17,7 +17,12 @@
'use strict';
-var AppRun = function($rootScope,$state){
+var AppRun = function($rootScope,$state,$http){
+
+ if (nf.Storage.hasItem('jwt')) {
+ var token = nf.Storage.getItem('jwt');
+ $http.defaults.headers.common.Authorization = 'Bearer ' + token;
+ }
$rootScope.$on('$stateChangeError', function(event, toState, toParams, fromState, fromParams, error){
event.preventDefault();
@@ -35,7 +40,7 @@ var AppConfig = function ($urlRouterProvider) {
};
-AppRun.$inject = ['$rootScope','$state'];
+AppRun.$inject = ['$rootScope','$state','$http'];
AppConfig.$inject = ['$urlRouterProvider'];