Merge pull request #11778 from JimMoen/azure-id-saml-support

Azure Entra ID saml support

apps/emqx_dashboard/src/emqx_dashboard_admin.erl

@@ -207,8 +207,15 @@ add_user_(Username, Password, Role, Desc) ->
                 description = Desc
             },
             mnesia:write(Admin),
+            ?SLOG(info, #{msg => "dashboard_sso_user_added", username => Username, role => Role}),
             flatten_username(#{username => Username, role => Role, description => Desc});
         [_] ->
+            ?SLOG(info, #{
+                msg => "dashboard_sso_user_add_failed",
+                reason => "username_already_exists",
+                username => Username,
+                role => Role
+            }),
             mnesia:abort(<<"username_already_exist">>)
     end.
 

apps/emqx_dashboard_sso/rebar.config

@@ -4,5 +4,5 @@
 {deps, [
         {emqx_ldap, {path, "../../apps/emqx_ldap"}},
         {emqx_dashboard, {path, "../../apps/emqx_dashboard"}},
-        {esaml, {git, "https://github.com/emqx/esaml", {tag, "v1.1.2"}}}
+        {esaml, {git, "https://github.com/emqx/esaml", {tag, "v1.1.3"}}}
 ]}.

apps/emqx_dashboard_sso/src/emqx_dashboard_sso.app.src

@@ -1,6 +1,6 @@
 {application, emqx_dashboard_sso, [
     {description, "EMQX Dashboard Single Sign-On"},
-    {vsn, "0.1.1"},
+    {vsn, "0.1.2"},
     {registered, [emqx_dashboard_sso_sup]},
     {applications, [
         kernel,

apps/emqx_dashboard_sso/src/emqx_dashboard_sso_saml_api.erl

@@ -95,6 +95,10 @@ sp_saml_callback(post, Req) ->
         State = #{enable := true} ->
             case (provider(saml)):callback(Req, State) of
                 {redirect, Redirect} ->
+                    ?SLOG(info, #{
+                        msg => "dashboard_saml_sso_login_successful",
+                        redirect => "SAML login successful. Redirecting with LoginMeta."
+                    }),
                     Redirect;
                 {error, Reason} ->
                     ?SLOG(info, #{