ActivityPub: signed GET requests, fix Signature verification

1 files changed, 0 insertions, 38 deletions

diff --git a/src/main/java/com/juick/config/ActivityPubConfig.java b/src/main/java/com/juick/config/ActivityPubConfig.java
index 9a626d12..b18dc71c 100644
--- a/src/main/java/com/juick/config/ActivityPubConfig.java
+++ b/src/main/java/com/juick/config/ActivityPubConfig.java
@@ -20,29 +20,18 @@ package com.juick.config;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.juick.ActivityPubManager;
 import com.juick.KeystoreManager;
-import com.juick.util.ActivityPubRequestInterceptor;
 import com.juick.www.WebApp;
 import com.juick.www.api.activity.converters.UserToActorConverter;
 
 import com.juick.www.api.activity.helpers.ProfileUriBuilder;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
 import javax.inject.Inject;
 
-import java.nio.charset.StandardCharsets;
-
 @Configuration
 public class ActivityPubConfig {
     @Inject
-    ActivityPubClientErrorHandler activityPubClientErrorHandler;
-    @Inject
     ObjectMapper jsonMapper;
     @Inject
     KeystoreManager keystoreManager;
@@ -52,37 +41,10 @@ public class ActivityPubConfig {
     private String baseUri;
 
     @Bean
-    MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        converter.setObjectMapper(jsonMapper);
-        return converter;
-    }
-
-    @Bean
     ActivityPubManager activityPubManager() {
         return new ActivityPubManager();
     }
 
-    @Inject
-    CloseableHttpClient httpClient;
-
-    @Bean
-    ClientHttpRequestFactory clientHttpRequestFactory() {
-        var clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
-        clientHttpRequestFactory.setHttpClient(httpClient);
-        return clientHttpRequestFactory;
-    }
-
-    @Bean
-    RestTemplate apClient() {
-        RestTemplate restTemplate = new RestTemplate(clientHttpRequestFactory());
-        restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
-        restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8));
-        restTemplate.setErrorHandler(activityPubClientErrorHandler);
-        restTemplate.getInterceptors().add(new ActivityPubRequestInterceptor());
-        return restTemplate;
-    }
-
     @Bean
     UserToActorConverter userToActorConverter() {
         return new UserToActorConverter(profileUriBuilder(), keystoreManager, webApp);