From 3e658b3da91f4e0bc2f6db4d02805deae0cde27a Mon Sep 17 00:00:00 2001
From: firest <enlanubo@gmail.com>
Date: Sat, 7 Oct 2023 15:15:46 +0800
Subject: [PATCH] chore: update changes

---
 apps/emqx_authn/src/emqx_authn_enterprise.erl | 26 --------
 apps/emqx_authz/src/emqx_authz.app.src        | 23 -------
 apps/emqx_authz/src/emqx_authz_enterprise.erl | 60 -------------------
 apps/emqx_machine/priv/reboot_lists.eterm     |  2 +
 changes/ce/feat-11725.en.md                   |  1 +
 5 files changed, 3 insertions(+), 109 deletions(-)
 delete mode 100644 apps/emqx_authn/src/emqx_authn_enterprise.erl
 delete mode 100644 apps/emqx_authz/src/emqx_authz.app.src
 delete mode 100644 apps/emqx_authz/src/emqx_authz_enterprise.erl
 create mode 100644 changes/ce/feat-11725.en.md

diff --git a/apps/emqx_authn/src/emqx_authn_enterprise.erl b/apps/emqx_authn/src/emqx_authn_enterprise.erl
deleted file mode 100644
index 733c7ca00..000000000
--- a/apps/emqx_authn/src/emqx_authn_enterprise.erl
+++ /dev/null
@@ -1,26 +0,0 @@
-%%--------------------------------------------------------------------
-%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%--------------------------------------------------------------------
-
--module(emqx_authn_enterprise).
-
--export([providers/0, resource_provider/0]).
-
--if(?EMQX_RELEASE_EDITION == ee).
-
-providers() ->
-    [
-        {gcp_device, emqx_gcp_device_authn}
-    ].
-
-resource_provider() ->
-    [].
-
--else.
-
-providers() ->
-    [].
-
-resource_provider() ->
-    [].
--endif.
diff --git a/apps/emqx_authz/src/emqx_authz.app.src b/apps/emqx_authz/src/emqx_authz.app.src
deleted file mode 100644
index 67c0e54f1..000000000
--- a/apps/emqx_authz/src/emqx_authz.app.src
+++ /dev/null
@@ -1,23 +0,0 @@
-%% -*- mode: erlang -*-
-{application, emqx_authz, [
-    {description, "emqx authorization application"},
-    {vsn, "0.1.3"},
-    {registered, []},
-    {mod, {emqx_authz_app, []}},
-    {applications, [
-        kernel,
-        stdlib,
-        crypto,
-        emqx_resource,
-        emqx_connector,
-        emqx_mongodb,
-        emqx_redis,
-        emqx_mysql,
-        emqx_bridge_http
-    ]},
-    {env, []},
-    {modules, []},
-
-    {licenses, ["Apache 2.0"]},
-    {links, []}
-]}.
diff --git a/apps/emqx_authz/src/emqx_authz_enterprise.erl b/apps/emqx_authz/src/emqx_authz_enterprise.erl
deleted file mode 100644
index 6f1451108..000000000
--- a/apps/emqx_authz/src/emqx_authz_enterprise.erl
+++ /dev/null
@@ -1,60 +0,0 @@
-%%--------------------------------------------------------------------
-%% Copyright (c) 2023 EMQ Technologies Co., Ltd. All Rights Reserved.
-%%--------------------------------------------------------------------
--module(emqx_authz_enterprise).
-
--export([
-    type_names/0,
-    fields/1,
-    is_enterprise_module/1,
-    authz_sources_types/0,
-    type/1,
-    desc/1
-]).
-
--dialyzer({nowarn_function, [fields/1, type/1, desc/1]}).
-
--if(?EMQX_RELEASE_EDITION == ee).
-
-%% type name set
-type_names() ->
-    [].
-
-%% type -> type schema
-fields(Any) ->
-    error({invalid_field, Any}).
-
-%% type -> type module
-is_enterprise_module(_) ->
-    false.
-
-%% api sources set
-authz_sources_types() ->
-    [].
-
-%% atom-able name -> type
-type(Unknown) -> throw({unknown_authz_source_type, Unknown}).
-
-desc(_) ->
-    undefined.
-
--else.
-
-type_names() ->
-    [].
-
-fields(Any) ->
-    error({invalid_field, Any}).
-
-is_enterprise_module(_) ->
-    false.
-
-authz_sources_types() ->
-    [].
-
-%% should never happen if the input is type-checked by hocon schema
-type(Unknown) -> throw({unknown_authz_source_type, Unknown}).
-
-desc(_) ->
-    undefined.
--endif.
diff --git a/apps/emqx_machine/priv/reboot_lists.eterm b/apps/emqx_machine/priv/reboot_lists.eterm
index 43420d3cf..768424db6 100644
--- a/apps/emqx_machine/priv/reboot_lists.eterm
+++ b/apps/emqx_machine/priv/reboot_lists.eterm
@@ -56,6 +56,8 @@
             emqx_auth_mysql,
             emqx_auth_postgresql,
             emqx_auth_redis,
+            emqx_ldap,
+            emqx_auth_ldap,
             emqx_auto_subscribe,
             emqx_gateway,
             emqx_gateway_stomp,
diff --git a/changes/ce/feat-11725.en.md b/changes/ce/feat-11725.en.md
new file mode 100644
index 000000000..ce5b08169
--- /dev/null
+++ b/changes/ce/feat-11725.en.md
@@ -0,0 +1 @@
+Introduced the LDAP as a new authentication and authorization backend.