From 70ecb1039bcc8c19cc93ebb51543943e22d67ddf Mon Sep 17 00:00:00 2001
From: Naga Kiran <nagakiran@juniper.net>
Date: Sat, 27 Feb 2016 12:41:04 +0530
Subject: [PATCH] Closes-Bug: #1550290 Don't send X-Auth-Token & X_API_ROLE
 headers in request to API server if multitenancy is disabled

Change-Id: I9bae4cd1e2abee23f994bb3480a4fc82f13b5afa
---
 src/serverroot/web/api/configServer.main.api.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/serverroot/web/api/configServer.main.api.js b/src/serverroot/web/api/configServer.main.api.js
index dafdb5484..2a8734c2a 100644
--- a/src/serverroot/web/api/configServer.main.api.js
+++ b/src/serverroot/web/api/configServer.main.api.js
@@ -77,8 +77,10 @@ function configAppHeaders (headers, appData)
             }
         }
     } catch(e) {
-        headers['X-Auth-Token'] = null;
-        headers['X_API_ROLE'] = null;
+        if (true == multiTenancyEnabled) {
+            headers['X-Auth-Token'] = null;
+            headers['X_API_ROLE'] = null;
+        }
     }
     return headers;
 }