simplify withings oauth config part 2

mucsi96 · Jul 15, 2023 · 5bf0b6c · 5bf0b6c
1 parent bbf5eb7
commit 5bf0b6c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 47 deletions.
diff --git a/server/src/main/java/mucsi96/traininglog/core/SecurityConfiguration.java b/server/src/main/java/mucsi96/traininglog/core/SecurityConfiguration.java
@@ -12,7 +12,6 @@
 import org.springframework.security.web.SecurityFilterChain;
 
 import io.github.mucsi96.kubetools.security.KubetoolsSecurityConfigurer;
-import mucsi96.traininglog.oauth.AccessTokenResponseClient;
 
 @Configuration
 @EnableWebSecurity
@@ -22,13 +21,8 @@ public class SecurityConfiguration {
   @Bean
   SecurityFilterChain securityFilterChain(
       HttpSecurity http,
-      KubetoolsSecurityConfigurer kubetoolsSecurityConfigurer,
-      AccessTokenResponseClient accessTokenResponseClient) throws Exception {
-    return kubetoolsSecurityConfigurer.configure(http)
-        .oauth2Client(configurer -> configurer
-            .authorizationCodeGrant(customizer -> customizer
-                .accessTokenResponseClient(accessTokenResponseClient)))
-        .build();
+      KubetoolsSecurityConfigurer kubetoolsSecurityConfigurer) throws Exception {
+    return kubetoolsSecurityConfigurer.configure(http).securityMatcher("/weight/**", "/withings/sync").build();
   }
 
   @Bean

diff --git a/server/src/main/java/mucsi96/traininglog/oauth/AccessTokenResponseClient.java b/server/src/main/java/mucsi96/traininglog/oauth/AccessTokenResponseClient.java
diff --git a/server/src/main/java/mucsi96/traininglog/withings/oauth/WithingsOAuthConfiguration.java b/server/src/main/java/mucsi96/traininglog/withings/oauth/WithingsOAuthConfiguration.java
@@ -1,17 +1,36 @@
 package mucsi96.traininglog.withings.oauth;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProvider;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientProviderBuilder;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizedClientManager;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository;
+import org.springframework.security.web.SecurityFilterChain;
+
+import io.github.mucsi96.kubetools.security.KubetoolsSecurityConfigurer;
 
 @Configuration
 public class WithingsOAuthConfiguration {
 
+  @Bean
+  SecurityFilterChain withingsSecurityFilterChain(
+      HttpSecurity http,
+      KubetoolsSecurityConfigurer kubetoolsSecurityConfigurer,
+      WithingsAccessTokenResponseClient accessTokenResponseClient) throws Exception {
+    return kubetoolsSecurityConfigurer.configure(http)
+        .securityMatcher("/withings/authorize")
+        .oauth2Client(configurer -> configurer
+            .authorizationCodeGrant(customizer -> customizer
+                .accessTokenResponseClient(accessTokenResponseClient)))
+        .build();
+  }
+
   @Bean
   OAuth2AuthorizedClientManager withingsAuthorizedClientManager(
       ClientRegistrationRepository clientRegistrationRepository,