From 15753b2ebdac2ab49cf5682c417851a0653e136e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 25 Sep 2018 12:49:57 +0300
Subject: notifications server refactoring

---
 .../configuration/APNSConfiguration.java           | 26 +++++-----------------
 1 file changed, 5 insertions(+), 21 deletions(-)

(limited to 'juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java')

diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java
index 43ea3943..fbc17bc9 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/APNSConfiguration.java
@@ -1,34 +1,18 @@
 package com.juick.components.configuration;
 
-import com.turo.pushy.apns.ApnsClient;
-import com.turo.pushy.apns.ApnsClientBuilder;
-import com.turo.pushy.apns.auth.ApnsSigningKey;
-import org.springframework.beans.factory.annotation.Value;
+import com.juick.components.APNSManager;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.io.File;
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
 /**
  * Created by vital on 28.03.2017.
  */
 @Configuration
+@ConditionalOnProperty(name = "ios_p8_key")
 public class APNSConfiguration {
-    @Value("${ios_p8_key:}")
-    private String p8key;
-    @Value("${ios_team_id:}")
-    private String teamId;
-    @Value("${ios_key_id:}")
-    private String keyId;
     @Bean
-    public ApnsClient apns() throws NoSuchAlgorithmException, InvalidKeyException, IOException {
-        return new ApnsClientBuilder()
-                .setApnsServer(ApnsClientBuilder.PRODUCTION_APNS_HOST)
-                .setSigningKey(ApnsSigningKey.loadFromPkcs8File(new File(p8key),
-                        teamId, keyId))
-                .build();
+    public APNSManager apnsManager() {
+        return new APNSManager();
     }
 }
-- 
cgit v1.2.3