From 33f855a79163cd19f31baacd2d68757fe2cb65a4 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 29 Jun 2022 14:51:20 +0200
Subject: [PATCH] CB-2180 Web-based auth support

---
 .../src/io/cloudbeaver/utils/WebAppUtils.java                | 5 ++---
 webapp/packages/core-blocks/src/HTMLTemplates/sso.html.ejs   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
index f85a847352..45edfeb74c 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
@@ -145,12 +145,11 @@ public class WebAppUtils {
     }
 
     public static String getRequestCookie(HttpServletRequest request, String cookieName) {
-        String value = null;
         for (Cookie cookie : request.getCookies()) {
             if (cookie.getName().equals(cookieName)) {
-                value = cookie.getValue();
+                return cookie.getValue();
             }
         }
-        return value;
+        return null;
     }
 }
diff --git a/webapp/packages/core-blocks/src/HTMLTemplates/sso.html.ejs b/webapp/packages/core-blocks/src/HTMLTemplates/sso.html.ejs
index e5d60e5b85..d8f77ddfc4 100644
--- a/webapp/packages/core-blocks/src/HTMLTemplates/sso.html.ejs
+++ b/webapp/packages/core-blocks/src/HTMLTemplates/sso.html.ejs
@@ -1,5 +1,5 @@
 <div id="sso">
-  Success
+  Single sign on succeeded. Now you can close this page.
   <script>
     window.close();
   </script>