Merge pull request #12 from vapor/template

only set session if id not equal

Author: tanner0101

Sources/AuthProvider/SessionPersistable.swift

@@ -15,7 +15,10 @@ private let sessionEntityId = "session-entity-id"
 
 extension SessionPersistable where Self: Entity {
     public func persist(for req: Request) throws {
-        try req.assertSession().data.set(sessionEntityId, id)
+        let session = try req.assertSession()
+        if session.data[sessionEntityId]?.wrapped != id?.wrapped {
+            try req.assertSession().data.set(sessionEntityId, id)
+        }
     }
 
     public func unpersist(for req: Request) throws {

Tests/AuthProviderTests/TokenTests.swift

@@ -12,10 +12,6 @@ class TokenTests: XCTestCase {
         let memory = try! MemoryDriver()
         let database = Database(memory)
 
-        database.log = { query in
-            print(query)
-        }
-        
         TestToken.database = database
         TestUser.database = database
 
@@ -80,6 +76,7 @@ extension TokenTests {
 // After that, the cookie can act as a login persister
 
 import Sessions
+import Cookies
 
 extension TokenTests {
 
@@ -96,7 +93,7 @@ extension TokenTests {
         }, name: "persist")
 
         config.addConfigurable(middleware: { config in
-            TokenAuthenticationMiddleware(TestUser.self)
+            return TokenAuthenticationMiddleware(TestUser.self)
         }, name: "token")
 
         let drop = try Droplet(config)
@@ -124,8 +121,9 @@ extension TokenTests {
         let req2 = Request(.get, "name")
         req2.cookies["vapor-session"] = cookie
         let res2 = try drop.respond(to: req2)
+        XCTAssertEqual(res2.cookies.array.count, 0)
 
-        XCTAssertEqual(res2.body.bytes?.makeString(), cookie)
+        XCTAssertEqual(res2.body.bytes?.makeString(), "Bob")
     }
 }
 

Tests/AuthProviderTests/Utilities/TestUser.swift

@@ -57,13 +57,4 @@ extension Request {
 
 // MARK: Sessions
 
-extension TestUser: SessionPersistable {
-    public static func fetchPersisted(for req: Request) throws -> Self? {
-        // take the cookie and set it as the user's
-        // name for easy verification
-        guard let cookie = req.cookies["vapor-session"] else {
-            return nil
-        }
-        return self.init(name: cookie)
-    }
-}
+extension TestUser: SessionPersistable {}