Update to Perfect 3 / Swift 4

Author: iamjono

.gitignore

@@ -69,4 +69,6 @@ Package.swift.orig
 .build_lin
 .packages_lin
 SessionDB
-StORMlog.txt
+StORMlog.txt
+Package.resolved
+PADockerfile_build

Package.swift

@@ -1,11 +1,11 @@
 // Generated automatically by Perfect Assistant Application
-// Date: 2017-01-12 21:53:58 +0000
+// Date: 2017-10-04 16:34:35 +0000
 import PackageDescription
 let package = Package(
-    name: "Perfect-Session-SQLite-Demo",
-    targets: [],
-    dependencies: [
-        .Package(url: "https://github.com/PerfectlySoft/Perfect-Session-SQLite.git", majorVersion: 1),
-        .Package(url: "https://github.com/PerfectlySoft/Perfect-HTTPServer.git", majorVersion: 2),
-    ]
+	name: "Perfect-Session-SQLite-Demo",
+	targets: [],
+	dependencies: [
+		.Package(url: "https://github.com/PerfectlySoft/Perfect-Session-SQLite.git", majorVersion: 3),
+		.Package(url: "https://github.com/PerfectlySoft/Perfect-HTTPServer.git", majorVersion: 3),
+	]
 )

Sources/Handlers.swift

@@ -10,25 +10,20 @@
 import PerfectLib
 import PerfectHTTP
 import PerfectSession
-import TurnstileCrypto
 
 public class WebHandlers {
 	/* =================================================================================================================
 	Index
 	================================================================================================================= */
 	open static func indexHandlerGet(request: HTTPRequest, _ response: HTTPResponse) {
 
-		let rand = URandom()
-
-		request.session.data[rand.secureToken] = rand.secureToken
-
 		var dump = ""
 		do {
-			dump = try request.session.data.jsonEncodedString()
+			dump = (try request.session?.data.jsonEncodedString()) ?? ""
 		} catch {
 			dump = "\(error)"
 		}
-		var body = "<p>Your Session ID is: <code>\(request.session.token)</code></p><p>Session data: <code>\(dump)</code></p>"
+		var body = "<p>Your Session ID is: <code>\(request.session?.token ?? "")</code></p><p>Session data: <code>\(dump)</code></p>"
 		body += "<p><a href=\"/withcsrf\">CSRF Test Form</a></p>"
 		body += "<p><a href=\"/nocsrf\">No CSRF Test Form</a></p>"
 
@@ -44,7 +39,7 @@ public class WebHandlers {
 	open static func CORSHandlerGet(request: HTTPRequest, _ response: HTTPResponse) {
 
 		response.addHeader(.contentType, value: "application/json")
-		try? response.setBody(json: ["Success":"CORS Request"])
+		let _ = try? response.setBody(json: ["Success":"CORS Request"])
 		response.completed()
 
 	}
@@ -57,7 +52,7 @@ public class WebHandlers {
 	================================================================================================================= */
 	open static func formNoCSRF(request: HTTPRequest, _ response: HTTPResponse) {
 
-		var body = "<p>Your Session ID is: <code>\(request.session.token)</code></p><form method=\"POST\" action=\"?\" enctype=\"multipart/form-data\">"
+		var body = "<p>Your Session ID is: <code>\(request.session?.token ?? "")</code></p><form method=\"POST\" action=\"?\" enctype=\"multipart/form-data\">"
 		body += "<p>No CSRF Form</p>"
 		body += "<p>NOTE: You should get a failed request because there is no CSRF</p>"
 		body += "<p><input type=\"text\" name=\"testing\" value=\"testing123\"></p>"
@@ -72,8 +67,8 @@ public class WebHandlers {
 	formWithCSRF
 	================================================================================================================= */
 	open static func formWithCSRF(request: HTTPRequest, _ response: HTTPResponse) {
-		let t = request.session.data["csrf"] as? String ?? ""
-		var body = "<p>Your Session ID is: <code>\(request.session.token)</code></p><form method=\"POST\" action=\"?\" enctype=\"multipart/form-data\">"
+		let t = request.session?.data["csrf"] as? String ?? ""
+		var body = "<p>Your Session ID is: <code>\(request.session?.token ?? "")</code></p><form method=\"POST\" action=\"?\" enctype=\"multipart/form-data\">"
 		body += "<p>CSRF Form</p>"
 		body += "<p><input type=\"text\" name=\"testing\" value=\"testing123\"></p>"
 		body += "<p><input type=\"text\" name=\"_csrf\" value=\"\(t)\"></p>"
@@ -88,8 +83,7 @@ public class WebHandlers {
 	formReceive
 	================================================================================================================= */
 	open static func formReceive(request: HTTPRequest, _ response: HTTPResponse) {
-		//		print("in formReceive")
-		var body = "<p>Your Session ID is: <code>\(request.session.token)</code></p>"
+		var body = "<p>Your Session ID is: <code>\(request.session?.token ?? "")</code></p>"
 		body += "<p>CSRF Test response</p>"
 		body += "<p>Params: \(request.postParams)</p>"
 		response.setBody(string: header+body+footer)