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

feat(config-api): data conversion, audit log and swagger enhancement #3588

Merged
merged 41 commits into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
123b268
feat(config-api): interceptor code
pujavs Dec 21, 2022
c21f677
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 22, 2022
8ab3512
feat(config-api): interceptor for request
pujavs Dec 22, 2022
e7f99ab
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 23, 2022
2bad11f
feat(config-api): interceptor code wip
pujavs Dec 23, 2022
848bcac
feat(config-api): interceptor code wip
pujavs Dec 23, 2022
0bcff9b
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 26, 2022
2d576f8
feat(config-api): syns with main
pujavs Dec 26, 2022
479ac53
feat(config-api): client creation claim enhancement
pujavs Dec 26, 2022
cd23476
feat(config-api): client creation claim enhancement
pujavs Dec 26, 2022
133b6c4
fix: jans-linux-setup opPolicyUri and opTosUri (#3411)
devrimyatar Dec 26, 2022
ee5f4a6
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 26, 2022
fccb0d4
feat(config-api): autit log enhancement
pujavs Dec 26, 2022
3c1d531
feat(config-api): interceptor code
pujavs Dec 26, 2022
1c4df81
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 27, 2022
174d466
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 27, 2022
1491c84
feat(config-api): datatype conversion wip
pujavs Dec 27, 2022
341358e
feat(config-api): data conversion wip
pujavs Dec 28, 2022
c218ef1
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 29, 2022
ad89dec
feat(config-api): datatype conversion
pujavs Dec 29, 2022
8f5fed1
feat(config-api): datatype conversion
pujavs Dec 29, 2022
043d9cc
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Dec 30, 2022
6abef4b
feat(config-api): data conversion code
pujavs Dec 30, 2022
b60f9e5
feat(config-api): data conversion code
pujavs Dec 30, 2022
7cab8db
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 2, 2023
c525613
feat(config-api): date conversion code
pujavs Jan 2, 2023
0bb5b10
feat(config-api): date conversion code
pujavs Jan 2, 2023
46da17e
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 3, 2023
2ef83f5
feat(config-api): audit log enhancement
pujavs Jan 3, 2023
0ad2321
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 4, 2023
e117d33
feat(config-api): request interceptor
pujavs Jan 4, 2023
d4ffc6c
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 5, 2023
0ac0cfd
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 5, 2023
65d855a
feat(config-api): date data conversion
pujavs Jan 5, 2023
2bc22f5
feat(config-api): swagger spec
pujavs Jan 5, 2023
f8baa03
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 6, 2023
ac5952d
feat(config-api): swagger update for param desc
pujavs Jan 6, 2023
52cc1e7
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 9, 2023
1056423
feat(config-api): data conversion
pujavs Jan 9, 2023
14c8d60
Merge branch 'main' of https://github.com/JanssenProject/jans into ja…
pujavs Jan 10, 2023
6135a23
feat(config-api): data conversion, audit log and swagger enhancement
pujavs Jan 10, 2023
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 @@ -37,6 +37,7 @@ public class ApiAppConfiguration implements Configuration {
private List<String> userMandatoryAttributes;
private AgamaConfiguration agamaConfiguration;
private AuditLogConf auditLogConf;
private DataFormatConversionConf dataFormatConversionConf;

public boolean isConfigOauthEnabled() {
return configOauthEnabled;
Expand Down Expand Up @@ -239,6 +240,14 @@ public AuditLogConf getAuditLogConf() {
public void setAuditLogConf(AuditLogConf auditLogConf) {
this.auditLogConf = auditLogConf;
}

public DataFormatConversionConf getDataFormatConversionConf() {
return dataFormatConversionConf;
}

public void setDataFormatConversionConf(DataFormatConversionConf dataFormatConversionConf) {
this.dataFormatConversionConf = dataFormatConversionConf;
}

@Override
public String toString() {
Expand All @@ -256,6 +265,7 @@ public String toString() {
+ " , userMandatoryAttributes="+ userMandatoryAttributes
+ " , agamaConfiguration="+ agamaConfiguration
+ " , auditLogConf="+ auditLogConf
+ " , dataFormatConversionConf="+ dataFormatConversionConf
+ "]";
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package io.jans.configapi.model.configuration;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import java.util.Collection;
import java.util.List;

@JsonIgnoreProperties(ignoreUnknown = true)
Expand All @@ -11,6 +13,11 @@ public class AuditLogConf {
*/
private boolean enabled;

/**
* HTTP methods for which audit is disabled
*/
private Collection<String> ignoreHttpMethod;

/**
* List of header attributes
*/
Expand All @@ -24,6 +31,14 @@ public void setEnabled(boolean enabled) {
this.enabled = enabled;
}

public Collection<String> getIgnoreHttpMethod() {
return ignoreHttpMethod;
}

public void setIgnoreHttpMethod(Collection<String> ignoreHttpMethod) {
this.ignoreHttpMethod = ignoreHttpMethod;
}

public List<String> getHeaderAttributes() {
return headerAttributes;
}
Expand All @@ -34,7 +49,8 @@ public void setHeaderAttributes(List<String> headerAttributes) {

@Override
public String toString() {
return "AuditLogConf [enabled=" + enabled + ", headerAttributes=" + headerAttributes + "]";
return "AuditLogConf [enabled=" + enabled + ", ignoreHttpMethod=" + ignoreHttpMethod + ", headerAttributes="
+ headerAttributes + "]";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package io.jans.configapi.model.configuration;

import java.util.Collection;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public class ConversionAttributes {

/**
* Date attributes for conversion
*/
private Collection<String> dateAttributes;

/**
* boolean attributes for conversion
*/
private Collection<String> booleanAttributes;

public Collection<String> getDateAttributes() {
return dateAttributes;
}

public void setDateAttributes(Collection<String> dateAttributes) {
this.dateAttributes = dateAttributes;
}

public Collection<String> getBooleanAttributes() {
return booleanAttributes;
}

public void setBooleanAttributes(Collection<String> booleanAttributes) {
this.booleanAttributes = booleanAttributes;
}

@Override
public String toString() {
return "ConversionAttributes [dateAttributes=" + dateAttributes + ", booleanAttributes=" + booleanAttributes
+ "]";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package io.jans.configapi.model.configuration;

import java.util.Collection;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public class DataFormatConversionConf {

/**
* Flag to enable and disable data conversion
*/
private boolean enabled;

/**
* HTTP methods for which data conversion is to be disabled
*/
private Collection<String> ignoreHttpMethod;

public boolean isEnabled() {
return enabled;
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}

public Collection<String> getIgnoreHttpMethod() {
return ignoreHttpMethod;
}

public void setIgnoreHttpMethod(Collection<String> ignoreHttpMethod) {
this.ignoreHttpMethod = ignoreHttpMethod;
}

@Override
public String toString() {
return "DataFormatConversionConf [enabled=" + enabled + ", ignoreHttpMethod=" + ignoreHttpMethod + "]";
}

}
Loading