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/e80a670b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e80a670b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e80a670b Branch: refs/heads/support/nifi-1.0.x Commit: e80a670b0ecc9b6a06e415010c188793b5575021 Parents: cdfed07 Author: Yolanda M. Davis <yolanda.m.da...@gmail.com> Authored: Mon Sep 26 12:11:28 2016 -0400 Committer: jpercivall <jperciv...@apache.org> Committed: Thu Dec 15 11:16:59 2016 -0500 ---------------------------------------------------------------------- .../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/e80a670b/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/e80a670b/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'];