You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/03 15:10:03 UTC
[isis] branch master updated: ISIS-2464: let UserMemento (applib)
be a first class citizen of AuthenticationSession
This is an automated email from the ASF dual-hosted git repository.
ahuber 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 8d32c77 ISIS-2464: let UserMemento (applib) be a first class citizen of AuthenticationSession
8d32c77 is described below
commit 8d32c7768798c19894f15b3a8f9b1fbc7d4e8e4a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 3 16:09:46 2020 +0100
ISIS-2464: let UserMemento (applib) be a first class citizen of
AuthenticationSession
also introduces VirtualClock to be held by AuthenticationSession
allow for AsyncControl to also provide a virtual clock
---
.../isis/applib/services/user/RoleMemento.java | 7 +-
.../isis/applib/services/user/UserMemento.java | 61 ++++++++---
.../isis/applib/services/user/UserService.java | 4 +-
.../services/wrapper/control/AsyncControl.java | 28 ++---
.../wrapper/control/AsyncControl_Test.java | 15 +--
.../session/init/InitialisationSession.java | 7 +-
.../IsisModuleCoreRuntimeServices.java | 1 -
.../session/IsisInteractionFactoryDefault.java | 32 +-----
.../runtimeservices/user/UserServiceDefault.java | 113 +--------------------
.../wrapper/WrapperFactoryDefault.java | 9 +-
.../reflection/ReflectSampleForTesting.java | 25 +++--
.../commons/internal/reflection/ReflectTest.java | 10 +-
.../AuthenticationSessionAbstract.java | 42 +++-----
.../authentication/health/HealthAuthSession.java | 14 ++-
.../singleuser/SingleUserSession.java | 18 +++-
.../standard/AuthenticatorAbstract.java | 14 ++-
.../authentication/standard/SimpleSession.java | 52 ++++++----
.../SimpleSessionEncodabilityNoRolesTest.java | 4 +-
.../SimpleSessionEncodabilityWithRolesTest.java | 4 +-
.../java/demoapp/dom/homepage/DemoHomePage.java | 4 +-
.../secondary/config/SecondaryConfig.java | 3 +-
.../secondary/job/ReplicateAndReplayJob.java | 11 +-
.../keycloak/webmodule/KeycloakFilter.java | 4 +-
.../shiro/authentication/AuthenticatorShiro.java | 9 +-
.../BulkUpdateManagerForDemoToDoItem.java | 2 -
.../ExcelDemoToDoItem_recreate5_for.java | 1 -
...uthenticatedWebSessionForIsis_Authenticate.java | 7 +-
27 files changed, 209 insertions(+), 292 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java
index 1453a09..e90d1fe 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/RoleMemento.java
@@ -19,14 +19,19 @@
package org.apache.isis.applib.services.user;
+import java.io.Serializable;
+
import org.apache.isis.applib.annotation.MemberOrder;
import lombok.Getter;
// tag::refguide[]
-public final class RoleMemento {
+public final class RoleMemento implements Serializable {
// end::refguide[]
+
+ private static final long serialVersionUID = -3876856609238378274L;
+
/**
* Creates a new role with the specified name. Description is left blank.
*/
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java
index 607fa44..6cd7316 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java
@@ -19,14 +19,16 @@
package org.apache.isis.applib.services.user;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
+import java.io.Serializable;
import java.util.List;
+import java.util.stream.Stream;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.commons.internal.collections._Lists;
import lombok.Getter;
+import lombok.NonNull;
import lombok.experimental.UtilityClass;
/**
@@ -34,32 +36,59 @@ import lombok.experimental.UtilityClass;
* Read-only.
*/
// tag::refguide[]
-public final class UserMemento {
-
+public final class UserMemento implements Serializable {
// end::refguide[]
+
+ private static final long serialVersionUID = 7190090455587885367L;
+
+ // -- FACTORIES
+
/**
* Creates a new user with the specified name and no roles.
*/
- public UserMemento(final String name) {
- this(name, new RoleMemento[0]);
+ public static UserMemento ofName(
+ final @NonNull String name) {
+ return new UserMemento(name, Stream.empty());
}
-
+
/**
* Creates a new user with the specified name and assigned roles.
*/
- public UserMemento(final String name, final RoleMemento... roles) {
- this(name, Arrays.asList(roles));
+ public static UserMemento ofNameAndRoles(
+ final @NonNull String name,
+ final RoleMemento... roles) {
+ return new UserMemento(name, Stream.of(roles));
+ }
+
+ /**
+ * Creates a new user with the specified name and assigned role names.
+ */
+ public static UserMemento ofNameAndRoleNames(
+ final @NonNull String name,
+ final String... roleNames) {
+ return new UserMemento(name, Stream.of(roleNames).map(RoleMemento::new));
}
+
+ /**
+ * Creates a new user with the specified name and assigned role names.
+ */
+ public static UserMemento ofNameAndRoleNames(
+ final @NonNull String name,
+ final @NonNull Stream<String> roleNames) {
+ return new UserMemento(name, roleNames.map(RoleMemento::new));
+ }
+
+ // -- CONSTRUCTOR
/**
* Creates a new user with the specified name and assigned roles.
*/
- public UserMemento(final String name, final List<RoleMemento> roles) {
- if (name == null) {
+ public UserMemento(final String name, final @NonNull Stream<RoleMemento> roles) {
+ if (_Strings.isEmpty(name)) {
throw new IllegalArgumentException("Name not specified");
}
this.name = name;
- this.roles = Collections.unmodifiableList(new ArrayList<RoleMemento>(roles));
+ this.roles = roles.collect(_Lists.toUnmodifiable());
}
public String title() {
@@ -98,6 +127,11 @@ public final class UserMemento {
}
return name.equals(userName);
}
+
+ public Stream<String> streamRoleNames() {
+ return roles.stream()
+ .map(RoleMemento::getName);
+ }
//XXX implemented as regex match, java-doc is not specific about what these methods actually do; so if in doubt, rather remove
// /**
@@ -139,6 +173,7 @@ public final class UserMemento {
}
}
+
// tag::refguide[]
// ...
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
index e12ff02..3b3e5a5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.applib.services.user;
// tag::refguide[]
@@ -24,7 +23,8 @@ public interface UserService {
// end::refguide[]
/**
- * Get the details about the current user.
+ * Gets the details about the current user, based on calling thread's {@link AuthenticationSession}.
+ * @throws IllegalStateException if the calling thread has no {@link AuthenticationSession}.
*/
// tag::refguide[]
UserMemento getUser(); // <.>
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
index 3c91242..c2cfd06 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/wrapper/control/AsyncControl.java
@@ -18,13 +18,13 @@
*/
package org.apache.isis.applib.services.wrapper.control;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Future;
+import org.apache.isis.applib.clock.VirtualClock;
+import org.apache.isis.applib.services.user.UserMemento;
+
import lombok.Getter;
import lombok.NonNull;
import lombok.Setter;
@@ -69,14 +69,14 @@ public class AsyncControl<R> extends ControlAbstract<AsyncControl<R>> {
// end::refguide[]
/**
- * Defaults to user initiating the action, if not overridden
+ * Defaults to the system clock, if not overridden
*/
// tag::refguide[]
@Getter
- private String user; // <.>
- public AsyncControl<R> withUser(final String user) {
+ private VirtualClock clock; // <.>
+ public AsyncControl<R> withClock(final VirtualClock clock) {
// end::refguide[]
- this.user = user;
+ this.clock = clock;
return this;
// tag::refguide[]
// ...
@@ -84,24 +84,18 @@ public class AsyncControl<R> extends ControlAbstract<AsyncControl<R>> {
// end::refguide[]
/**
- * Defaults to roles of user initiating the action, if not overridden
+ * Defaults to user initiating the action, if not overridden
*/
// tag::refguide[]
@Getter
- private List<String> roles; // <.>
- public AsyncControl<R> withRoles(final List<String> roles) {
+ private UserMemento user; // <.>
+ public AsyncControl<R> withUser(final UserMemento user) {
// end::refguide[]
- this.roles = Collections.unmodifiableList(roles);
+ this.user = user;
return this;
// tag::refguide[]
// ...
}
- public AsyncControl<R> withRoles(String... roles) {
- // end::refguide[]
- return withRoles(Arrays.asList(roles));
- // tag::refguide[]
- // ...
- }
// end::refguide[]
/**
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/wrapper/control/AsyncControl_Test.java b/api/applib/src/test/java/org/apache/isis/applib/services/wrapper/control/AsyncControl_Test.java
index 52e9175..71acfc0 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/wrapper/control/AsyncControl_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/wrapper/control/AsyncControl_Test.java
@@ -19,12 +19,15 @@
package org.apache.isis.applib.services.wrapper.control;
import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.springframework.core.task.support.ExecutorServiceAdapter;
import org.springframework.core.task.support.TaskExecutorAdapter;
+import org.apache.isis.applib.services.user.UserMemento;
+
import lombok.val;
public class AsyncControl_Test {
@@ -71,10 +74,10 @@ public class AsyncControl_Test {
val control = AsyncControl.returningVoid();
// when
- control.withUser("fred");
+ control.withUser(UserMemento.ofName("fred"));
// then
- Assertions.assertThat(control.getUser()).isEqualTo("fred");
+ Assertions.assertThat(control.getUser().getName()).isEqualTo("fred");
}
@Test
@@ -84,10 +87,11 @@ public class AsyncControl_Test {
val control = AsyncControl.returningVoid();
// when
- control.withRoles("role-1", "role-2");
+ control.withUser(UserMemento.ofNameAndRoleNames("fred", "role-1", "role-2"));
// then
- Assertions.assertThat(control.getRoles()).containsExactlyInAnyOrder("role-1", "role-2");
+ Assertions.assertThat(control.getUser().streamRoleNames().collect(Collectors.toList()))
+ .containsExactlyInAnyOrder("role-1", "role-2");
}
@Test
@@ -102,8 +106,7 @@ public class AsyncControl_Test {
val control = AsyncControl.returning(String.class)
.withSkipRules()
- .withUser("fred")
- .withRoles("role-1", "role-2")
+ .withUser(UserMemento.ofNameAndRoleNames("fred", "role-1", "role-2"))
.with(executorService)
.with(exceptionHandler);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
index 3c6baeb..833e753 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
@@ -16,17 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.core.runtime.session.init;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class InitialisationSession extends AuthenticationSessionAbstract {
private static final long serialVersionUID = 1L;
+ private static final UserMemento INITIALISATION_USER =
+ UserMemento.ofName("initialisation");
+
public InitialisationSession() {
- super("initialisation", "");
+ super(INITIALISATION_USER);
}
}
\ No newline at end of file
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index fd958f5..d41b6cc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -100,7 +100,6 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
UrlEncodingServiceWithCompression.class,
UserProfileServiceDefault.class,
UserServiceDefault.class,
- UserServiceDefault.SudoServiceSpi.class,
WrapperFactoryDefault.class,
XmlServiceDefault.class,
XmlSnapshotServiceDefault.class,
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
index 1cbdbf5..998bc45 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisInteractionFactoryDefault.java
@@ -43,7 +43,6 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.util.schema.ChangesDtoUtils;
import org.apache.isis.applib.util.schema.CommandDtoUtils;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.isis.commons.internal.debug._Probe;
@@ -63,11 +62,8 @@ import org.apache.isis.core.runtime.iactn.scope.IsisInteractionScopeCloseListene
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.runtime.session.init.IsisLocaleInitializer;
import org.apache.isis.core.runtime.session.init.IsisTimeZoneInitializer;
-import org.apache.isis.core.runtimeservices.user.UserServiceDefault;
-import org.apache.isis.core.runtimeservices.user.UserServiceDefault.UserAndRoleOverrides;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.security.authentication.standard.SimpleSession;
import static org.apache.isis.commons.internal.base._With.requires;
@@ -162,11 +158,8 @@ implements IsisInteractionFactory, IsisInteractionTracker {
ThreadLocal.withInitial(Stack::new);
@Override
- public InteractionClosure openInteraction(final @NonNull AuthenticationSession authenticationSession) {
+ public InteractionClosure openInteraction(final @NonNull AuthenticationSession authSessionToUse) {
- val authSessionToUse = getAuthenticationSessionOverride()
- .orElse(authenticationSession);
-
val interactionSession = getOrCreateInteractionSession(authSessionToUse);
val newInteractionClosure = new InteractionClosure(interactionSession, authSessionToUse);
@@ -329,29 +322,6 @@ implements IsisInteractionFactory, IsisInteractionTracker {
+ "this implementation of an Interaction: %s", interaction.getClass().getName());
}
- // -- HELPER - SUDO SUPPORT
-
- @Inject private UserServiceDefault userServiceDefault;
-
- /**
- * Checks if there are overrides, and if so return a {@link SimpleSession} to represent those
- * overrides.
- */
- private Optional<AuthenticationSession> getAuthenticationSessionOverride() {
-
- // if user/role has been overridden by SudoService, then honor that value.
- final UserAndRoleOverrides userAndRoleOverrides = userServiceDefault.currentOverridesIfAny();
-
- if(userAndRoleOverrides != null) {
- String user = userAndRoleOverrides.getUser();
- Can<String> roles = userAndRoleOverrides.getRoles();
- return Optional.of(new SimpleSession(user, roles));
- }
-
- // otherwise...
- return Optional.empty();
- }
-
// -- HELPER - COMMAND COMPLETION
private void completeAndPublishCurrentCommand() {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
index 38565b8..8d65f1c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/user/UserServiceDefault.java
@@ -16,14 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.core.runtimeservices.user;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
@@ -33,18 +27,12 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.services.user.RoleMemento;
import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import lombok.Value;
-import lombok.val;
-
@Service
@Named("isisMetaModel.UserServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@@ -54,108 +42,11 @@ public class UserServiceDefault implements UserService {
@Inject private IsisInteractionTracker isisInteractionTracker;
- @Service
- @Named("isisMetaModel.UserServiceDefault.SudoServiceSpi")
- @Order(OrderPrecedence.MIDPOINT)
- @Qualifier("UserServiceDefault")
- public static class SudoServiceSpi implements SudoService.Spi {
-
- @Inject UserServiceDefault userServiceDefault;
-
- @Override
- public void runAs(final String username, final List<String> roles) {
- userServiceDefault.overrideUserAndRoles(username, Can.ofCollection(roles));
- }
-
- @Override
- public void releaseRunAs() {
- userServiceDefault.resetOverrides();
- }
-
- }
-
- @PreDestroy
- public void cleanUp() {
- overrides.remove();
- }
-
@Override
public UserMemento getUser() {
-
- final UserAndRoleOverrides userAndRoleOverrides = currentOverridesIfAny();
-
- if (userAndRoleOverrides != null) {
-
- val username = userAndRoleOverrides.user;
-
- val roles = (userAndRoleOverrides.roles != null)
- ? userAndRoleOverrides.roles
- // preserve the roles if were not overridden
- : currentRoles();
-
- return new UserMemento(username, asRoleMementos(roles));
-
- } else {
- return isisInteractionTracker.currentAuthenticationSession()
- .map(AuthenticationSession::getUser)
- .orElseThrow(()->_Exceptions.illegalState("need an AuthenticationSession to create a UserMemento"));
- }
- }
-
-
- @Value
- public static class UserAndRoleOverrides {
- final String user;
- final Can<String> roles;
- }
-
-
- /**
- * Not API; for use by the implementation of sudo/runAs (see {@link SudoService} etc.
- */
- public UserAndRoleOverrides currentOverridesIfAny() {
- final Stack<UserAndRoleOverrides> userAndRoleOverrides = overrides.get();
- return !userAndRoleOverrides.empty()
- ? userAndRoleOverrides.peek()
- : null;
- }
-
- // -- HELPER
-
- private Can<String> currentRoles() {
return isisInteractionTracker.currentAuthenticationSession()
- .map(AuthenticationSession::getRoles)
- .orElse(Can.empty());
- }
-
- private Can<String> inheritRoles() {
- final UserAndRoleOverrides currentOverridesIfAny = currentOverridesIfAny();
- return currentOverridesIfAny != null
- ? currentOverridesIfAny.getRoles()
- : currentRoles();
+ .map(AuthenticationSession::getUser)
+ .orElseThrow(()->_Exceptions.illegalState("Current thread has not AuthenticationSession."));
}
- private static List<RoleMemento> asRoleMementos(final Can<String> roles) {
- final List<RoleMemento> mementos = new ArrayList<RoleMemento>();
- if (roles != null) {
- for (final String role : roles) {
- mementos.add(new RoleMemento(role));
- }
- }
- return mementos;
- }
-
- private final ThreadLocal<Stack<UserAndRoleOverrides>> overrides = ThreadLocal.withInitial(Stack::new);
-
- private void overrideUserAndRoles(final String user, final Can<String> rolesIfAny) {
- val roles = rolesIfAny.isNotEmpty() ? rolesIfAny : inheritRoles();
- this.overrides.get().push(new UserAndRoleOverrides(user, roles));
- }
-
- private void resetOverrides() {
- this.overrides.get().pop();
- }
-
-
-
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index d80c707..b459464 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -41,6 +41,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.clock.VirtualClock;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.command.Command;
@@ -426,9 +427,11 @@ public class WrapperFactoryDefault implements WrapperFactory {
}
private static <R> SimpleSession authSessionFrom(AsyncControl<R> asyncControl, AuthenticationSession authSession) {
- val user = asyncControl.getUser();
- val roles = asyncControl.getRoles();
- return new SimpleSession(user != null ? user : authSession.getUserName(), roles != null ? roles : authSession.getRoles());
+ val clock = Optional.ofNullable(asyncControl.getClock())
+ .orElseGet(VirtualClock::system);
+ val user = Optional.ofNullable(asyncControl.getUser())
+ .orElseGet(authSession::getUser);
+ return SimpleSession.validOf(clock, user);
}
@Data
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java b/core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectSampleForTesting.java
similarity index 70%
copy from api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
copy to core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectSampleForTesting.java
index e12ff02..5bb3688 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserService.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectSampleForTesting.java
@@ -16,18 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.isis.core.metamodel.commons.internal.reflection;
-package org.apache.isis.applib.services.user;
+public class ReflectSampleForTesting {
-// tag::refguide[]
-public interface UserService {
-
- // end::refguide[]
- /**
- * Get the details about the current user.
- */
- // tag::refguide[]
- UserMemento getUser(); // <.>
+ public static interface NestedInterface {
+ void sayHello();
+ }
+
+ public static class Nested implements NestedInterface {
+ @Override
+ public void sayHello() {
+
+ }
+
+ }
+
}
-// end::refguide[]
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
index 5bb62c2..abed64a 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/metamodel/commons/internal/reflection/ReflectTest.java
@@ -34,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.reflection._Reflect.InterfacePolicy;
-import org.apache.isis.core.runtimeservices.user.UserServiceDefault;
import static org.apache.isis.commons.internal.reflection._Reflect.getAnnotation;
import static org.apache.isis.commons.internal.reflection._Reflect.streamAllMethods;
@@ -42,15 +41,12 @@ import static org.apache.isis.commons.internal.reflection._Reflect.streamTypeHie
import lombok.val;
-//TODO we are using real world classes from the framework, we could instead isolate these tests
-// if we provide some custom classes for hierarchy traversal here (could be nested);
-// then move this test to the 'commons' module, where it belongs
class ReflectTest {
@Test
void typeHierarchy() {
- Class<?> type = UserServiceDefault.SudoServiceSpi.class;
+ Class<?> type = ReflectSampleForTesting.Nested.class;
val typeSet = streamTypeHierarchy(type, InterfacePolicy.EXCLUDE)
.map(Class::getName)
@@ -67,7 +63,7 @@ class ReflectTest {
@Test
void typeHierarchyAndInterfaces() {
- Class<?> type = UserServiceDefault.SudoServiceSpi.class;
+ Class<?> type = ReflectSampleForTesting.Nested.class;
val typeSet = streamTypeHierarchy(type, InterfacePolicy.INCLUDE)
.map(Class::getName)
@@ -84,7 +80,7 @@ class ReflectTest {
@Test
void allMethods() {
- Class<?> type = UserServiceDefault.SudoServiceSpi.class;
+ Class<?> type = ReflectSampleForTesting.Nested.class;
val typeSet = streamAllMethods(type, true)
.map(m->m.toString())
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
index ad3ad69..91c744c 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
@@ -16,38 +16,38 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.stream.Stream;
import org.apache.isis.applib.clock.VirtualClock;
import org.apache.isis.applib.services.user.RoleMemento;
import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
import lombok.Getter;
import lombok.NonNull;
-import lombok.val;
public abstract class AuthenticationSessionAbstract
implements AuthenticationSession, Serializable {
private static final long serialVersionUID = 1L;
+ protected static final String DEFAULT_AUTH_VALID_CODE = "";
+
// -- Constructor, fields
@Getter(onMethod_ = {@Override}) @NonNull
private final VirtualClock clock;
@Getter(onMethod_ = {@Override}) @NonNull
+ private final UserMemento user;
+
+ @Getter(onMethod_ = {@Override}) @NonNull
private final String userName;
@Getter(onMethod_ = {@Override}) @NonNull
@@ -60,25 +60,22 @@ implements AuthenticationSession, Serializable {
private final MessageBroker messageBroker;
private final Map<String, Object> attributeByName = new HashMap<String, Object>();
-
public AuthenticationSessionAbstract(
- @NonNull final String name,
- @NonNull final String validationCode) {
- this(VirtualClock.system(), name, Stream.empty(), validationCode);
+ @NonNull final UserMemento user) {
+ this(VirtualClock.system(), user, DEFAULT_AUTH_VALID_CODE);
}
public AuthenticationSessionAbstract(
@NonNull final VirtualClock clock,
- @NonNull final String userName,
- @NonNull final Stream<String> roles,
+ @NonNull final UserMemento user,
@NonNull final String validationCode) {
this.clock = clock;
- this.userName = userName;
- this.roles = Can.ofStream(roles
- .filter(_Strings::isNotEmpty)
- .distinct());
+ this.user = user;
+ this.userName = user.getName();
+ this.roles = Can.ofCollection(user.getRoles())
+ .map(RoleMemento::getName);
this.validationCode = validationCode;
this.messageBroker = new MessageBroker();
@@ -111,21 +108,6 @@ implements AuthenticationSession, Serializable {
attributeByName.put(attributeName, attribute);
}
- // -- UserMemento
-
- private transient UserMemento user;
-
- @Override
- public UserMemento getUser() {
- if(user==null) {
- val roleMementos = _Lists.<RoleMemento>newArrayList(roles.size());
- for (final String roleName : roles) {
- roleMementos.add(new RoleMemento(roleName));
- }
- user = new UserMemento(getUserName(), roleMementos);
- }
- return user;
- }
// -- toString
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
index 854b2ed..8a9b98e 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
@@ -16,24 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.core.security.authentication.health;
-import java.util.stream.Stream;
-
-import org.apache.isis.applib.clock.VirtualClock;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public class HealthAuthSession extends AuthenticationSessionAbstract {
private static final long serialVersionUID = 1L;
- private static final String USER_NAME = "__health";
- private static final String ROLE = "__health-role";
- private static final String CODE = "";
+ private static final UserMemento HEALTH_USER =
+ UserMemento.ofNameAndRoleNames(
+ "__health", // user name
+ "__health-role"); // role(s)
public HealthAuthSession() {
- super(VirtualClock.system(), USER_NAME, Stream.of(ROLE), CODE);
+ super(HEALTH_USER);
}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
index 4aac697..3106765 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
@@ -19,23 +19,31 @@
package org.apache.isis.core.security.authentication.singleuser;
+import org.apache.isis.applib.clock.VirtualClock;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class SingleUserSession extends AuthenticationSessionAbstract {
private static final long serialVersionUID = 1L;
- private static final String DEFAULT_USER_NAME = "prototyping";
+ private static final UserMemento DEFAULT_SINGLE_USER =
+ UserMemento.ofName("prototyping");
/**
- * Defaults validation code to <tt>""</tt>.
+ * Defaults session's authentication validation code to <tt>""</tt>.
*/
public SingleUserSession() {
- this("");
+ this(AuthenticationSessionAbstract.DEFAULT_AUTH_VALID_CODE);
}
- public SingleUserSession(final String code) {
- super(DEFAULT_USER_NAME, code);
+ public SingleUserSession(final String authValidationCode) {
+ super(VirtualClock.system(), DEFAULT_SINGLE_USER, authValidationCode);
}
+
+
+
+
+
}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
index 393a3c0..7a069dc 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
@@ -19,8 +19,11 @@
package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+
+import lombok.val;
public abstract class AuthenticatorAbstract implements Authenticator {
@@ -29,11 +32,16 @@ public abstract class AuthenticatorAbstract implements Authenticator {
* if required.
*/
@Override
- public final AuthenticationSession authenticate(final AuthenticationRequest request, final String code) {
+ public final AuthenticationSession authenticate(
+ final AuthenticationRequest request,
+ final String validationCode) {
+
if (!isValid(request)) {
return null;
}
- return new SimpleSession(request.getName(), request.streamRoles(), code);
+
+ val user = UserMemento.ofNameAndRoleNames(request.getName(), request.streamRoles());
+ return SimpleSession.of(user, validationCode);
}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
index c40b310..96cd594 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
@@ -19,35 +19,51 @@
package org.apache.isis.core.security.authentication.standard;
-import java.util.Collection;
-import java.util.stream.Stream;
-
import org.apache.isis.applib.clock.VirtualClock;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-
import lombok.Getter;
+import lombok.NonNull;
import lombok.Setter;
public class SimpleSession extends AuthenticationSessionAbstract {
private static final long serialVersionUID = 1L;
- private static final String DEFAULT_VALIDATION_CODE = "";
-
- /**
- * Defaults {@link #getValidationCode()} to empty string (<tt>""</tt>).
- */
- public SimpleSession(final String userName, final Iterable<String> roles) {
- this(userName, stream(roles), DEFAULT_VALIDATION_CODE);
+
+ // -- FACTORIES
+
+ public static SimpleSession of(
+ final @NonNull UserMemento user,
+ final @NonNull String validationCode) {
+ return new SimpleSession(VirtualClock.system(), user, validationCode);
}
-
- public SimpleSession(final String userName, final Collection<String> roles, final String code) {
- this(userName, roles.stream(), code);
+
+ public static SimpleSession of(
+ final @NonNull VirtualClock clock,
+ final @NonNull UserMemento user,
+ final @NonNull String validationCode) {
+ return new SimpleSession(clock, user, validationCode);
}
-
- public SimpleSession(final String userName, final Stream<String> roles, final String code) {
- super(VirtualClock.system(), userName, roles, code);
+
+ public static SimpleSession validOf(
+ final @NonNull UserMemento user) {
+ return of(user, AuthenticationSessionAbstract.DEFAULT_AUTH_VALID_CODE);
+ }
+
+ public static SimpleSession validOf(
+ final @NonNull VirtualClock clock,
+ final @NonNull UserMemento user) {
+ return of(clock, user, AuthenticationSessionAbstract.DEFAULT_AUTH_VALID_CODE);
+ }
+
+ // -- CONSTRUCTOR
+
+ public SimpleSession(
+ final @NonNull VirtualClock clock,
+ final @NonNull UserMemento user,
+ final @NonNull String validationCode) {
+ super(clock, user, validationCode);
}
@Getter @Setter
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index a2df28d..09961b4 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -20,11 +20,11 @@
package org.apache.isis.security.authentication.standard;
import java.io.Serializable;
-import java.util.Collections;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
@@ -32,7 +32,7 @@ public class SimpleSessionEncodabilityNoRolesTest extends SimpleSessionEncodabil
@Override
protected Serializable createEncodable() {
- return new SimpleSession("joe", Collections.emptyList());
+ return SimpleSession.validOf(UserMemento.ofName("joe"));
}
}
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index 0d3ca7b..682deb3 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -20,11 +20,11 @@
package org.apache.isis.security.authentication.standard;
import java.io.Serializable;
-import java.util.Arrays;
import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
@@ -32,7 +32,7 @@ public class SimpleSessionEncodabilityWithRolesTest extends SimpleSessionEncodab
@Override
protected Serializable createEncodable() {
- return new SimpleSession("joe", Arrays.asList(new String[] { "role1", "role2" }));
+ return SimpleSession.validOf(UserMemento.ofNameAndRoleNames("joe", "role1", "role2"));
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index cd2280b..4503bf9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -19,17 +19,15 @@
package demoapp.dom.homepage;
import javax.inject.Inject;
-import javax.inject.Provider;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.services.scratchpad.Scratchpad;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-import demoapp.dom._infra.resources.AsciiDocReaderService;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom._infra.resources.AsciiDocReaderService;
//tag::class[]
@DomainObject(
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java
index 3794ba7..edd0002 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java
@@ -31,12 +31,11 @@ import org.apache.isis.core.config.IsisConfiguration;
import lombok.Getter;
import lombok.val;
-import lombok.extern.log4j.Log4j2;
@Service
@Named("isisExtensionsCommandReplaySecondary.SecondaryConfig")
@Order(OrderPrecedence.MIDPOINT)
-@Log4j2
+//@Log4j2
public class SecondaryConfig {
@Getter final String primaryUser;
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
index 5944e59..ca236ba 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
@@ -25,15 +25,14 @@ import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.PersistJobDataAfterExecution;
-import org.apache.isis.applib.services.xactn.TransactionService;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-
+import org.apache.isis.extensions.commandreplay.secondary.SecondaryStatus;
import org.apache.isis.extensions.commandreplay.secondary.config.SecondaryConfig;
import org.apache.isis.extensions.commandreplay.secondary.jobcallables.IsTickingClockInitialized;
import org.apache.isis.extensions.commandreplay.secondary.jobcallables.ReplicateAndRunCommands;
-import org.apache.isis.extensions.commandreplay.secondary.SecondaryStatus;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -53,7 +52,11 @@ public class ReplicateAndReplayJob implements Job {
new SecondaryStatusData(quartzContext);
if(secondaryConfig.isConfigured()) {
- authSession = new SimpleSession(secondaryConfig.getPrimaryUser(), secondaryConfig.getQuartzRoles());
+ val user = UserMemento.ofNameAndRoleNames(
+ secondaryConfig.getPrimaryUser(),
+ secondaryConfig.getQuartzRoles().stream());
+
+ authSession = SimpleSession.validOf(user);
exec(quartzContext);
}
}
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index 3570846..f179a82 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
@@ -61,7 +62,8 @@ public class KeycloakFilter implements Filter {
}
final List<String> roles = toClaims(rolesHeader);
- val authenticationSession = new SimpleSession(userid, roles, subjectHeader);
+ val user = UserMemento.ofNameAndRoleNames(userid, roles.stream());
+ val authenticationSession = SimpleSession.of(user, subjectHeader);
authenticationSession.setType(AuthenticationSession.Type.EXTERNAL);
isisInteractionFactory.runAuthenticated(
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index e62d137..8eacde9 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -47,6 +47,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
@@ -57,6 +58,7 @@ import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.context.ShiroSecurityContext;
+import lombok.val;
import lombok.extern.log4j.Log4j2;
/**
@@ -157,7 +159,7 @@ public class AuthenticatorShiro implements Authenticator {
AuthenticationSession authenticationSessionFor(
AuthenticationRequest request,
- String code,
+ String validationCode,
AuthenticationToken token,
Subject currentSubject) {
@@ -167,8 +169,9 @@ public class AuthenticatorShiro implements Authenticator {
// copy over any roles passed in
// (this is used by the Wicket viewer, for example).
request.streamRoles());
-
- return new SimpleSession(request.getName(), roles, code);
+
+ val user = UserMemento.ofNameAndRoleNames(request.getName(), roles);
+ return SimpleSession.of(user, validationCode);
}
/**
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index 1225ef2..932e6c2 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -148,8 +148,6 @@ public class BulkUpdateManagerForDemoToDoItem {
return userService.getUser().getName();
}
-
- @SuppressWarnings("unchecked")
@Collection
@CollectionLayout(defaultView = "table")
public List<ExcelDemoToDoItem> getToDoItems() {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index 10d8252..485833c 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -23,7 +23,6 @@ import java.time.LocalDate;
import javax.inject.Inject;
-import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 689114e..50cca17 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -30,19 +30,20 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
+import org.apache.isis.applib.services.user.UserMemento;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory.ThrowingRunnable;
+import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
@@ -134,7 +135,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
oneOf(mockAuthenticator).canAuthenticate(AuthenticationRequestPassword.class);
will(returnValue(true));
oneOf(mockAuthenticator).authenticate(with(any(AuthenticationRequest.class)), with(any(String.class)));
- will(returnValue(new SimpleSession("test-user", null)));
+ will(returnValue(SimpleSession.validOf(UserMemento.ofName("test-user"))));
}
});