show option to log as guest if default login is hidden

Solves #11
pwielgolaski · Jul 29, 2017 · a9df953 · a9df953
1 parent eb5db59
commit a9df953
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/jetbrains/buildServer/auth/oauth/AuthenticationSchemeProperties.java b/src/main/java/jetbrains/buildServer/auth/oauth/AuthenticationSchemeProperties.java
@@ -91,4 +91,8 @@ public boolean isAllowInsecureHttps() {
                 .map(Boolean::valueOf)
                 .orElse(true);
     }
+
+    public boolean isGuestLoginAllowed() {
+        return loginConfiguration.isGuestLoginAllowed();
+    }
 }
diff --git a/src/main/resources/buildServerResources/loginViaOAuth.jsp b/src/main/resources/buildServerResources/loginViaOAuth.jsp
@@ -9,12 +9,25 @@
             .loginForm {
                 display: none;
             }
+
+            .oauth-guest-section {
+                text-align: right;
+                padding-top: 0.5em;
+            }
         </style>
     </c:if>
     <div>
         <form action="<c:url value='${oauthLoginUrl}'/>" method="GET">
             <input class="btn loginButton" style="margin: auto; display: block" type="submit" name="submitLogin"
                    value="Log in via oAuth">
+            <c:if test="${oauth2_settings.hideLoginForm and oauth2_settings.guestLoginAllowed}">
+                <div class="oauth-guest-section">
+                    <span class="greyNote">
+                        <a href="<c:url value='/guestLogin.html?guest=1'/>">Log in as guest</a>&nbsp;
+                        <bs:help file="User+Account"/>
+                    </span>
+                </div>
+            </c:if>
         </form>
     </div>
 </c:if>