From eb28a023a4accc2c8800bc3b16c8753e9ff2d0c4 Mon Sep 17 00:00:00 2001 From: John Niang Date: Mon, 24 Jul 2023 12:06:19 +0800 Subject: [PATCH] Correct type of extension definition --- .../login/UsernamePasswordDelegatingAuthenticationManager.java | 3 ++- .../main/resources/extensions/extensionpoint-definitions.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordDelegatingAuthenticationManager.java b/application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordDelegatingAuthenticationManager.java index 6041559646..cb727b7f38 100644 --- a/application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordDelegatingAuthenticationManager.java +++ b/application/src/main/java/run/halo/app/security/authentication/login/UsernamePasswordDelegatingAuthenticationManager.java @@ -23,7 +23,8 @@ public UsernamePasswordDelegatingAuthenticationManager(ExtensionGetter extension @Override public Mono authenticate(Authentication authentication) { - return extensionGetter.getEnabledExtension(UsernamePasswordAuthenticationManager.class) + return extensionGetter.getEnabledExtensionByDefinition(UsernamePasswordAuthenticationManager.class) + .next() .flatMap(authenticationManager -> authenticationManager.authenticate(authentication) .doOnError(t -> log.error( "failed to authenticate with {}, fallback to default username password " diff --git a/application/src/main/resources/extensions/extensionpoint-definitions.yaml b/application/src/main/resources/extensions/extensionpoint-definitions.yaml index c1933682e3..be473f68e4 100644 --- a/application/src/main/resources/extensions/extensionpoint-definitions.yaml +++ b/application/src/main/resources/extensions/extensionpoint-definitions.yaml @@ -50,5 +50,5 @@ metadata: spec: className: run.halo.app.security.authentication.login.UsernamePasswordAuthenticationManager displayName: Username password authentication manager - type: SINGLE_INSTANCE + type: SINGLETON description: "Provides a way to extend the username password authentication."