fix forced authentication

diff --git a/server/sonar-web/src/main/js/main/app.js b/server/sonar-web/src/main/js/main/app.js
index dcb9c75ba4c487c9ecd20e2e9b5208dbbc0bb34f..b4e0170b3c76029d11201d66d7254b7127469b1f 100644 (file)
--- a/server/sonar-web/src/main/js/main/app.js
+++ b/server/sonar-web/src/main/js/main/app.js
@@ -13,23 +13,33 @@ Backbone.$ = $;
 
 
 function requestLocalizationBundle () {
-  return new Promise(resolve => window.requestMessages().done(resolve));
+  if (!window.sonarqube.bannedNavigation) {
+    return new Promise(resolve => window.requestMessages().done(resolve));
+  } else {
+    return Promise.resolve();
+  }
 }
 
 function startNavigation () {
-  return new Navigation().start();
+  if (!window.sonarqube.bannedNavigation) {
+    return new Navigation().start();
+  } else {
+    return Promise.resolve();
+  }
 }
 
 function prepareAppOptions (navResponse) {
   let appOptions = { el: '#content' };
-  appOptions.rootQualifiers = navResponse.global.qualifiers;
-  if (navResponse.component) {
-    appOptions.component = {
-      id: navResponse.component.uuid,
-      key: navResponse.component.key,
-      name: navResponse.component.name,
-      qualifier: _.last(navResponse.component.breadcrumbs).qualifier
-    };
+  if (navResponse) {
+    appOptions.rootQualifiers = navResponse.global.qualifiers;
+    if (navResponse.component) {
+      appOptions.component = {
+        id: navResponse.component.uuid,
+        key: navResponse.component.key,
+        name: navResponse.component.name,
+        qualifier: _.last(navResponse.component.breadcrumbs).qualifier
+      };
+    }
   }
   return appOptions;
 }

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb
index fa8743726280eb06f4c23b2d36ae5db498361427..6ff414fd6570ac5514064b163a87165c3602ed51 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/nonav.html.erb
@@ -30,6 +30,7 @@
 </div>
 
 <script>
+  window.sonarqube.bannedNavigation = true;
   (function ($) {
     $('html').addClass('dashboard-page');
   })(window.jQuery);