Use Droplet.log for logging

Author: a2

Sources/App/Collections/VanityCollection.swift

@@ -23,12 +23,14 @@ private extension Field {
 final class VanityCollection: RouteCollection {
     typealias Wrapped = HTTP.Responder
 
+    let droplet: Droplet
     let apns: VaporAPNS
     let updatePassword: String?
-    
-    init(apns: VaporAPNS, updatePassword: String?) {
-        self.apns = apns
-        self.updatePassword = updatePassword
+
+    init(droplet: Droplet) {
+        self.droplet = droplet
+        self.apns = try! droplet.vaporAPNS()
+        self.updatePassword = try! drop.config.extract("app", "updatePassword") as String?
     }
 
     func isAuthenticated(request: Request) -> Bool {

Sources/App/Collections/WalletCollection.swift

@@ -4,10 +4,13 @@ import Routing
 import Storage
 import Vapor
 
-final class WalletCollection: RouteCollection, EmptyInitializable {
+final class WalletCollection: RouteCollection {
     typealias Wrapped = HTTP.Responder
 
-    init() {
+    let droplet: Droplet
+
+    init(droplet: Droplet) {
+        self.droplet = droplet
     }
 
     func findPass(passTypeIdentifier: String, serialNumber: String) throws -> Pass? {
@@ -86,7 +89,7 @@ final class WalletCollection: RouteCollection, EmptyInitializable {
 
     func log(messages: [String]) {
         for message in messages {
-            print(message)
+            droplet.log.info(message)
         }
     }
 

Sources/App/Database.swift

@@ -0,0 +1,17 @@
+import FluentPostgreSQL
+import Vapor
+
+extension Droplet {
+    func postgresDatabase() -> Database {
+        let postgresConfig = config["database", "postgres"]
+
+        let host = postgresConfig?["host"]?.string ?? "localhost"
+        let port = postgresConfig?["port"]?.int ?? 5432
+        let dbname = postgresConfig?["dbname"]?.string ?? "passcards"
+        let user = postgresConfig?["user"]?.string ?? ""
+        let password = postgresConfig?["password"]?.string ?? ""
+
+        let postgres = PostgreSQLDriver(host: host, port: port, dbname: dbname, user: user, password: password)
+        return Database(postgres)
+    }
+}

Sources/App/Droplet+Database.swift

@@ -0,0 +1,18 @@
+import Vapor
+import VaporAPNS
+
+extension Droplet {
+    func vaporAPNS() throws -> VaporAPNS {
+        let apns = try config.extract("app", "apns") as Config
+        let topic = try apns.extract("topic") as String
+        let teamID = try apns.extract("teamID") as String
+        let keyID = try apns.extract("keyID") as String
+        let rawPrivateKey = try apns.extract("privateKey") as String
+        guard let (privateKey, publicKey) = ECKeys(from: rawPrivateKey) else {
+            throw TokenError.invalidAuthKey
+        }
+
+        let options = try Options(topic: topic, teamId: teamID, keyId: keyID, rawPrivKey: privateKey, rawPubKey: publicKey)
+        return try VaporAPNS(options: options)
+    }
+}

Sources/App/Droplet+VaporAPNS.swift

@@ -3,16 +3,13 @@ import Storage
 import Vapor
 
 let drop = Droplet()
-drop.database = database(for: drop)
+drop.database = drop.postgresDatabase()
 drop.preparations = [Pass.self, Registration.self]
 
 try drop.addProvider(StorageProvider.self)
 
-drop.collection(WalletCollection.self)
-
-let apns = try vaporAPNS(for: drop)
-let updatePassword = try drop.config.extract("app", "updatePassword") as String?
-drop.collection(VanityCollection(apns: apns, updatePassword: updatePassword))
+drop.collection(WalletCollection(droplet: drop))
+drop.collection(VanityCollection(droplet: drop))
 
 drop.get { req in
     return try drop.view.make("welcome")