[isis] branch master updated: ISIS-2858: for AbstractUserAndRolesScript, injects into suppliers prior to execute

[danhaywood]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 633b6e5a4e ISIS-2858: for AbstractUserAndRolesScript, injects into 
suppliers prior to execute
633b6e5a4e is described below

commit 633b6e5a4e151d9265eb982ce8924b5ca827edf3
Author: Dan Haywood <d...@haywood-associates.co.uk>
AuthorDate: Sat Aug 20 11:12:42 2022 +0100

    ISIS-2858: for AbstractUserAndRolesScript, injects into suppliers prior to 
execute
---
 .../applib/user/fixtures/AbstractUserAndRolesFixtureScript.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git 
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
 
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
index 7097ca3686..7413a369f4 100644
--- 
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
+++ 
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/fixtures/AbstractUserAndRolesFixtureScript.java
@@ -22,6 +22,7 @@ import java.util.function.Supplier;
 
 import javax.inject.Inject;
 
+import org.apache.isis.applib.services.inject.ServiceInjector;
 import org.apache.isis.applib.value.Password;
 import org.apache.isis.commons.collections.Can;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -45,6 +46,7 @@ public abstract class AbstractUserAndRolesFixtureScript 
extends FixtureScript {
 
     @Inject private ApplicationUserRepository applicationUserRepository;
     @Inject private ApplicationRoleRepository applicationRoleRepository;
+    @Inject private ServiceInjector serviceInjector;
 
     private final Supplier<String> usernameSupplier;
     private final Supplier<String> passwordSupplier;
@@ -129,6 +131,13 @@ public abstract class AbstractUserAndRolesFixtureScript 
extends FixtureScript {
     @Override
     protected void execute(final ExecutionContext executionContext) {
 
+        serviceInjector.injectServicesInto(this.usernameSupplier);
+        serviceInjector.injectServicesInto(this.passwordSupplier);
+        serviceInjector.injectServicesInto(this.emailAddressSupplier);
+        serviceInjector.injectServicesInto(this.tenancyPathSupplier);
+        serviceInjector.injectServicesInto(this.accountTypeSupplier);
+        serviceInjector.injectServicesInto(this.roleNamesSupplier);
+
         // create user if does not exist, and assign to the role
         val username = getUsername();
         applicationUser = applicationUserRepository.findByUsername(username)