You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/29 06:27:54 UTC
[isis] 01/02: ISIS-2728: adds multiTenancyToken into UserMemento
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2728
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e275f35b821622be2c267d0ae14c527bb9906f39
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Jun 29 07:22:04 2021 +0100
ISIS-2728: adds multiTenancyToken into UserMemento
---
.../org/apache/isis/applib/services/user/UserMemento.java | 12 ++++++++++--
.../applib/services/user/UserMemento.layout.fallback.xml | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
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 38825f7..4469a1e 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
@@ -183,7 +183,7 @@ public class UserMemento implements Serializable {
* where the validity of the session is defined by headers in the request.
*/
@Property
- @PropertyLayout(fieldSetId = "authentication", sequence = "1")
+ @PropertyLayout(fieldSetId = "security", sequence = "1")
@Getter @Builder.Default @With(onMethod_ = {@Programmatic})
@NonNull
AuthenticationSource authenticationSource = AuthenticationSource.DEFAULT;
@@ -205,11 +205,18 @@ public class UserMemento implements Serializable {
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSetId = "authentication", sequence = "2")
+ @PropertyLayout(fieldSetId = "security", sequence = "2")
@Getter @Builder.Default @With(onMethod_ = {@Programmatic})
boolean impersonating = false;
+ @Property(optionality = Optionality.OPTIONAL)
+ @PropertyLayout(fieldSetId = "security", sequence = "3")
+ @Getter @With(onMethod_ = {@Programmatic})
+ @Nullable
+ String multiTenancyToken;
+
+
private static final String DEFAULT_AUTH_VALID_CODE = "";
/**
@@ -282,6 +289,7 @@ public class UserMemento implements Serializable {
.avatarUrl(avatarUrl)
.impersonating(impersonating)
.realName(realName)
+ .multiTenancyToken(multiTenancyToken)
.roles(roles);
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml
index 1b2d386..abe976c 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml
@@ -53,7 +53,7 @@ under the License.
</bs3:tab>
</bs3:tabGroup>
<cpt:fieldSet name="Details" id="details"/>
- <cpt:fieldSet name="Authentication" id="authentication"/>
+ <cpt:fieldSet name="Security" id="security"/>
</bs3:col>
<bs3:col span="6">
<cpt:collection id="roles"/>