Show environment in top bar (if defined)

FAForever · Jan 26, 2022 · 5d38b5d · 5d38b5d
1 parent 2170db6
commit 5d38b5d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/src/main/kotlin/com/faforever/userservice/config/FafProperties.kt b/src/main/kotlin/com/faforever/userservice/config/FafProperties.kt
@@ -9,6 +9,7 @@ import javax.validation.constraints.NotBlank
 @Validated
 @ConstructorBinding
 data class FafProperties(
+    val environment: String?,
     @NotBlank
     val passwordResetUrl: String,
     @NotBlank

diff --git a/src/main/kotlin/com/faforever/userservice/config/ThymeleafConfig.kt b/src/main/kotlin/com/faforever/userservice/config/ThymeleafConfig.kt
@@ -0,0 +1,22 @@
+package com.faforever.userservice.config
+
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.thymeleaf.spring5.view.reactive.ThymeleafReactiveViewResolver
+
+@Configuration
+class ThymeleafConfig {
+    @Autowired
+    private lateinit var thymeleafViewResolver: ThymeleafReactiveViewResolver
+
+    @Autowired
+    private lateinit var fafProperties: FafProperties
+
+    @Bean
+    fun staticVariableProvider() {
+        val map = mutableMapOf<String, Any>()
+        map["environment"] = fafProperties.environment?.let { "[$it] " } ?: ""
+        thymeleafViewResolver.staticVariables = map
+    }
+}
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -0,0 +1,8 @@
+faf:
+  environment: LOCAL
+
+logging:
+  level:
+    org.springframework.security: INFO
+    com.faforever: INFO
+    org.thymeleaf: INFO
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -22,11 +22,6 @@ hydra:
   fakeTlsForwarding: ${HYDRA_FAKE_TLS_FORWARDING:false}
   acceptUntrustedTlsCertificates: ${HYDRA_ACCEPT_UNTRUSTED_TLS_CERTIFICATES:true}
 
-logging:
-  level:
-    org.springframework.security: INFO
-    com.faforever: INFO
-
 spring:
   r2dbc:
     url: ${DB_R2DBC_URL:r2dbc:pool:mysql://localhost:3306/faf?ssl=false}

diff --git a/src/main/resources/templates/layout/card.html b/src/main/resources/templates/layout/card.html
@@ -5,7 +5,7 @@
 <body>
 <div class="background"></div>
 <header>
-    <h1 th:text="${headerText}" layout:fragment="header-title">FAForever</h1>
+    <h1 th:text="${environment} + ${headerText}" layout:fragment="header-title">[ENV] FAForever</h1>
 </header>
 <div layout:fragment="content">
     <div class="main-card">

diff --git a/src/main/resources/templates/layout/default.html b/src/main/resources/templates/layout/default.html
@@ -17,7 +17,7 @@
     <div id="leftheader">
         <a href="https://www.faforever.com"><img src="https://faforever.com/images/faf-logo.png"
                                                  alt="FAForever Logo"></a>
-        <h1 th:text="#{title}" layout:fragment="header-title">FAForever</h1>
+        <h1 th:text="${environment} + #{title}" layout:fragment="header-title">[ENV] FAForever</h1>
     </div>
     <div id="rightheader">
         <p th:if="${currentUser != null}" th:text="#{header.loggedInAs(${currentUser.username})}">You are logged in as [User]</p>