Merge branch 'main' into cn-gsm-versioning

jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/ApiAppConfiguration.java

@@ -3,13 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.jans.as.model.configuration.Configuration;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ApiAppConfiguration implements Configuration {
 
     private boolean configOauthEnabled;
+    private boolean disableLoggerTimer;
+    private boolean disableAuditLogger;
+    private boolean assetMgtEnabled;
     private boolean customAttributeValidationEnabled;
     private List<String> apiApprovedIssuer;
     private String apiProtectionType;
@@ -40,238 +42,246 @@ public class ApiAppConfiguration implements Configuration {
     private AuditLogConf auditLogConf;
     private DataFormatConversionConf dataFormatConversionConf;
     private List<PluginConf> plugins;
-
+    
     public boolean isConfigOauthEnabled() {
         return configOauthEnabled;
     }
-
+    
     public void setConfigOauthEnabled(boolean configOauthEnabled) {
         this.configOauthEnabled = configOauthEnabled;
     }
-
+
+    public boolean isDisableLoggerTimer() {
+        return disableLoggerTimer;
+    }
+
+    public void setDisableLoggerTimer(boolean disableLoggerTimer) {
+        this.disableLoggerTimer = disableLoggerTimer;
+    }
+
+    public boolean isDisableAuditLogger() {
+        return disableAuditLogger;
+    }
+
+    public void setDisableAuditLogger(boolean disableAuditLogger) {
+        this.disableAuditLogger = disableAuditLogger;
+    }
+
+    public boolean isAssetMgtEnabled() {
+        return assetMgtEnabled;
+    }
+
+    public void setAssetMgtEnabled(boolean assetMgtEnabled) {
+        this.assetMgtEnabled = assetMgtEnabled;
+    }
+
     public boolean isCustomAttributeValidationEnabled() {
         return customAttributeValidationEnabled;
     }
-
+    
     public void setCustomAttributeValidationEnabled(boolean customAttributeValidationEnabled) {
         this.customAttributeValidationEnabled = customAttributeValidationEnabled;
     }
-
+    
     public List<String> getApiApprovedIssuer() {
         return apiApprovedIssuer;
     }
-
+    
     public void setApiApprovedIssuer(List<String> apiApprovedIssuer) {
         this.apiApprovedIssuer = apiApprovedIssuer;
     }
-
+    
     public String getApiProtectionType() {
         return apiProtectionType;
     }
-
+    
     public void setApiProtectionType(String apiProtectionType) {
         this.apiProtectionType = apiProtectionType;
     }
-
+    
     public String getApiClientId() {
         return apiClientId;
     }
-
+    
     public void setApiClientId(String apiClientId) {
         this.apiClientId = apiClientId;
     }
-
+    
     public String getApiClientPassword() {
         return apiClientPassword;
     }
-
+    
     public void setApiClientPassword(String apiClientPassword) {
         this.apiClientPassword = apiClientPassword;
     }
-
+    
     public boolean isEndpointInjectionEnabled() {
         return endpointInjectionEnabled;
     }
-
+    
     public void setEndpointInjectionEnabled(boolean endpointInjectionEnabled) {
         this.endpointInjectionEnabled = endpointInjectionEnabled;
     }
-
+    
     public String getAuthIssuerUrl() {
         return authIssuerUrl;
     }
-
+    
     public void setAuthIssuerUrl(String authIssuerUrl) {
         this.authIssuerUrl = authIssuerUrl;
     }
-
+    
     public String getAuthOpenidConfigurationUrl() {
         return authOpenidConfigurationUrl;
     }
-
+    
     public void setAuthOpenidConfigurationUrl(String authOpenidConfigurationUrl) {
         this.authOpenidConfigurationUrl = authOpenidConfigurationUrl;
     }
-
+    
     public String getAuthOpenidIntrospectionUrl() {
         return authOpenidIntrospectionUrl;
     }
-
+    
     public void setAuthOpenidIntrospectionUrl(String authOpenidIntrospectionUrl) {
         this.authOpenidIntrospectionUrl = authOpenidIntrospectionUrl;
     }
-
+    
     public String getAuthOpenidTokenUrl() {
         return authOpenidTokenUrl;
     }
-
+    
     public void setAuthOpenidTokenUrl(String authOpenidTokenUrl) {
         this.authOpenidTokenUrl = authOpenidTokenUrl;
     }
-
+    
     public String getAuthOpenidRevokeUrl() {
         return authOpenidRevokeUrl;
     }
-
+    
     public void setAuthOpenidRevokeUrl(String authOpenidRevokeUrl) {
         this.authOpenidRevokeUrl = authOpenidRevokeUrl;
     }
-
+    
     public String getSmallryeHealthRootPath() {
         return smallryeHealthRootPath;
     }
-
+    
     public void setSmallryeHealthRootPath(String smallryeHealthRootPath) {
         this.smallryeHealthRootPath = smallryeHealthRootPath;
     }
-
-    public List<CorsConfigurationFilter> getCorsConfigurationFilters() {
-        if (corsConfigurationFilters == null) {
-            corsConfigurationFilters = new ArrayList<>();
-        }
-
-        return corsConfigurationFilters;
-    }
-
-    public void setCorsConfigurationFilters(List<CorsConfigurationFilter> corsConfigurationFilters) {
-        if (corsConfigurationFilters == null) {
-            this.corsConfigurationFilters = new ArrayList<>();
-        } else {
-            this.corsConfigurationFilters = new ArrayList<>();
-            this.corsConfigurationFilters.addAll(corsConfigurationFilters);
-        }
-    }
-
+
     public List<String> getExclusiveAuthScopes() {
-        if (exclusiveAuthScopes == null) {
-            exclusiveAuthScopes = new ArrayList<>();
-        }
         return exclusiveAuthScopes;
     }
-
+    
     public void setExclusiveAuthScopes(List<String> exclusiveAuthScopes) {
         this.exclusiveAuthScopes = exclusiveAuthScopes;
-        if (exclusiveAuthScopes == null) {
-            this.exclusiveAuthScopes = new ArrayList<>();
-        } else {
-            this.exclusiveAuthScopes = new ArrayList<>();
-            this.exclusiveAuthScopes.addAll(exclusiveAuthScopes);
-        }
     }
-
+
+    public List<CorsConfigurationFilter> getCorsConfigurationFilters() {
+        return corsConfigurationFilters;
+    }
+
+    public void setCorsConfigurationFilters(List<CorsConfigurationFilter> corsConfigurationFilters) {
+        this.corsConfigurationFilters = corsConfigurationFilters;
+    }
+
     public String getLoggingLevel() {
         return loggingLevel;
     }
-
+    
     public void setLoggingLevel(String loggingLevel) {
         this.loggingLevel = loggingLevel;
     }
-
+    
     public String getLoggingLayout() {
         return loggingLayout;
     }
-
+    
     public void setLoggingLayout(String loggingLayout) {
         this.loggingLayout = loggingLayout;
     }
-
+    
     public String getExternalLoggerConfiguration() {
         return externalLoggerConfiguration;
     }
-
+    
     public void setExternalLoggerConfiguration(String externalLoggerConfiguration) {
         this.externalLoggerConfiguration = externalLoggerConfiguration;
     }
-
+    
     public Boolean getDisableJdkLogger() {
         return disableJdkLogger;
     }
-
+    
     public void setDisableJdkLogger(Boolean disableJdkLogger) {
         this.disableJdkLogger = disableJdkLogger;
     }
-
+    
     public int getMaxCount() {
-        return this.maxCount;
+        return maxCount;
     }
-
+    
     public void setMaxCount(int maxCount) {
         this.maxCount = maxCount;
     }
-
+    
     public List<String> getUserExclusionAttributes() {
         return userExclusionAttributes;
     }
-
+    
     public void setUserExclusionAttributes(List<String> userExclusionAttributes) {
         this.userExclusionAttributes = userExclusionAttributes;
     }
-
+    
     public List<String> getUserMandatoryAttributes() {
         return userMandatoryAttributes;
     }
-
+    
     public void setUserMandatoryAttributes(List<String> userMandatoryAttributes) {
         this.userMandatoryAttributes = userMandatoryAttributes;
     }
-        
+
     public AgamaConfiguration getAgamaConfiguration() {
         return agamaConfiguration;
     }
-
+    
     public void setAgamaConfiguration(AgamaConfiguration agamaConfiguration) {
         this.agamaConfiguration = agamaConfiguration;
     }
-        
+
     public AuditLogConf getAuditLogConf() {
         return auditLogConf;
     }
-
+    
     public void setAuditLogConf(AuditLogConf auditLogConf) {
         this.auditLogConf = auditLogConf;
     }
 
     public DataFormatConversionConf getDataFormatConversionConf() {
         return dataFormatConversionConf;
     }
-
+    
     public void setDataFormatConversionConf(DataFormatConversionConf dataFormatConversionConf) {
         this.dataFormatConversionConf = dataFormatConversionConf;
-    }    
-
+    }
+    
     public List<PluginConf> getPlugins() {
         return plugins;
     }
-
+    
     public void setPlugins(List<PluginConf> plugins) {
         this.plugins = plugins;
     }
-
+    
     @Override
     public String toString() {
-        return "ApiAppConfiguration [configOauthEnabled=" + configOauthEnabled + ", customAttributeValidationEnabled="
-                + customAttributeValidationEnabled + ", apiApprovedIssuer=" + apiApprovedIssuer + ", apiProtectionType="
-                + apiProtectionType + ", apiClientId=" + apiClientId + ", apiClientPassword=" + apiClientPassword
+        return "ApiAppConfiguration [configOauthEnabled=" + configOauthEnabled + ", disableLoggerTimer="
+                + disableLoggerTimer + ", disableAuditLogger=" + disableAuditLogger + ", assetMgtEnabled="
+                + assetMgtEnabled + ", customAttributeValidationEnabled=" + customAttributeValidationEnabled
+                + ", apiApprovedIssuer=" + apiApprovedIssuer + ", apiProtectionType=" + apiProtectionType
+                + ", apiClientId=" + apiClientId + ", apiClientPassword=" + apiClientPassword
                 + ", endpointInjectionEnabled=" + endpointInjectionEnabled + ", authIssuerUrl=" + authIssuerUrl
                 + ", authOpenidConfigurationUrl=" + authOpenidConfigurationUrl + ", authOpenidIntrospectionUrl="
                 + authOpenidIntrospectionUrl + ", authOpenidTokenUrl=" + authOpenidTokenUrl + ", authOpenidRevokeUrl="
@@ -284,5 +294,7 @@ public String toString() {
                 + auditLogConf + ", dataFormatConversionConf=" + dataFormatConversionConf + ", plugins=" + plugins
                 + "]";
     }
+
+
 }
 

jans-config-api/common/src/main/java/io/jans/configapi/util/ApiAccessConstants.java

@@ -97,4 +97,9 @@ private ApiAccessConstants() {
 
     public static final String APP_VERSION_READ_ACCESS = "https://jans.io/oauth/config/app-version.readonly";
 
+    public static final String JANS_ASSET_READ_ACCESS  = "https://jans.io/oauth/jans_asset-read";
+    public static final String JANS_ASSET_WRITE_ACCESS = "https://jans.io/oauth/config/jans_asset-write";
+    public static final String JANS_ASSET_DELETE_ACCESS = "https://jans.io/oauth/config/jans_asset-delete";
+
+
 }

jans-config-api/common/src/main/java/io/jans/configapi/util/ApiConstants.java

@@ -78,6 +78,10 @@ private ApiConstants() {}
     public static final String STATISTICS = "/stat";
     public static final String USER = "/user";
     public static final String ORG = "/org";
+    public static final String JANS_ASSETS = "/jans-assets";
+    public static final String UPLOAD = "/upload";
+    public static final String STREAM = "/stream";
+
     public static final String APP_VERSION = "/app-version";
     public static final String SERVER_STAT = "/server-stat";
     public static final String USERNAME_PATH = "/{username}";