Bug Fixes, Fixed Docker

Sources/Server/Middleware/AuthenicationMiddleware.swift

@@ -60,7 +60,7 @@ extension Request {
             guard Date() < tokenExpiration else { return nil }
             guard let userId = accessToken["userId"] as? ObjectId else { return nil }
             storage["userId"] = userId
-            return accessToken["userId"] as? ObjectId
+            return userId
         } catch {
             return nil
         }

Sources/Server/Models/AccessToken.swift

@@ -68,6 +68,7 @@ struct AccessToken {
         let token = try String.tokenEncoded()
         let tokenHash = try Application.makeHash(token)
         accessToken["tokenExpires"] = Date(timeIntervalSinceNow: AccessToken.expiresIn)
+        accessToken["endOfLife"] = Date(timeIntervalSinceNow: 1210000 + AccessToken.expiresIn)
         accessToken["token"] = tokenHash
         try AccessToken.collection.update("_id" == accessTokenId, to: accessToken)
 

Sources/Server/Models/Admin.swift

@@ -74,7 +74,7 @@ struct Admin {
             return document["notificationEmail"] as? String ?? Constants.defaultEmail
         }
         set {
-            document["adminEmail"] = newValue
+            document["notificationEmail"] = newValue
         }
     }
 

Sources/Server/Providers/MongoProvider.swift

@@ -38,8 +38,8 @@ final class MongoProvider: Vapor.Provider {
 
         let host = mongo["host"]?.string ?? "localhost"
         let port = mongo["port"]?.int ?? 27017
-        if let user = mongo["user"]?.string?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed), user.characters.count > 0 {
-            if let password = mongo["password"]?.string?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed), password.characters.count > 0 {
+        if let user = mongo["user"]?.string?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed), user.isEmpty == false {
+            if let password = mongo["password"]?.string?.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed), password.isEmpty == false {
                 server = try Server("mongodb://\(user):\(password)@\(host):\(port)")
             } else {
                 server = try Server("mongodb://\(user)@\(host):\(port)")

Sources/Server/Routes/User+Routes.swift

@@ -19,7 +19,7 @@ extension User {
         let protected = group.grouped([authenticationMiddleware])
 
         // MARK: Get Users
-        group.get { request in
+        protected.get { request in
             let skip = request.data["skip"]?.int ?? 0
             let limit = min(100, request.data["limit"]?.int ?? 100)
             let documents = try User.collection.find(sortedBy: ["email": .ascending], projecting: [

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - ./Database/configdb:/data/configdb
       - ./Database/db:/data/db
   vapor:
-    image: chandlerhuff/vapor:latest
+    image: bludesign/vapor:latest
     restart: always
     ports:
       - "8080:8080"