aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--juick-api/src/main/java/com/juick/api/controllers/Notifications.java12
-rw-r--r--juick-api/src/main/java/com/juick/api/controllers/Service.java (renamed from juick-api/src/main/java/com/juick/api/controllers/Subscriptions.java)29
-rw-r--r--juick-api/src/test/java/com/juick/api/tests/MessagesTests.java6
-rw-r--r--juick-core/build.gradle2
-rw-r--r--juick-core/src/main/java/com/juick/ExternalToken.java (renamed from juick-core/src/main/java/com/juick/DeviceRegistration.java)23
-rw-r--r--juick-core/src/main/java/com/juick/User.java14
-rw-r--r--juick-crosspost/build.gradle3
-rw-r--r--juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java36
-rw-r--r--juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java4
-rw-r--r--juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java2
-rw-r--r--juick-crosspost/src/main/java/com/juick/service/Crosspost.java (renamed from juick-crosspost/src/main/java/com/juick/components/Crosspost.java)131
-rw-r--r--juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java143
-rw-r--r--juick-notifications/src/main/java/com/juick/components/Notifications.java14
-rw-r--r--juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java6
-rw-r--r--juick-server-core/build.gradle1
-rw-r--r--juick-server-core/src/main/java/com/juick/service/CrosspostService.java5
-rw-r--r--juick-server-jdbc/build.gradle1
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java12
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/NewMessage.java2
19 files changed, 274 insertions, 172 deletions
diff --git a/juick-api/src/main/java/com/juick/api/controllers/Notifications.java b/juick-api/src/main/java/com/juick/api/controllers/Notifications.java
index c08689aa..2a55844c 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/Notifications.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/Notifications.java
@@ -19,7 +19,7 @@ package com.juick.api.controllers;
import com.juick.Message;
import com.juick.Status;
-import com.juick.DeviceRegistration;
+import com.juick.ExternalToken;
import com.juick.User;
import com.juick.server.helpers.AnonymousUser;
import com.juick.server.util.HttpBadRequestException;
@@ -58,9 +58,9 @@ public class Notifications {
private User collectTokens(Integer uid) {
User user = userService.getUserByUID(uid).orElse(AnonymousUser.INSTANCE);
- pushQueriesService.getGCMRegID(uid).forEach(t -> user.getDevices().add(new DeviceRegistration("gcm", t)));
- pushQueriesService.getAPNSToken(uid).forEach(t -> user.getDevices().add(new DeviceRegistration("apns", t)));
- pushQueriesService.getMPNSURL(uid).forEach(t -> user.getDevices().add(new DeviceRegistration("mpns", t)));
+ pushQueriesService.getGCMRegID(uid).forEach(t -> user.getTokens().add(new ExternalToken(null, "gcm", t, null)));
+ pushQueriesService.getAPNSToken(uid).forEach(t -> user.getTokens().add(new ExternalToken(null, "apns", t, null)));
+ pushQueriesService.getMPNSURL(uid).forEach(t -> user.getTokens().add(new ExternalToken(null, "mpns", t, null)));
return user;
}
@@ -98,7 +98,7 @@ public class Notifications {
@RequestMapping(value = "/notifications", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Status doDelete(
- @RequestBody List<DeviceRegistration> list) throws IOException {
+ @RequestBody List<ExternalToken> list) throws IOException {
User visitor = UserUtils.getCurrentUser();
// FIXME: it is possible to delete other user's tokens
if ((visitor.getUid() == 0) || !(visitor.getName().equals("juick"))) {
@@ -125,7 +125,7 @@ public class Notifications {
@RequestMapping(value = "/notifications", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Status doPut(
- @RequestBody List<DeviceRegistration> list) throws IOException {
+ @RequestBody List<ExternalToken> list) throws IOException {
User visitor = UserUtils.getCurrentUser();
if (visitor.getUid() == 0) {
throw new HttpForbiddenException();
diff --git a/juick-api/src/main/java/com/juick/api/controllers/Subscriptions.java b/juick-api/src/main/java/com/juick/api/controllers/Service.java
index 06ea9fcf..b3516391 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/Subscriptions.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/Service.java
@@ -17,32 +17,38 @@
package com.juick.api.controllers;
+import com.juick.ExternalToken;
import com.juick.Message;
import com.juick.User;
import com.juick.server.util.HttpBadRequestException;
import com.juick.server.util.HttpForbiddenException;
import com.juick.server.util.UserUtils;
+import com.juick.service.CrosspostService;
import com.juick.service.MessagesService;
import com.juick.service.SubscriptionService;
+import com.juick.service.UserService;
import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.inject.Inject;
import java.io.IOException;
import java.util.List;
/**
- * Created by vitalyster on 24.10.2016.
+ * TODO: configure spring-security to allow only admin role
*/
+@ApiIgnore
@RestController
-public class Subscriptions {
+public class Service {
@Inject
private SubscriptionService subscriptionService;
@Inject
private MessagesService messagesService;
+ @Inject
+ private CrosspostService crosspostService;
+ @Inject
+ private UserService userService;
@RequestMapping(value = "/subscriptions", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<User> doGet(
@@ -63,4 +69,15 @@ public class Subscriptions {
}
throw new HttpBadRequestException();
}
+ @GetMapping("/tokens")
+ public User getTokensForUser(@RequestParam(defaultValue = "0") int uid) {
+ User visitor = UserUtils.getCurrentUser();
+ if ((visitor.getUid() == 0) && !(visitor.getName().equals("juick"))) {
+ throw new HttpForbiddenException();
+ }
+ User user = userService.getUserByUID(uid).orElseThrow(IllegalStateException::new);
+ crosspostService.getTwitterToken(uid).ifPresent(
+ t -> user.getTokens().add(t));
+ return user;
+ }
}
diff --git a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
index b626b0e9..906e8713 100644
--- a/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
+++ b/juick-api/src/test/java/com/juick/api/tests/MessagesTests.java
@@ -19,7 +19,7 @@ package com.juick.api.tests;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.juick.DeviceRegistration;
+import com.juick.ExternalToken;
import com.juick.Message;
import com.juick.Tag;
import com.juick.User;
@@ -247,7 +247,7 @@ public class MessagesTests extends AbstractJUnit4SpringContextTests {
String juickPassword = "demo";
int juickId = userService.createUser(juickName, juickPassword);
String token = "123456";
- DeviceRegistration registration = new DeviceRegistration("apns", token);
+ ExternalToken registration = new ExternalToken(null, "apns", token, null);
mockMvc.perform(put("/notifications").with(httpBasic(ugnichName, ugnichPassword))
.contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(Collections.singletonList(registration))))
@@ -260,6 +260,6 @@ public class MessagesTests extends AbstractJUnit4SpringContextTests {
List<User> user = jsonMapper.readValue(result.getResponse().getContentAsString(),
new TypeReference<List<User>>() {
});
- assertThat(user.get(0).getDevices().get(0).getToken(), equalTo(token));
+ assertThat(user.get(0).getTokens().get(0).getToken(), equalTo(token));
}
}
diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index 15d35239..34e4b00e 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -8,6 +8,8 @@ dependencies {
compile "org.apache.commons:commons-text:1.1"
compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
+ compile 'com.google.code.findbugs:jsr305:3.0.2'
+
testCompile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
testCompile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
diff --git a/juick-core/src/main/java/com/juick/DeviceRegistration.java b/juick-core/src/main/java/com/juick/ExternalToken.java
index eb9a9ffc..933ecf82 100644
--- a/juick-core/src/main/java/com/juick/DeviceRegistration.java
+++ b/juick-core/src/main/java/com/juick/ExternalToken.java
@@ -23,29 +23,36 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Created by vitalyster on 22.11.2016.
*/
-public class DeviceRegistration {
+public class ExternalToken {
+ private String name;
private String type;
private String token;
+ private String secret;
@JsonCreator
- public DeviceRegistration(@JsonProperty("type") String type, @JsonProperty("token") String token) {
+ public ExternalToken(@JsonProperty("name") String name,
+ @JsonProperty("type") String type,
+ @JsonProperty("token") String token,
+ @JsonProperty("secret") String secret) {
+ this.name = name;
this.type = type;
this.token = token;
+ this.secret = secret;
}
public String getType() {
return type;
}
- public void setType(String type) {
- this.type = type;
- }
-
public String getToken() {
return token;
}
- public void setToken(String token) {
- this.token = token;
+ public String getName() {
+ return name;
+ }
+
+ public String getSecret() {
+ return secret;
}
}
diff --git a/juick-core/src/main/java/com/juick/User.java b/juick-core/src/main/java/com/juick/User.java
index 1ee8c920..ed5ac021 100644
--- a/juick-core/src/main/java/com/juick/User.java
+++ b/juick-core/src/main/java/com/juick/User.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
+import javax.annotation.Nonnull;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
@@ -45,10 +46,10 @@ public class User implements Serializable {
private boolean banned;
private String credentials;
private String lang;
- private List<DeviceRegistration> devices;
+ private List<ExternalToken> tokens;
public User() {
- devices = new ArrayList<>();
+ tokens = new ArrayList<>();
}
@Override
@@ -186,11 +187,12 @@ public class User implements Serializable {
return false;
}
- public List<DeviceRegistration> getDevices() {
- return devices;
+ @Nonnull
+ public List<ExternalToken> getTokens() {
+ return tokens;
}
- public void setDevices(List<DeviceRegistration> devices) {
- this.devices = devices;
+ public void setTokens(List<ExternalToken> tokens) {
+ this.tokens = tokens;
}
}
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;
+ }
+}
diff --git a/juick-notifications/src/main/java/com/juick/components/Notifications.java b/juick-notifications/src/main/java/com/juick/components/Notifications.java
index f9d8870f..d160cdc4 100644
--- a/juick-notifications/src/main/java/com/juick/components/Notifications.java
+++ b/juick-notifications/src/main/java/com/juick/components/Notifications.java
@@ -19,7 +19,7 @@ package com.juick.components;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.android.gcm.server.*;
-import com.juick.DeviceRegistration;
+import com.juick.ExternalToken;
import com.juick.User;
import com.juick.formatters.PlainTextFormatter;
import com.turo.pushy.apns.ApnsClient;
@@ -103,8 +103,8 @@ public class Notifications implements NotificationClientListener, AutoCloseable
}
// GCM
- List<String> regids = users.stream().flatMap(u -> u.getDevices().stream()).filter(d -> d.getType().equals("gcm"))
- .map(DeviceRegistration::getToken).collect(Collectors.toList());
+ List<String> regids = users.stream().flatMap(u -> u.getTokens().stream()).filter(d -> d.getType().equals("gcm"))
+ .map(ExternalToken::getToken).collect(Collectors.toList());
if (!regids.isEmpty()) {
try {
String json = jsonMapper.writeValueAsString(jmsg);
@@ -134,8 +134,8 @@ public class Notifications implements NotificationClientListener, AutoCloseable
}
/*** WinPhone ***/
- List<String> urls = users.stream().flatMap(u -> u.getDevices().stream()).filter(d -> d.getType().equals("mpns"))
- .map(DeviceRegistration::getToken).collect(Collectors.toList());
+ List<String> urls = users.stream().flatMap(u -> u.getTokens().stream()).filter(d -> d.getType().equals("mpns"))
+ .map(ExternalToken::getToken).collect(Collectors.toList());
if (urls.isEmpty()) {
logger.info("WNS: no recipients");
@@ -170,8 +170,8 @@ public class Notifications implements NotificationClientListener, AutoCloseable
}
/*** iOS ***/
- List<String> tokens = users.stream().flatMap(u -> u.getDevices().stream()).filter(d -> d.getType().equals("apns"))
- .map(DeviceRegistration::getToken).collect(Collectors.toList());
+ List<String> tokens = users.stream().flatMap(u -> u.getTokens().stream()).filter(d -> d.getType().equals("apns"))
+ .map(ExternalToken::getToken).collect(Collectors.toList());
if (!tokens.isEmpty()) {
ApnsPayloadBuilder apnsPayloadBuilder = new ApnsPayloadBuilder();
String post = PlainTextFormatter.formatPost(jmsg);
diff --git a/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java b/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java
index 7b9a88a3..fce52987 100644
--- a/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java
+++ b/juick-notifications/src/main/java/com/juick/components/service/NotificationsTokenService.java
@@ -1,6 +1,6 @@
package com.juick.components.service;
-import com.juick.DeviceRegistration;
+import com.juick.ExternalToken;
import com.juick.service.BaseRestService;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
@@ -28,8 +28,8 @@ public class NotificationsTokenService extends BaseRestService implements TokenS
@Override
public void deleteTokens(String type, List<String> devices) {
if (devices.size() > 0) {
- List<DeviceRegistration> list = devices.stream()
- .map(d -> new DeviceRegistration(type, d)).collect(Collectors.toList());
+ List<ExternalToken> list = devices.stream()
+ .map(d -> new ExternalToken(null, null, type, d)).collect(Collectors.toList());
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
getRest().exchange("http://api.juick.com/notifications",
diff --git a/juick-server-core/build.gradle b/juick-server-core/build.gradle
index fa7883ba..83a02452 100644
--- a/juick-server-core/build.gradle
+++ b/juick-server-core/build.gradle
@@ -17,7 +17,6 @@ dependencies {
compile "rocks.xmpp:xmpp-extensions-client:0.7.4"
compile "javax.inject:javax.inject:1"
- compile 'com.google.code.findbugs:jsr305:3.0.2'
testCompile "junit:junit:${rootProject.junitVersion}"
testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
diff --git a/juick-server-core/src/main/java/com/juick/service/CrosspostService.java b/juick-server-core/src/main/java/com/juick/service/CrosspostService.java
index f491c797..2ece8305 100644
--- a/juick-server-core/src/main/java/com/juick/service/CrosspostService.java
+++ b/juick-server-core/src/main/java/com/juick/service/CrosspostService.java
@@ -17,9 +17,11 @@
package com.juick.service;
+import com.juick.ExternalToken;
import com.juick.server.helpers.ApplicationStatus;
import org.apache.commons.lang3.tuple.Pair;
+import javax.annotation.Nonnull;
import java.util.Optional;
/**
@@ -27,7 +29,7 @@ import java.util.Optional;
*/
public interface CrosspostService {
- Optional<Pair<String, String>> getTwitterTokens(int uid);
+ Optional<ExternalToken> getTwitterToken(int uid);
boolean deleteTwitterToken(Integer uid);
@@ -39,6 +41,7 @@ public interface CrosspostService {
void disableFBCrosspost(Integer uid);
+ @Nonnull
String getTwitterName(int uid);
String getTelegramName(int uid);
diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index a9da3dff..895b36f1 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -21,7 +21,6 @@ dependencies {
providedCompile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}"
providedCompile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}"
- compile "org.apache.httpcomponents:httpclient:4.5.3"
providedCompile "org.apache.commons:commons-lang3:3.6"
providedCompile "org.apache.commons:commons-collections4:4.1"
providedCompile "org.apache.commons:commons-text:1.1"
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java
index afa23059..dec8db5b 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/CrosspostServiceImpl.java
@@ -17,6 +17,7 @@
package com.juick.service;
+import com.juick.ExternalToken;
import com.juick.server.helpers.ApplicationStatus;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
@@ -42,14 +43,15 @@ public class CrosspostServiceImpl extends BaseJdbcService implements CrosspostSe
@Transactional(readOnly = true)
@Override
- public Optional<Pair<String, String>> getTwitterTokens(final int uid) {
- List<Optional<Pair<String, String>>> list = getJdbcTemplate().query(
- "SELECT access_token,access_token_secret FROM twitter WHERE user_id = ? AND crosspost = 1",
- (rs, num) -> Optional.of(Pair.of(rs.getString(1), rs.getString(2))),
+ public Optional<ExternalToken> getTwitterToken(final int uid) {
+ List<ExternalToken> list = getJdbcTemplate().query(
+ "SELECT uname, access_token, access_token_secret FROM twitter WHERE user_id = ? AND crosspost = 1",
+ (rs, num) -> new ExternalToken(rs.getString(1), "twitter",
+ rs.getString(2), rs.getString(3)),
uid);
return list.isEmpty() ?
- Optional.empty() : list.get(0);
+ Optional.empty() : Optional.of(list.get(0));
}
@Transactional
diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
index a87c7136..2de6a2ad 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
@@ -180,7 +180,7 @@ public class NewMessage {
model.addAttribute("url", "http://juick.com/" + mid);
- if (!crosspostService.getTwitterTokens(visitor.getUid()).isPresent()) {
+ if (!crosspostService.getTwitterToken(visitor.getUid()).isPresent()) {
String sharetwi = hashtags + " " + body;
if (sharetwi.length() > 115) {
sharetwi = sharetwi.substring(0, 114) + "…";