yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(oidc): make CI happy

This commit is contained in:
firest 2024-06-24 10:43:34 +08:00
parent 892420e2c6
commit abc255bb02
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_dashboard_sso/rebar.config
View File

@ -5,5 +5,5 @@
{emqx_ldap, {path, "../../apps/emqx_ldap"}}, {emqx_ldap, {path, "../../apps/emqx_ldap"}},
{emqx_dashboard, {path, "../../apps/emqx_dashboard"}}, {emqx_dashboard, {path, "../../apps/emqx_dashboard"}},
{esaml, {git, "https://github.com/emqx/esaml", {tag, "v1.1.3"}}}, {esaml, {git, "https://github.com/emqx/esaml", {tag, "v1.1.3"}}},
{oidcc, {git, "https://github.com/emqx/oidcc.git", {branch, "ev3.2.0"}}} {oidcc, {git, "https://github.com/emqx/oidcc.git", {tag, "v3.2.0-1"}}}
]}. ]}.

2
apps/emqx_dashboard_sso/src/emqx_dashboard_sso.app.src
View File

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

2
apps/emqx_dashboard_sso/src/emqx_dashboard_sso_oidc.erl
View File

@ -150,6 +150,8 @@ fields(login) ->
desc(oidc) -> desc(oidc) ->
"OIDC"; "OIDC";
desc(client_file_jwks) ->
?DESC(client_file_jwks);
desc(_) -> desc(_) ->
undefined. undefined.

4
mix.exs
View File

@ -68,14 +68,14 @@ defmodule EMQXUmbrella.MixProject do
{:rulesql, github: "emqx/rulesql", tag: "0.2.1"}, {:rulesql, github: "emqx/rulesql", tag: "0.2.1"},
{:observer_cli, "1.7.1"}, {:observer_cli, "1.7.1"},
{:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.5"}, {:system_monitor, github: "ieQu1/system_monitor", tag: "3.0.5"},
{:telemetry, "1.1.0"}, {:telemetry, "1.1.0", override: true},
# in conflict by emqtt and hocon # in conflict by emqtt and hocon
{:getopt, "1.0.2", override: true}, {:getopt, "1.0.2", override: true},
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.10", override: true}, {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.10", override: true},
{:hocon, github: "emqx/hocon", tag: "0.42.2", override: true}, {:hocon, github: "emqx/hocon", tag: "0.42.2", override: true},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.3", override: true}, {:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.5.3", override: true},
{:esasl, github: "emqx/esasl", tag: "0.2.1"}, {:esasl, github: "emqx/esasl", tag: "0.2.1"},
{:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"}, {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2", override: true},
# in conflict by ehttpc and emqtt # in conflict by ehttpc and emqtt
{:gun, github: "emqx/gun", tag: "1.3.11", override: true}, {:gun, github: "emqx/gun", tag: "1.3.11", override: true},
# in conflict by emqx_connector and system_monitor # in conflict by emqx_connector and system_monitor

5
rel/i18n/emqx_dashboard_sso_oidc.hocon
View File

@ -13,7 +13,7 @@ scopes.desc:
"""The scopes, its default value is `["openid"]`.""" """The scopes, its default value is `["openid"]`."""
name_var.desc: name_var.desc:
"""A template to map OIDC user information to a DashBoard name, its default value is `${sub}`.""" """A template to map OIDC user information to a Dashboard name, its default value is `${sub}`."""
dashboard_addr.desc: dashboard_addr.desc:
"""The address of the EMQX Dashboard.""" """The address of the EMQX Dashboard."""
@ -30,6 +30,9 @@ client_jwks.desc:
client_file_jwks_type.desc: client_file_jwks_type.desc:
"""The JWKS source type.""" """The JWKS source type."""
client_file_jwks.desc:
"""Set JWKS from file."""
client_file_jwks_file.desc: client_file_jwks_file.desc:
"""The content of the JWKS.""" """The content of the JWKS."""

1
scripts/spellcheck/dicts/emqx.txt
View File

@ -311,3 +311,4 @@ doc_as_upsert
upsert upsert
aliyun aliyun
OID OID
PKCE