From a51509ad345a4fbb2a9d29e6d7a46db3bc5ea675 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 26 Sep 2023 15:06:25 +0800
Subject: [PATCH 1/2] chore: bump dashboard vsn to e1.3.0-beta.6

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e4470c5f5..081e24001 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
 export EMQX_DASHBOARD_VERSION ?= v1.4.1
-export EMQX_EE_DASHBOARD_VERSION ?= e1.2.1
+export EMQX_EE_DASHBOARD_VERSION ?= e1.3.0-beta.6
 
 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
 # In make 4.4+, for backward-compatibility the value from the original environment is used.

From 3fa18d6935ed17fcadf4680abaada5cf972326b3 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 26 Sep 2023 22:37:27 +0800
Subject: [PATCH 2/2] fix: lower sso saml redirect http header

---
 .../emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
index e36f8777a..fc2cadfe6 100644
--- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
+++ b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml.erl
@@ -29,7 +29,11 @@
 
 -dialyzer({nowarn_function, do_create/1}).
 
--define(RESPHEADERS, #{<<"Cache-Control">> => <<"no-cache">>, <<"Pragma">> => <<"no-cache">>}).
+-define(RESPHEADERS, #{
+    <<"cache-control">> => <<"no-cache">>,
+    <<"pragma">> => <<"no-cache">>,
+    <<"content-type">> => <<"text/plain">>
+}).
 -define(REDIRECT_BODY, <<"Redirecting...">>).
 
 -define(DIR, <<"saml_sp_certs">>).
@@ -129,7 +133,7 @@ login(
                 Html = esaml_binding:encode_http_post(IDP, SignedXml, <<>>),
                 {200, ?RESPHEADERS, Html};
             false ->
-                {302, ?RESPHEADERS#{<<"Location">> => Target}, ?REDIRECT_BODY}
+                {302, ?RESPHEADERS#{<<"location">> => Target}, ?REDIRECT_BODY}
         end,
     {redirect, Redirect}.
 
@@ -209,7 +213,7 @@ gen_redirect_response(DashboardAddr, Username) ->
     case ensure_user_exists(Username) of
         {ok, Role, Token} ->
             Target = login_redirect_target(DashboardAddr, Username, Role, Token),
-            {redirect, {302, ?RESPHEADERS#{<<"Location">> => Target}, ?REDIRECT_BODY}};
+            {redirect, {302, ?RESPHEADERS#{<<"location">> => Target}, ?REDIRECT_BODY}};
         {error, Reason} ->
             {error, Reason}
     end.