Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

@shekhar16 feat(document-store): add jansServices changes #8599

Merged
merged 15 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ public class AssetMgtConfiguration {
*/
private String assetBaseDirectory;

/**
* List of supported service module where asset can be uploaded
*/
private List<String> jansModules;
private List<String> jansServices;

/**
* Asset type mapped to server directory
Expand Down Expand Up @@ -81,14 +78,6 @@ public void setAssetBaseDirectory(String assetBaseDirectory) {
this.assetBaseDirectory = assetBaseDirectory;
}

public List<String> getJansModules() {
return jansModules;
}

public void setJansModules(List<String> jansModules) {
this.jansModules = jansModules;
}

public List<AssetDirMapping> getAssetDirMapping() {
return assetDirMapping;
}
Expand All @@ -97,12 +86,22 @@ public void setAssetDirMapping(List<AssetDirMapping> assetDirMapping) {
this.assetDirMapping = assetDirMapping;
}

/**
* List of supported service module where asset can be uploaded
*/
public List<String> getJansServices() {
return jansServices;
}

public void setJansServices(List<String> jansServices) {
this.jansServices = jansServices;
}

@Override
public String toString() {
return "AssetMgtConfiguration [assetMgtEnabled=" + assetMgtEnabled + ", assetServerUploadEnabled="
+ assetServerUploadEnabled + ", fileExtensionValidationEnabled=" + fileExtensionValidationEnabled
+ ", moduleNameValidationEnabled=" + moduleNameValidationEnabled + ", assetBaseDirectory="
+ assetBaseDirectory + ", jansModules=" + jansModules + ", assetDirMapping=" + assetDirMapping + "]";
+ assetBaseDirectory + ", jansServices=" + jansServices + ", assetDirMapping=" + assetDirMapping + "]";
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class Document extends Entry implements Serializable {
@AttributeName
private Date creationDate;

@AttributeName
private List<String> jansModuleProperty;
@AttributeName(name = "jansService")
private List<String> jansServices;

@AttributeName
private Integer jansLevel;
Expand Down Expand Up @@ -136,11 +136,19 @@ public void setJansAlias(String jansAlias) {
this.jansAlias = jansAlias;
}

public List<String> getJansServices() {
return jansServices;
}

public void setJansServices(List<String> jansServices) {
this.jansServices = jansServices;
}

@Override
public String toString() {
return "Document [inum=" + inum + ", displayName=" + displayName + ", description=" + description
+ ", document=" + document + ", creationDate=" + creationDate + ", jansModuleProperty="
+ jansModuleProperty + ", jansLevel=" + jansLevel + ", jansRevision=" + jansRevision + ", jansEnabled="
+ ", document=" + document + ", creationDate=" + creationDate + ", jansServices="
+ jansServices + ", jansLevel=" + jansLevel + ", jansRevision=" + jansRevision + ", jansEnabled="
+ jansEnabled + ", jansAlias=" + jansAlias + "]";
}
}
15 changes: 14 additions & 1 deletion jans-linux-setup/jans_setup/schema/jans_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2308,6 +2308,19 @@
"syntax": "1.3.6.1.4.1.1466.115.121.1.15",
"x_origin": "Jans created attribute"
},
{
"desc": "Jans Service property",
"equality": "caseIgnoreMatch",
"names": [
"jansService"
],
"json": true,
"multivalued": true,
"oid": "jansAttr",
"substr": "caseIgnoreSubstringsMatch",
"syntax": "1.3.6.1.4.1.1466.115.121.1.15",
"x_origin": "Jans created attribute"
},
{
"desc": "Conf property",
"equality": "caseIgnoreMatch",
Expand Down Expand Up @@ -5054,7 +5067,7 @@
"description",
"document",
"creationDate",
"jansModuleProperty",
"jansServices",
"jansLevel",
"jansRevision",
"jansEnabled",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,15 @@
"fileExtensionValidationEnabled":true,
"moduleNameValidationEnabled":true,
"assetBaseDirectory":"/opt/jans/jetty/%s/custom",
"jansModules":[
"jansServices":[
"jans-auth",
"jans-casa",
"jans-config-api",
"jans-fido2",
"jans-link",
"jans-lock",
"jans-scim"
"jans-scim",
"jans-keycloak-link"
],
"assetDirMapping":[
{
Expand Down Expand Up @@ -161,7 +162,7 @@
"description": "lock plugin",
"className": "io.jans.configapi.plugin.lock.rest.ApiApplication"
}

]
}

Expand Down