Merge remote-tracking branch 'origin/main'

# Conflicts:
#	core/src/main/resources/frontend

Author: katsumag

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "core/src/main/resources/frontend"]
 	path = core/src/main/resources/frontend
 	url = https://github.com/osable/frontend.git
+	branch = release

core/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     // Spring MVC
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
-    implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
+    implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
 
     implementation("org.springframework.boot:spring-boot-starter-webflux")
 

core/src/main/kotlin/net/osable/core/GitHubReactiveOpaqueTokenIntrospector.kt

@@ -31,7 +31,7 @@ class SecurityConfiguration {
         }.csrf {
             // Configure CSRF token
             it.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-        }.oauth2ResourceServer()
+        }.oauth2Client()
 
         return http.build()
     }

core/src/main/kotlin/net/osable/core/SecurityConfiguration.kt

@@ -1,7 +1,8 @@
 spring:
-  profiles: development
-
   config:
+    activate:
+      on-profile: development
+
     import: optional:secrets.yaml
 
 eureka:

core/src/main/resources/application-development.yaml

@@ -1,10 +1,12 @@
 spring:
-  profiles: production
+  config:
+    activate:
+      on-profile: production
 
 eureka:
   client:
     service-url:
-      defaultZone: http\://discovery.osable.svc.cluster.local\:8761/eureka
+      defaultZone: http://discovery.osable.svc.cluster.local:8761/eureka
   instance:
     hostname: core.osable.svc.cluster.local
 

core/src/main/resources/application-production.yaml

@@ -1,5 +1,7 @@
 spring:
-  profiles: development, production
+  config:
+    activate:
+      on-profile: development, production
 
   application:
     name: core