From ec7529399e66ec0f225397b22b5df0d3fdf9c5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristi=20V=C3=AEjdea?= <cristi@cvjd.me>
Date: Sun, 9 Sep 2018 21:52:02 +0300
Subject: [PATCH] Fix swagger-ui style when session auth is disabled

---
 src/drf_yasg/static/drf-yasg/style.css          | 4 ----
 src/drf_yasg/static/drf-yasg/swagger-ui-init.js | 9 +++++++--
 src/drf_yasg/templates/drf-yasg/swagger-ui.html | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/drf_yasg/static/drf-yasg/style.css b/src/drf_yasg/static/drf-yasg/style.css
index b06852f..60bf8ef 100644
--- a/src/drf_yasg/static/drf-yasg/style.css
+++ b/src/drf_yasg/static/drf-yasg/style.css
@@ -19,10 +19,6 @@ body.swagger-body {
     background: #fafafa;
 }
 
-#django-session-auth {
-    margin-right: 8px;
-}
-
 .hidden {
     display: none;
 }
diff --git a/src/drf_yasg/static/drf-yasg/swagger-ui-init.js b/src/drf_yasg/static/drf-yasg/swagger-ui-init.js
index 8c64cfe..fc26231 100644
--- a/src/drf_yasg/static/drf-yasg/swagger-ui-init.js
+++ b/src/drf_yasg/static/drf-yasg/swagger-ui-init.js
@@ -6,6 +6,11 @@ function patchSwaggerUi() {
     var authWrapper = document.querySelector('.auth-wrapper');
     var authorizeButton = document.querySelector('.auth-wrapper .authorize');
     var djangoSessionAuth = document.querySelector('#django-session-auth');
+    if (!djangoSessionAuth) {
+        console.log("WARNING: session auth disabled");
+        return;
+    }
+
     if (document.querySelector('.auth-wrapper #django-session-auth')) {
         console.log("WARNING: session auth already patched; skipping patchSwaggerUi()");
         return;
@@ -57,7 +62,7 @@ function initSwaggerUi() {
         }
     }
 
-    console.log(swaggerSettings);
+    console.log('swaggerSettings', swaggerSettings);
     for (var p in swaggerSettings) {
         if (swaggerSettings.hasOwnProperty(p)) {
             swaggerConfig[p] = swaggerSettings[p];
@@ -66,7 +71,7 @@ function initSwaggerUi() {
     window.ui = SwaggerUIBundle(swaggerConfig);
 
     var oauth2Config = JSON.parse(document.getElementById('oauth2-config').innerHTML);
-    console.log(oauth2Config);
+    console.log('oauth2Config', oauth2Config);
     window.ui.initOAuth(oauth2Config);
 }
 
diff --git a/src/drf_yasg/templates/drf-yasg/swagger-ui.html b/src/drf_yasg/templates/drf-yasg/swagger-ui.html
index c4a9a1e..570a10a 100644
--- a/src/drf_yasg/templates/drf-yasg/swagger-ui.html
+++ b/src/drf_yasg/templates/drf-yasg/swagger-ui.html
@@ -69,8 +69,8 @@
 
 <a id="oauth2-redirect-url" href="{% static 'drf-yasg/swagger-ui-dist/oauth2-redirect.html' %}" class="hidden"></a>
 
-<div id="django-session-auth" class="hidden">
-    {% if USE_SESSION_AUTH %}
+{% if USE_SESSION_AUTH %}
+    <div id="django-session-auth" class="hidden">
         {% csrf_token %}
         {% if request.user.is_authenticated %}
             <div class="hello">
@@ -91,8 +91,8 @@
                 </a>
             </div>
         {% endif %}
-    {% endif %}
-</div>
+    </div>
+{% endif %}
 </body>
 
 </html>