crosspost: refactoring

* spring-social
* get tokens via service api

6 files changed, 195 insertions, 124 deletions

diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle
index 8e2ecbbf..1c0dc931 100644
--- a/juick-crosspost/build.gradle
+++ b/juick-crosspost/build.gradle
@@ -3,10 +3,9 @@ apply plugin: 'war'
 apply plugin: 'org.akhikhl.gretty'
 
 dependencies {
-    compile project(':juick-server-jdbc')
     compile project(':juick-server-web')
     compile "org.springframework:spring-websocket:${rootProject.springFrameworkVersion}"
-    providedRuntime 'mysql:mysql-connector-java:5.1.40'
+    compile "org.springframework.social:spring-social-twitter:1.1.2.RELEASE"
 }
 
 compileJava.options.encoding = 'UTF-8'
diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
index 6ceb976b..eae12e6c 100644
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
+++ b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
@@ -17,38 +17,54 @@
 
 package com.juick.components.configuration;
 
-import com.juick.components.Crosspost;
 import com.juick.server.configuration.BaseWebConfiguration;
-import com.juick.service.CrosspostService;
+import com.juick.service.Crosspost;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.InterceptingClientHttpRequestFactory;
+import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.socket.client.WebSocketConnectionManager;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
-import javax.inject.Inject;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * Created by aalexeev on 11/12/16.
  */
 @Configuration
+@ComponentScan(basePackages = "com.juick.service")
 @EnableWebMvc
 @PropertySource("classpath:juick.conf")
 public class CrosspostAppConfiguration extends BaseWebConfiguration {
-    @Inject
-    private Environment env;
-    @Inject
-    private CrosspostService crosspostService;
+    @Value("${api_user:juick}")
+    private String apiUser;
+    @Value("${api_password:secret}")
+    private String apiSecret;
 
     @Bean
-    public Crosspost crosspost() {
-        return new Crosspost(env, crosspostService);
+    public RestTemplate rest() {
+        RestTemplate rest = new RestTemplate();
+        List<ClientHttpRequestInterceptor> interceptors = Collections.singletonList(
+                new BasicAuthorizationInterceptor(apiUser, apiSecret));
+
+        rest.setRequestFactory(new InterceptingClientHttpRequestFactory(rest.getRequestFactory(), interceptors));
+        return rest;
     }
     private static final String WS_URI = "wss://ws.juick.com/";
 
     @Bean
+    public Crosspost crosspost() {
+        return new Crosspost();
+    }
+
+    @Bean
     public WebSocketConnectionManager connectionManager() {
         WebSocketConnectionManager manager = new WebSocketConnectionManager(client(), crosspost(), WS_URI);
         manager.setAutoStartup(true);
diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
index 2e33abf0..6a95c1f0 100644
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
+++ b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
@@ -30,12 +30,12 @@ public class CrosspostInitializer extends AbstractAnnotationConfigDispatcherServ
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{  };
+        return new Class<?>[]{ CrosspostAppConfiguration.class };
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        return new Class<?>[]{ CrosspostAppConfiguration.class };
+        return null;
     }
 
     @Override
diff --git a/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java b/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java
index 8743fc11..3bcd84e2 100644
--- a/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java
+++ b/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java
@@ -17,7 +17,7 @@
 
 package com.juick.components.controllers;
 
-import com.juick.components.Crosspost;
+import com.juick.service.Crosspost;
 import com.juick.Status;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/juick-crosspost/src/main/java/com/juick/components/Crosspost.java b/juick-crosspost/src/main/java/com/juick/service/Crosspost.java
index 58e3c410..a8458439 100644
--- a/juick-crosspost/src/main/java/com/juick/components/Crosspost.java
+++ b/juick-crosspost/src/main/java/com/juick/service/Crosspost.java
@@ -14,75 +14,57 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.juick.components;
+package com.juick.service;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.juick.Message;
-import com.juick.service.CrosspostService;
-import com.juick.service.MessagesService;
 import com.juick.util.MessageUtils;
 import org.apache.commons.codec.CharEncoding;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.env.Environment;
-import org.springframework.util.Assert;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.social.twitter.api.Twitter;
+import org.springframework.social.twitter.api.impl.TwitterTemplate;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.TextWebSocketHandler;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.OutputStreamWriter;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.security.Key;
-import java.util.UUID;
 
 /**
  * @author Ugnich Anton
  */
 public class Crosspost extends TextWebSocketHandler {
-    final static String TWITTERURL = "https://api.twitter.com/1.1/statuses/update.json";
     final static String FBURL = "https://graph.facebook.com/me/feed";
     final static String VKURL = "https://api.vk.com/method/wall.post";
 
     private static Logger logger = LoggerFactory.getLogger(Crosspost.class);
 
-    private final CrosspostService crosspostService;
+    @Inject
+    private CrosspostService crosspostService;
 
-    private final String twitter_consumer_key;
-    private final String twitter_consumer_secret;
+    @Value("${twitter_consumer_key:}")
+    private String twitter_consumer_key;
+    @Value("${twitter_consumer_secret:}")
+    private String twitter_consumer_secret;
     @Inject
     private ObjectMapper jsonMapper;
-    @Inject
-    MessagesService messagesService;
-
-    public Crosspost(final Environment env, final CrosspostService crosspostService) {
-        Assert.notNull(env, "Environment must be initialized");
-        Assert.notNull(crosspostService, "CrosspostService must be initialized");
-
-        this.crosspostService = crosspostService;
-
-        twitter_consumer_key = env.getProperty("twitter_consumer_key", StringUtils.EMPTY);
-        twitter_consumer_secret = env.getProperty("twitter_consumer_secret", StringUtils.EMPTY);
-    }
 
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         Message msg = jsonMapper.readValue(message.asBytes(), Message.class);
         if (msg.getMid() > 0 && msg.getRid() == 0) {
-            Message jmsg = messagesService.getMessage(msg.getMid());
             if (StringUtils.isNotEmpty(crosspostService.getTwitterName(msg.getUser().getUid()))) {
-                if (jmsg.getTags().stream().noneMatch(t -> t.getName().equals("notwitter"))) {
-                    twitterPost(jmsg);
+                if (msg.getTags().stream().noneMatch(t -> t.getName().equals("notwitter"))) {
+                    twitterPost(msg);
                 }
             }
             // TODO: approve application for facebook crosspost
@@ -168,84 +150,15 @@ public class Crosspost extends TextWebSocketHandler {
         return ret;
     }
 
-    public boolean twitterPost(final com.juick.Message jmsg) {
-        Pair<String, String> tokens = crosspostService.getTwitterTokens(jmsg.getUser().getUid()).orElse(Pair.of(StringUtils.EMPTY, StringUtils.EMPTY));
-        if (tokens.getLeft().isEmpty() || tokens.getRight().isEmpty()) {
-            return false;
-        }
-        String token = MessageUtils.percentEncode(tokens.getLeft());
-        String token_secret = MessageUtils.percentEncode(tokens.getRight());
-
-        logger.info("TWITTER: #{}", jmsg.getMid());
-
-        String status = MessageUtils.getMessageHashTags(jmsg) + jmsg.getText();
-        if (status.length() > 115) {
-            status = status.substring(0, 114) + "…";
-        }
-        status += " http://juick.com/" + jmsg.getMid();
-        status = MessageUtils.percentEncode(status);
-
-        boolean ret = false;
-        try {
-            String nonce = UUID.randomUUID().toString();
-            String timestamp = Long.toString(System.currentTimeMillis() / 1000L);
-            String signature = MessageUtils.percentEncode(twitterSignature(status, nonce, timestamp, token, token_secret));
-            String auth = "OAuth "
-                    + "oauth_consumer_key=\"" + twitter_consumer_key + "\", "
-                    + "oauth_nonce=\"" + nonce + "\", "
-                    + "oauth_signature=\"" + signature + "\", "
-                    + "oauth_signature_method=\"HMAC-SHA1\", "
-                    + "oauth_timestamp=\"" + timestamp + "\", "
-                    + "oauth_token=\"" + token + "\", "
-                    + "oauth_version=\"1.0\"";
-
-            HttpsURLConnection conn = (HttpsURLConnection) new URL(TWITTERURL).openConnection();
-            conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-            conn.setRequestProperty("User-Agent", "Juick");
-            conn.setRequestProperty("Content-Length", Integer.toString(status.length() + 7));
-            conn.setRequestProperty("Authorization", auth);
-            conn.setUseCaches(false);
-            conn.setDoInput(true);
-            conn.setDoOutput(true);
-            conn.setRequestMethod("POST");
-            conn.connect();
-
-            OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-            wr.write("status=" + status);
-            wr.close();
-
-            ret = IOUtils.toString(conn.getInputStream(), StandardCharsets.UTF_8) != null;
-
-            conn.disconnect();
-        } catch (Exception e) {
-            logger.error("twitterPost exception", e);
-        }
-        return ret;
-    }
-
-    public String twitterSignature(final String status, final String nonce, final String timestamp, final String token, final String token_secret) {
-        try {
-            // ALPHABET-SORTED
-            String params = "oauth_consumer_key=" + twitter_consumer_key
-                    + "&oauth_nonce=" + nonce
-                    + "&oauth_signature_method=HMAC-SHA1"
-                    + "&oauth_timestamp=" + timestamp
-                    + "&oauth_token=" + token
-                    + "&oauth_version=1.0"
-                    + "&status=" + status;
-
-            String base = "POST&" + MessageUtils.percentEncode(TWITTERURL) + "&" + MessageUtils.percentEncode(params);
-            String key = twitter_consumer_secret + "&" + token_secret;
-
-            Key signingKey = new SecretKeySpec(key.getBytes(), "HmacSHA1");
-            Mac mac = Mac.getInstance("HmacSHA1");
-            mac.init(signingKey);
-            byte[] rawHmac = mac.doFinal(base.getBytes());
-            return Base64.encodeBase64String(rawHmac);
-
-        } catch (Exception e) {
-            logger.error("twitterSignature exception", e);
-        }
-        return null;
+    public void twitterPost(final com.juick.Message jmsg) {
+        crosspostService.getTwitterToken(jmsg.getUser().getUid()).ifPresent(t -> {
+            String status = MessageUtils.getMessageHashTags(jmsg) + jmsg.getText();
+            if (status.length() > 115) {
+                status = status.substring(0, 114) + "…";
+            }
+            status += " http://juick.com/" + jmsg.getMid();
+            Twitter twitter = new TwitterTemplate(twitter_consumer_key, twitter_consumer_secret, t.getToken(), t.getSecret());
+            twitter.timelineOperations().updateStatus(status);
+        });
     }
 }
diff --git a/juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java b/juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java
new file mode 100644
index 00000000..52b72c3f
--- /dev/null
+++ b/juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java
@@ -0,0 +1,143 @@
+package com.juick.service.rest;
+
+import com.juick.ExternalToken;
+import com.juick.User;
+import com.juick.server.helpers.ApplicationStatus;
+import com.juick.service.CrosspostService;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import javax.inject.Inject;
+import java.util.Optional;
+
+@Component
+public class CrosspostRestService implements CrosspostService {
+    @Inject
+    private RestTemplate rest;
+
+    @Override
+    public Optional<ExternalToken> getTwitterToken(int uid) {
+        User user = rest.getForObject("https://api.juick.com/tokens?uid={uid}", User.class, uid);
+        if (user != null) {
+            return user.getTokens().stream()
+                    .filter(t -> t.getType().equals("twitter")).findFirst();
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean deleteTwitterToken(Integer uid) {
+        return false;
+    }
+
+    @Override
+    public Optional<String> getFacebookToken(int uid) {
+        return null;
+    }
+
+    @Override
+    public ApplicationStatus getFbCrossPostStatus(int uid) {
+        return null;
+    }
+
+    @Override
+    public boolean enableFBCrosspost(Integer uid) {
+        return false;
+    }
+
+    @Override
+    public void disableFBCrosspost(Integer uid) {
+
+    }
+
+    @Override
+    public String getTwitterName(int uid) {
+        ExternalToken token = getTwitterToken(uid).orElse(null);
+        if (token != null) {
+            return token.getName();
+        }
+        return StringUtils.EMPTY;
+    }
+
+    @Override
+    public String getTelegramName(int uid) {
+        return null;
+    }
+
+    @Override
+    public Optional<Pair<String, String>> getVkTokens(int uid) {
+        return null;
+    }
+
+    @Override
+    public void deleteVKUser(Integer uid) {
+
+    }
+
+    @Override
+    public int getUIDbyFBID(long fbID) {
+        return 0;
+    }
+
+    @Override
+    public boolean createFacebookUser(long fbID, String loginhash, String token, String fbName, String fbLink) {
+        return false;
+    }
+
+    @Override
+    public boolean updateFacebookUser(long fbID, String token, String fbName, String fbLink) {
+        return false;
+    }
+
+    @Override
+    public int getUIDbyVKID(long vkID) {
+        return 0;
+    }
+
+    @Override
+    public boolean createVKUser(long vkID, String loginhash, String token, String vkName, String vkLink) {
+        return false;
+    }
+
+    @Override
+    public String getFacebookNameByHash(String hash) {
+        return null;
+    }
+
+    @Override
+    public String getTelegramNameByHash(String hash) {
+        return null;
+    }
+
+    @Override
+    public boolean setFacebookUser(String hash, int uid) {
+        return false;
+    }
+
+    @Override
+    public String getVKNameByHash(String hash) {
+        return null;
+    }
+
+    @Override
+    public boolean setVKUser(String hash, int uid) {
+        return false;
+    }
+
+    @Override
+    public boolean setTelegramUser(String hash, int uid) {
+        return false;
+    }
+
+    @Override
+    public String getJIDByHash(String hash) {
+        return null;
+    }
+
+    @Override
+    public boolean setJIDUser(String hash, int uid) {
+        return false;
+    }
+}