Removing deployed on production env variable, not needed.

docker/README.md

@@ -16,10 +16,6 @@ To use this image, you need a running instance of PostgreSQL and to configure th
 * AUTHENTICATION: true for production, false for development.
 
 
-### RELEASE STAGE ###
-* PRODUCTION: Deployed on production? (True/False) Default is True.
-
-
 ### DATABASE CONFIGURATION ###
 * PORTAL_DB_URL: JDBC URL to connect to the portal database, default value is "jdbc:postgresql://127.0.0.1:5432/portal".
 * PORTAL_DB_SCHEMA: Database schema, default value is "public".

docker/config/application.tmpl

@@ -14,11 +14,6 @@ authentication:
   enabled: {{ default .Env.AUTHENTICATION "true" }}
 
 
-### RELEASE STAGE ###
-release_stage:
-  production: {{ default .Env.PRODUCTION "true" }}
-
-
 ### DATABASE CONFIGURATION ###
 spring:
   portal-datasource:

src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java

@@ -42,9 +42,6 @@ public class SecurityConfiguration extends KeycloakWebSecurityConfigurerAdapter
     @Value("#{'${authentication.enabled}'}")
     private boolean authenticationEnabled;
 
-    @Value("#{'${release_stage.production}'}")
-    private boolean deployedOnProduction;
-
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         super.configure(http);
@@ -56,19 +53,14 @@ public class SecurityConfiguration extends KeycloakWebSecurityConfigurerAdapter
                             "/v2/api-docs", "/swagger-ui/**", "/swagger-resources/**"  // Swagger URLs
                     ).permitAll()
                     .antMatchers("/galaxy*", "/galaxy/*").hasRole("DATA MANAGER")
-                    .anyRequest().hasRole("RESEARCHER");
+                    .anyRequest().hasRole("RESEARCHER")
+                    .and().csrf().ignoringAntMatchers("/logout").csrfTokenRepository(csrfTokenRepository())
+                    .and().addFilterAfter(csrfHeaderFilter(), CsrfFilter.class);
         } else {
             http.antMatcher("/**")
                     .authorizeRequests()
-                    .antMatchers("/**").permitAll();
-        }
-
-        if (!deployedOnProduction) {
-            // If deployed for development, csrf can be disabled
-            http.csrf().disable();
-        } else {
-            http.csrf().ignoringAntMatchers("/logout").csrfTokenRepository(csrfTokenRepository())
-                    .and().addFilterAfter(csrfHeaderFilter(), CsrfFilter.class);
+                    .antMatchers("/**").permitAll()
+                    .and().csrf().disable();
         }
     }
 

src/main/resources/application.yml

@@ -14,11 +14,6 @@ authentication:
   enabled: true
 
 
-### RELEASE STAGE ###
-release_stage:
-  production: true
-
-
 ### DATABASE CONFIGURATION ###
 spring:
   portal-datasource: