Expose user and role services into plugins

Signed-off-by: JohnNiang <johnniang@foxmail.com>
halo-dev · Oct 16, 2024 · 223e0b5 · 223e0b5
1 parent c577deb
commit 223e0b5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/...lo/app/core/user/service/RoleService.java → ...lo/app/core/user/service/RoleService.java b/...lo/app/core/user/service/RoleService.java → ...lo/app/core/user/service/RoleService.java
diff --git a/...alo/app/core/user/service/SignUpData.java → ...alo/app/core/user/service/SignUpData.java b/...alo/app/core/user/service/SignUpData.java → ...alo/app/core/user/service/SignUpData.java
diff --git a/...lo/app/core/user/service/UserService.java → ...lo/app/core/user/service/UserService.java b/...lo/app/core/user/service/UserService.java → ...lo/app/core/user/service/UserService.java
diff --git a/...a/run/halo/app/infra/ValidationUtils.java → ...a/run/halo/app/infra/ValidationUtils.java b/...a/run/halo/app/infra/ValidationUtils.java → ...a/run/halo/app/infra/ValidationUtils.java
@@ -15,7 +15,7 @@ public class ValidationUtils {
     public static final Pattern NAME_PATTERN = Pattern.compile(NAME_REGEX);
 
     /**
-     * A-Z, a-z, 0-9, !@#$%^&* are allowed.
+     * {@code A-Z, a-z, 0-9, !@#$%^&*} are allowed.
      */
     public static final String PASSWORD_REGEX = "^[A-Za-z0-9!@#$%^&*]+$";
 

diff --git a/application/src/main/java/run/halo/app/plugin/SharedApplicationContextFactory.java b/application/src/main/java/run/halo/app/plugin/SharedApplicationContextFactory.java
@@ -8,6 +8,8 @@
 import org.springframework.security.web.server.savedrequest.ServerRequestCache;
 import run.halo.app.content.PostContentService;
 import run.halo.app.core.extension.service.AttachmentService;
+import run.halo.app.core.user.service.RoleService;
+import run.halo.app.core.user.service.UserService;
 import run.halo.app.extension.DefaultSchemeManager;
 import run.halo.app.extension.ExtensionClient;
 import run.halo.app.extension.ReactiveExtensionClient;
@@ -86,6 +88,10 @@ public static ApplicationContext create(ApplicationContext rootContext) {
             .ifUnique(serverRequestCache ->
                 beanFactory.registerSingleton("serverRequestCache", serverRequestCache)
             );
+        rootContext.getBeanProvider(UserService.class)
+            .ifUnique(userService -> beanFactory.registerSingleton("userService", userService));
+        rootContext.getBeanProvider(RoleService.class)
+            .ifUnique(roleService -> beanFactory.registerSingleton("roleService", roleService));
         // TODO add more shared instance here
 
         sharedContext.refresh();