Merge pull request #1031 from NationalSecurityAgency/t#1030/pki_error

PasswordManagementService bean is only available when in FormAuth
NationalSecurityAgency · Dec 20, 2021 · 7291ec6 · 7291ec6
2 parents 89fa7e0 + b90d98a
commit 7291ec6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/service/src/main/java/skills/auth/form/CreateAccountController.groovy b/service/src/main/java/skills/auth/form/CreateAccountController.groovy
@@ -75,7 +75,7 @@ class CreateAccountController {
     @Value('#{"${skills.authorization.verifyEmailAddresses:false}"}')
     Boolean verifyEmailAddresses
 
-    @Autowired
+    @Autowired(required = false) // not required for PKI_AUTH
     PasswordManagementService passwordManagementService
 
     @Conditional(SecurityMode.FormAuth)

diff --git a/service/src/main/java/skills/services/ScheduledUserTokenCleanup.groovy b/service/src/main/java/skills/services/ScheduledUserTokenCleanup.groovy
@@ -18,9 +18,12 @@ package skills.services
 import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Conditional
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
+import skills.auth.SecurityMode
 
+@Conditional(SecurityMode.FormAuth)
 @Component
 @Slf4j
 class ScheduledUserTokenCleanup {