fix: retain legacy enabled field for auth provider setting (#6861)

#### What type of PR is this? /kind bug /area core /milestone 2.20.x #### What this PR does / why we need it: 恢复 #6846 中删除的 SystemSetting.AuthProvider#enabled 字段避免插件应用到了它可能会发生错误，将其标记为过时 #### Does this PR introduce a user-facing change? ```release-note None ```
halo-dev · Oct 14, 2024 · 17eea82 · 17eea82
1 parent f7b2dcf
commit 17eea82
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/api/src/main/java/run/halo/app/infra/SystemSetting.java b/api/src/main/java/run/halo/app/infra/SystemSetting.java
@@ -3,6 +3,8 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.boot.convert.ApplicationConversionService;
@@ -114,7 +116,34 @@ public static class Menu {
     @Data
     public static class AuthProvider {
         public static final String GROUP = "authProvider";
+        /**
+         * Currently keep it to be compatible with the reference of the plugin.
+         *
+         * @deprecated Use {@link #getStates()} instead.
+         */
+        @Deprecated(since = "2.20.0", forRemoval = true)
+        private Set<String> enabled;
+
         private List<AuthProviderState> states;
+
+        /**
+         * <p>To be compatible with the old version of the enabled field and retained,
+         * since 2.20.0 version, we uses the states field, so the data needs to be synchronized
+         * to the enabled field, and this method needs to be deleted when the enabled field is
+         * removed.</p>
+         *
+         * @deprecated Use {@link #getStates()} instead.
+         */
+        @Deprecated(since = "2.20.0", forRemoval = true)
+        public Set<String> getEnabled() {
+            if (states == null) {
+                return enabled;
+            }
+            return this.states.stream()
+                .filter(AuthProviderState::isEnabled)
+                .map(AuthProviderState::getName)
+                .collect(Collectors.toSet());
+        }
     }
 
     @Data

diff --git a/application/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java b/application/src/test/java/run/halo/app/security/AuthProviderServiceImplTest.java
@@ -66,6 +66,7 @@ void testEnable() throws JSONException {
         ConfigMap value = captor.getValue();
         JSONAssert.assertEquals("""
                 {
+                    "enabled":["github"],
                     "states": [
                         {
                             "name": "github",
@@ -102,6 +103,7 @@ void testDisable() throws JSONException {
         ConfigMap value = captor.getValue();
         JSONAssert.assertEquals("""
                 {
+                    "enabled":[],
                     "states": [
                         {
                             "name": "github",