feat: allow tenants to be listed in admin console

Reality2byte · Feb 22, 2025 · 0134c56 · 0134c56
1 parent 05c6138
commit 0134c56
Show file tree

Hide file tree

Showing 20 changed files with 153 additions and 55 deletions.
diff --git a/...itenancy/src/main/java/org/apereo/cas/multitenancy/DefaultTenantAuthenticationPolicy.java b/...itenancy/src/main/java/org/apereo/cas/multitenancy/DefaultTenantAuthenticationPolicy.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@
 @Setter
 @NoArgsConstructor
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class DefaultTenantAuthenticationPolicy implements TenantAuthenticationPolicy {
     @Serial
     private static final long serialVersionUID = -9012299259747093234L;

diff --git a/...titenancy/src/main/java/org/apereo/cas/multitenancy/DefaultTenantCommunicationPolicy.java b/...titenancy/src/main/java/org/apereo/cas/multitenancy/DefaultTenantCommunicationPolicy.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -16,6 +17,7 @@
 @Setter
 @NoArgsConstructor
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class DefaultTenantCommunicationPolicy implements TenantCommunicationPolicy {
     @Serial
     private static final long serialVersionUID = 1810371962642100469L;

diff --git a/...src/main/java/org/apereo/cas/multitenancy/DefaultTenantDelegatedAuthenticationPolicy.java b/...src/main/java/org/apereo/cas/multitenancy/DefaultTenantDelegatedAuthenticationPolicy.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@
 @Setter
 @NoArgsConstructor
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class DefaultTenantDelegatedAuthenticationPolicy implements TenantDelegatedAuthenticationPolicy {
     @Serial
     private static final long serialVersionUID = 1800371962642100469L;

diff --git a/...c/main/java/org/apereo/cas/multitenancy/DefaultTenantMultifactorAuthenticationPolicy.java b/...c/main/java/org/apereo/cas/multitenancy/DefaultTenantMultifactorAuthenticationPolicy.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@
 @Setter
 @NoArgsConstructor
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class DefaultTenantMultifactorAuthenticationPolicy implements TenantMultifactorAuthenticationPolicy {
     @Serial
     private static final long serialVersionUID = -9012299259747093234L;

diff --git a/...ancy/src/main/java/org/apereo/cas/multitenancy/TenantCasAuthenticationProtocolPolicy.java b/...ancy/src/main/java/org/apereo/cas/multitenancy/TenantCasAuthenticationProtocolPolicy.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@
 @Setter
 @NoArgsConstructor
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class TenantCasAuthenticationProtocolPolicy implements TenantAuthenticationProtocolPolicy {
     @Serial
     private static final long serialVersionUID = -9012299259747093234L;

diff --git a/...ver-core-api-multitenancy/src/main/java/org/apereo/cas/multitenancy/TenantDefinition.java b/...ver-core-api-multitenancy/src/main/java/org/apereo/cas/multitenancy/TenantDefinition.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -23,6 +24,7 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
 @NoArgsConstructor
 @Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class TenantDefinition implements Serializable {
     @Serial
     private static final long serialVersionUID = -9012299259747093234L;

diff --git a/...ultitenancy/src/main/java/org/apereo/cas/multitenancy/TenantEmailCommunicationPolicy.java b/...ultitenancy/src/main/java/org/apereo/cas/multitenancy/TenantEmailCommunicationPolicy.java
@@ -1,5 +1,6 @@
 package org.apereo.cas.multitenancy;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@
 @Setter
 @NoArgsConstructor
 @EqualsAndHashCode
+@JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public class TenantEmailCommunicationPolicy implements Serializable {
     @Serial
     private static final long serialVersionUID = 8552529921936294263L;

diff --git a/...er-core-multitenancy/src/main/java/org/apereo/cas/multitenancy/DefaultTenantsManager.java b/...er-core-multitenancy/src/main/java/org/apereo/cas/multitenancy/DefaultTenantsManager.java
@@ -50,7 +50,7 @@ private void initializeWatchService() {
                 watcherService = new FileWatcherService(jsonResource.getFile(),
                     file -> {
                         val resources = readFromJsonResource();
-                        if (resources.isEmpty()) {
+                        if (!resources.isEmpty()) {
                             tenantDefinitionList.clear();
                             tenantDefinitionList.addAll(resources);
                         }

diff --git a/docs/cas-server-documentation/logging/Logging-Fluentd.md b/docs/cas-server-documentation/logging/Logging-Fluentd.md
@@ -18,7 +18,7 @@ CAS log data can be automatically routed to Fluentd. Support is enabled by inclu
 With the above module, you may then declare a specific appender to communicate with AWS CloudWatch:
 
 ```xml
-<Configuration packages="io.github.technologize">
+<Configuration>
     <Appenders>
         <Fluentd name="fluentd" tag="yourTag" >
         <!-- 

diff --git a/docs/cas-server-documentation/logging/Logging-GoogleCloud.md b/docs/cas-server-documentation/logging/Logging-GoogleCloud.md
@@ -38,7 +38,7 @@ in the logging configuration.</p></div>
 This is an example of the logging configuration:
 
 ```xml
-<Configuration packages="org.apereo.cas.logging">
+<Configuration>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <JsonLayout locationInfo="false"

diff --git a/docs/cas-server-documentation/logging/Logging-Sentry.md b/docs/cas-server-documentation/logging/Logging-Sentry.md
@@ -24,7 +24,7 @@ The [Logging](../logging/Logging.html) configuration file must be adjusted to ma
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="warn" packages="org.apache.logging.log4j.core,io.sentry.log4j2">
+<Configuration status="warn">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>

diff --git a/docs/cas-server-documentation/logging/Logging.md b/docs/cas-server-documentation/logging/Logging.md
@@ -38,7 +38,7 @@ such as Ticket Granting Tickets or Proxy Granting Tickets. It may be used via th
 
 ```xml
 <?xml version="1.0" encoding="UTF-8" ?>
-<Configuration monitorInterval="2" packages="org.apereo.cas.logging">
+<Configuration monitorInterval="2">
   <!-- Wrap the console appender inside -->
   <CasAppender name="casConsole" maxEntries="50">
       <AppenderRef ref="console" />

diff --git a/gradle.properties b/gradle.properties
@@ -37,11 +37,7 @@ sonarProjectName=cas
 #######################
 sourceCompatibility=21
 targetCompatibility=21
-#########################################################
+################
 # Gradle plugins
-#
-# Note: We cannot use a plugin or version from
-# the version catalog in the settings file.
-# Develocity plugin MUST be declared in the settings.file
-#########################################################
+################
 develocityApereoServerUrl=https://develocity.apereo.org/
diff --git a/support/cas-server-support-gcp-logging/src/test/resources/log4j2-test.xml b/support/cas-server-support-gcp-logging/src/test/resources/log4j2-test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<Configuration shutdownHook="disable" packages="org.apereo.cas.logging">
+<Configuration shutdownHook="disable">
 
     <Appenders>
         <Console name="PatternConsole" target="SYSTEM_OUT">