From d1af81c86e9046020adbf301482a3031ba0cf26f Mon Sep 17 00:00:00 2001 From: firest Date: Tue, 26 Sep 2023 12:12:04 +0800 Subject: [PATCH] fix(sso): fix the failure to update SSO users --- apps/emqx_dashboard/src/emqx_dashboard_admin.erl | 2 +- apps/emqx_dashboard/src/emqx_dashboard_api.erl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl index e77204541..e262cf389 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl @@ -230,7 +230,7 @@ remove_user(Username) -> -spec update_user(dashboard_username(), dashboard_user_role(), binary()) -> {ok, map()} | {error, term()}. -update_user(Username, Role, Desc) when is_binary(Username) -> +update_user(Username, Role, Desc) -> case legal_role(Role) of ok -> case diff --git a/apps/emqx_dashboard/src/emqx_dashboard_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_api.erl index 70d6accb4..9ee07dc06 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_api.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_api.erl @@ -379,9 +379,9 @@ sso_parameters() -> sso_parameters(Params) -> emqx_dashboard_sso_api:sso_parameters(Params). -username(#{bindings := #{backend := local}}, Username) -> +username(#{query_string := #{<<"backend">> := local}}, Username) -> Username; -username(#{bindings := #{backend := Backend}}, Username) -> +username(#{query_string := #{<<"backend">> := Backend}}, Username) -> ?SSO_USERNAME(Backend, Username); username(_Req, Username) -> Username.