[#75] Merge config.properties and application.properties to applicati…

…on.yml

src/main/java/cz/cvut/kbss/study/RecordManagerApplication.java

@@ -5,7 +5,6 @@
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
-@PropertySource("classpath:config.properties")
 public class RecordManagerApplication {
 
     public static void main(String[] args) {

src/main/java/cz/cvut/kbss/study/persistence/FormGenPersistenceFactory.java

@@ -19,7 +19,6 @@
 import static cz.cvut.kbss.study.util.ConfigParam.FORM_GEN_REPOSITORY_URL;
 
 @Configuration
-@PropertySource("classpath:config.properties")
 public class FormGenPersistenceFactory {
 
     private final Environment environment;

src/main/java/cz/cvut/kbss/study/util/ConfigParam.java

@@ -39,6 +39,8 @@ public enum ConfigParam {
     E_PROFILE_UPDATE_SUBJECT("email.profileUpdateSubject"),
     E_PROFILE_UPDATE_CONTENT("email.profileUpdateContent"),
 
+    SECURITY_PROVIDER("security.provider"),
+
     OIDC_ROLE_CLAIM("oidc.roleClaim"),
 
     CORS_ALLOWED_ORIGINS("cors.allowedOrigins");

src/main/resources/application.yml

@@ -0,0 +1,66 @@
+server:
+ servlet:
+    context-path: /record-manager
+
+# Driver to manage triple stores
+driver: cz.cvut.kbss.ontodriver.rdf4j.Rdf4jDataSource
+
+# URL of repository that holds main data of the application
+repositoryUrl: http://localhost:7200/repositories/record-manager-app
+
+# URL of repository where output and configuration of form-generator should be held
+formGenRepositoryUrl: http://localhost:7200/repositories/record-manager-formgen
+
+# REST endpoint of form generator service
+formGenServiceUrl: "http://localhost:8080/s-pipes/service?_pId=transform&sgovRepositoryUrl=https%3A%2F%2Fgraphdb.onto.fel.cvut.cz%2Frepositories%2Fkodi-slovnik-gov-cz"
+
+# Option to pass sameSite attribute for set-cookie headers. Possible values are None,Lax,Strict.
+# In case of None value also attribute "Secure;" is added.
+security:
+  sameSite: ""
+
+ # Provider of application security
+  provider: internal
+
+# Url of the website for password reset emails (must have "/" at the end)
+appContext: http://localhost:3000/record-manager
+
+# SMTP configuration
+smtp:
+  host: smtp.gmail.com
+  port: 587
+  user: [email protected]
+  password: AdminOrganization123
+
+# Email settings
+email:
+  displayName: Record Manager
+  from: ""
+  replyTo: ""
+  cc: ""
+  bcc: ""
+
+  # Password Reset email configuration
+  passwordResetSubject: Password Reset
+  passwordResetContent: "<div><p>Dear user {{username}}, </p><p>please set your new password here: {{link}} </p><p>Best regards, <br>StudyManager</p></div>"
+
+  # User Invite email configuration
+  invitationSubject: Welcome to study
+  invitationContent: "<div><p>Dear {{name}}, </p><p>you have been invited to a study running at {{appContext}}. </p><p>Your username is: {{username}}. </p>\
+    <p>Please set your password here: {{link}} </p><p>Best regards, <br>StudyManager</p></div>"
+
+  # Password Change email configuration
+  passwordChangeSubject: Password Change
+  passwordChangeContent: "<div><p>Dear user {{username}}, </p><p>your password has been changed. </p><p>Best regards, <br>RecordManager</p></div>"
+
+  # Profile Update email configuration
+  profileUpdateSubject: Profile updated by a study coordinator
+  profileUpdateContent: "<div><p>Dear user {{username}}, </p><p>your profile at {{appContext}} has been updated by a study coordinator. </p><p>Best regards, <br>RecordManager</p></div>"
+
+# Claim containing user roles in the OIDC access token
+oidc:
+  roleClaim: realm_access.roles
+
+# Configures allowed origins for CORS
+cors:
+  allowedOrigins: ""

src/test/java/cz/cvut/kbss/study/persistence/TestFormGenPersistenceFactory.java

@@ -16,7 +16,7 @@
 import org.springframework.core.env.Environment;
 
 @Configuration
-@PropertySource("classpath:config.properties")
+@PropertySource("classpath:application.properties")
 @Profile("test")
 public class TestFormGenPersistenceFactory {
 

src/test/java/cz/cvut/kbss/study/persistence/TestPersistenceFactory.java

@@ -24,7 +24,7 @@
 import static cz.cvut.kbss.ontodriver.config.OntoDriverProperties.DATA_SOURCE_USERNAME;
 
 @Configuration
-@PropertySource("classpath:config.properties")
+@PropertySource("classpath:application.properties")
 @Profile("test")
 public class TestPersistenceFactory {
 

src/test/resources/config.properties → src/test/resources/application.properties

@@ -1,7 +1,9 @@
 test.repositoryUrl=study-test-repository
-repositoryUrl=study-test-repository
 test.driver=cz.cvut.kbss.ontodriver.rdf4j.Rdf4jDataSource
-driver=cz.cvut.kbss.ontodriver.rdf4j.Rdf4jDataSource
 test.formGenRepositoryUrl=test-formGen-repository
+
+repositoryUrl=study-test-repository
+
 formGenRepositoryUrl=test-formGen-repository
-formGenServiceUrl=http://localhost:8081/formGenerator
+
+formGenServiceUrl=http://localhost:8081/formGenerator