Added check for existing webhooks certificate and removed private cer…

…t property as unnesessary
givip · Aug 20, 2018 · b282140 · b282140
1 parent 7d22b1a
commit b282140
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Sources/EchoBot/main.swift b/Sources/EchoBot/main.swift
@@ -14,7 +14,6 @@ var settings = Bot.Settings(token: token)
 //settings.webhooksUrl = Enviroment.get("TELEGRAM_BOT_WEBHOOK_URL")!
 //settings.webhooksPort = Int(Enviroment.get("TELEGRAM_BOT_PORT")!)!
 //settings.webhooksPublicCert = Enviroment.get("TELEGRAM_BOT_PUBLIC_KEY")!
-//settings.webhooksPrivateKey = Enviroment.get("TELEGRAM_BOT_PRIVATE_KEY")!
 
 let bot = try! Bot(settings: settings)
 

diff --git a/Sources/HelloBot/main.swift b/Sources/HelloBot/main.swift
@@ -13,7 +13,6 @@ var settings = Bot.Settings(token: token, debugMode: true)
 //settings.webhooksUrl = Enviroment.get("TELEGRAM_BOT_WEBHOOK_URL")!
 //settings.webhooksPort = Int(Enviroment.get("TELEGRAM_BOT_PORT")!)!
 //settings.webhooksPublicCert = Enviroment.get("TELEGRAM_BOT_PUBLIC_KEY")!
-//settings.webhooksPrivateKey = Enviroment.get("TELEGRAM_BOT_PRIVATE_KEY")!
 
 let bot = try! Bot(settings: settings)
 

diff --git a/Sources/Telegrammer/Bot/Bot.swift b/Sources/Telegrammer/Bot/Bot.swift
@@ -22,7 +22,6 @@ public final class Bot {
         public var webhooksUrl: String? = nil
         public var webhooksPort: Int? = nil
         public var webhooksPublicCert: String? = nil
-        public var webhooksPrivateKey: String? = nil
 
         public init(token: String, debugMode: Bool = true) {
             self.token = token

diff --git a/Sources/Telegrammer/Network/Webhooks.swift b/Sources/Telegrammer/Network/Webhooks.swift
@@ -34,19 +34,22 @@ class Webhooks: Connection {
     public func start() throws -> Future<Void> {
         guard let ip = bot.settings.webhooksIp,
             let url = bot.settings.webhooksUrl,
-            let port = bot.settings.webhooksPort,
-            let publicCert = bot.settings.webhooksPublicCert else {
+            let port = bot.settings.webhooksPort else {
                 throw CoreError(identifier: "Webhooks",
                                 reason: "Initialization parameters wasn't found in enviroment variables")
         }
 
-        guard let fileHandle = FileHandle(forReadingAtPath: publicCert) else {
-            let errorDescription = "Public key '\(publicCert)' for HTTPS server wasn't found"
-            Log.error(errorDescription)
-            throw CoreError(identifier: "FileIO", reason: errorDescription)
+        var cert: InputFile? = nil
+
+        if let publicCert = bot.settings.webhooksPublicCert {
+            guard let fileHandle = FileHandle(forReadingAtPath: publicCert) else {
+                let errorDescription = "Public key '\(publicCert)' was specified for HTTPS server, but wasn't found"
+                Log.error(errorDescription)
+                throw CoreError(identifier: "FileIO", reason: errorDescription)
+            }
+            cert = InputFile(data: fileHandle.readDataToEndOfFile(), filename: publicCert)
         }
 
-        let cert = InputFile(data: fileHandle.readDataToEndOfFile(), filename: publicCert)
         let params = Bot.SetWebhookParams(url: url, certificate: cert, maxConnections: maxConnections, allowedUpdates: nil)
         return try bot.setWebhook(params: params).flatMap { (success) -> Future<Void> in
             Log.info("setWebhook request result: \(success)")