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.

Sign up for GitHub

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

Jump to bottom

feat: add message configuration api to config-api #6982 #6983

Merged
merged 5 commits into from
Dec 7, 2023
Merged

feat: add message configuration api to config-api #6982 #6983

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aab3ea8
feat: add message configuration api to config-api #6982
yurem Dec 7, 2023
52cd494
feat: swagger api for messages
yurem Dec 7, 2023
aac56ab
chore: add new jansMessageConf attribute
yurem Dec 7, 2023
3f3c374
feat: add default message conf with null provider
yurem Dec 7, 2023
8700e0a
Merge branch 'main' into message-config
yurem Dec 7, 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
4 changes: 4 additions & 0 deletions jans-auth-server/persistence-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
<groupId>io.jans</groupId>
<artifactId>jans-core-document-store</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-message</artifactId>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-orm-model</artifactId>
Expand Down
15 changes: 14 additions & 1 deletion ...nce-model/src/main/java/io/jans/as/persistence/model/configuration/GluuConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.jans.orm.model.base.InumEntry;
import io.jans.service.cache.CacheConfiguration;
import io.jans.service.document.store.conf.DocumentStoreConfiguration;
import io.jans.service.message.model.config.MessageConfiguration;

import java.io.Serializable;
import java.util.List;
Expand All @@ -40,6 +41,10 @@ public class GluuConfiguration extends InumEntry implements Serializable {
@JsonObject
private CacheConfiguration cacheConfiguration;

@AttributeName(name = "jansMessageConf")
@JsonObject
private MessageConfiguration messageConfiguration;

@AttributeName(name = "jansDocStoreConf")
@JsonObject
private DocumentStoreConfiguration documentStoreConfiguration;
Expand Down Expand Up @@ -75,7 +80,15 @@ public void setCacheConfiguration(CacheConfiguration cacheConfiguration) {
this.cacheConfiguration = cacheConfiguration;
}

public DocumentStoreConfiguration getDocumentStoreConfiguration() {
public MessageConfiguration getMessageConfiguration() {
return messageConfiguration;
}

public void setMessageConfiguration(MessageConfiguration messageConfiguration) {
this.messageConfiguration = messageConfiguration;
}

public DocumentStoreConfiguration getDocumentStoreConfiguration() {
return documentStoreConfiguration;
}

Expand Down
5 changes: 5 additions & 0 deletions jans-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@
<artifactId>jans-core-cache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-message</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.jans</groupId>
<artifactId>jans-core-document-store</artifactId>
Expand Down
3 changes: 3 additions & 0 deletions jans-config-api/common/src/main/java/io/jans/configapi/util/ApiAccessConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ private ApiAccessConstants() {
public static final String CACHE_READ_ACCESS = "https://jans.io/oauth/config/cache.readonly";
public static final String CACHE_WRITE_ACCESS = "https://jans.io/oauth/config/cache.write";

public static final String MESSAGE_READ_ACCESS = "https://jans.io/oauth/config/message.readonly";
public static final String MESSAGE_WRITE_ACCESS = "https://jans.io/oauth/config/message.write";

public static final String SMTP_READ_ACCESS = "https://jans.io/oauth/config/smtp.readonly";
public static final String SMTP_WRITE_ACCESS = "https://jans.io/oauth/config/smtp.write";
public static final String SMTP_DELETE_ACCESS = "https://jans.io/oauth/config/smtp.delete";
Expand Down
2 changes: 2 additions & 0 deletions jans-config-api/common/src/main/java/io/jans/configapi/util/ApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ private ApiConstants() {}
public static final String SMTP = "/smtp";
public static final String GRANT_TYPES = "/grant-types";
public static final String CACHE = "/cache";
public static final String MESSAGE = "/message";
public static final String PERSISTENCE = "/persistence";
public static final String FEATURE_FLAGS = "/feature-flags";
public static final String DATABASE = "/database";
Expand All @@ -60,6 +61,7 @@ private ApiConstants() {}
public static final String IN_MEMORY = "/in-memory";
public static final String NATIVE_PERSISTENCE = "/native-persistence";
public static final String MEMCACHED = "/memcached";
public static final String POSTGRES = "/postgres";
public static final String TEST = "/test";
public static final String INUM_PATH = "{inum}";
public static final String ID_PATH = "{id}";
Expand Down
Loading