From abc255bb021adb51077398c31504e697977c7b82 Mon Sep 17 00:00:00 2001
From: firest <enlanubo@gmail.com>
Date: Mon, 24 Jun 2024 10:43:34 +0800
Subject: [PATCH] fix(oidc): make CI happy

---
 apps/emqx_dashboard_sso/rebar.config                    | 2 +-
 apps/emqx_dashboard_sso/src/emqx_dashboard_sso.app.src  | 2 +-
 apps/emqx_dashboard_sso/src/emqx_dashboard_sso_oidc.erl | 2 ++
 mix.exs                                                 | 4 ++--
 rel/i18n/emqx_dashboard_sso_oidc.hocon                  | 5 ++++-
 scripts/spellcheck/dicts/emqx.txt                       | 1 +
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_dashboard_sso/rebar.config b/apps/emqx_dashboard_sso/rebar.config
index e9a52c56d..ae4125add 100644
--- a/apps/emqx_dashboard_sso/rebar.config
+++ b/apps/emqx_dashboard_sso/rebar.config
@@ -5,5 +5,5 @@
     {emqx_ldap, {path, "../../apps/emqx_ldap"}},
     {emqx_dashboard, {path, "../../apps/emqx_dashboard"}},
     {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"}}}
 ]}.
diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso.app.src b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso.app.src
index ab40e3848..95d49a150 100644
--- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso.app.src
+++ b/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.4"},
+    {vsn, "0.1.5"},
     {registered, [emqx_dashboard_sso_sup]},
     {applications, [
         kernel,
diff --git a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_oidc.erl b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_oidc.erl
index f904230c7..1a4562336 100644
--- a/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_oidc.erl
+++ b/apps/emqx_dashboard_sso/src/emqx_dashboard_sso_oidc.erl
@@ -150,6 +150,8 @@ fields(login) ->
 
 desc(oidc) ->
     "OIDC";
+desc(client_file_jwks) ->
+    ?DESC(client_file_jwks);
 desc(_) ->
     undefined.
 
diff --git a/mix.exs b/mix.exs
index 2cc48d979..a94707da2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -68,14 +68,14 @@ defmodule EMQXUmbrella.MixProject do
       {:rulesql, github: "emqx/rulesql", tag: "0.2.1"},
       {:observer_cli, "1.7.1"},
       {: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
       {:getopt, "1.0.2", override: true},
       {:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "1.0.10", 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},
       {: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
       {:gun, github: "emqx/gun", tag: "1.3.11", override: true},
       # in conflict by emqx_connector and system_monitor
diff --git a/rel/i18n/emqx_dashboard_sso_oidc.hocon b/rel/i18n/emqx_dashboard_sso_oidc.hocon
index a13abeab2..7dd6cf497 100644
--- a/rel/i18n/emqx_dashboard_sso_oidc.hocon
+++ b/rel/i18n/emqx_dashboard_sso_oidc.hocon
@@ -13,7 +13,7 @@ scopes.desc:
 """The scopes, its default value is `["openid"]`."""
 
 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:
 """The address of the EMQX Dashboard."""
@@ -30,6 +30,9 @@ client_jwks.desc:
 client_file_jwks_type.desc:
 """The JWKS source type."""
 
+client_file_jwks.desc:
+"""Set JWKS from file."""
+
 client_file_jwks_file.desc:
 """The content of the JWKS."""
 
diff --git a/scripts/spellcheck/dicts/emqx.txt b/scripts/spellcheck/dicts/emqx.txt
index ce08d0f6b..347020b63 100644
--- a/scripts/spellcheck/dicts/emqx.txt
+++ b/scripts/spellcheck/dicts/emqx.txt
@@ -311,3 +311,4 @@ doc_as_upsert
 upsert
 aliyun
 OID
+PKCE