chapter 06 updated

Author: tib

Chapter 06/myProject/.gitignore

@@ -0,0 +1,77 @@
+# ================================
+# Build image
+# ================================
+FROM swift:5.7-jammy as build
+
+# Install OS updates and, if needed, sqlite3
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y\
+    && rm -rf /var/lib/apt/lists/*
+
+# Set up a build area
+WORKDIR /build
+
+# First just resolve dependencies.
+# This creates a cached layer that can be reused
+# as long as your Package.swift/Package.resolved
+# files do not change.
+COPY ./Package.* ./
+RUN swift package resolve
+
+# Copy entire repo into container
+COPY . .
+
+# Build everything, with optimizations
+RUN swift build -c release --static-swift-stdlib
+
+# Switch to the staging area
+WORKDIR /staging
+
+# Copy main executable to staging area
+RUN cp "$(swift build --package-path /build -c release --show-bin-path)/Run" ./
+
+# Copy resources bundled by SPM to staging area
+RUN find -L "$(swift build --package-path /build -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
+
+# Copy any resources from the public directory and views directory if the directories exist
+# Ensure that by default, neither the directory nor any of its contents are writable.
+RUN [ -d /build/Public ] && { mv /build/Public ./Public && chmod -R a-w ./Public; } || true
+RUN [ -d /build/Resources ] && { mv /build/Resources ./Resources && chmod -R a-w ./Resources; } || true
+
+# ================================
+# Run image
+# ================================
+FROM ubuntu:jammy
+
+# Make sure all system packages are up to date, and install only essential packages.
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
+    && apt-get -q update \
+    && apt-get -q dist-upgrade -y \
+    && apt-get -q install -y \
+      ca-certificates \
+      tzdata \
+# If your app or its dependencies import FoundationNetworking, also install `libcurl4`.
+      # libcurl4 \
+# If your app or its dependencies import FoundationXML, also install `libxml2`.
+      # libxml2 \
+    && rm -r /var/lib/apt/lists/*
+
+# Create a vapor user and group with /app as its home directory
+RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app vapor
+
+# Switch to the new home directory
+WORKDIR /app
+
+# Copy built executable and any staged resources from builder
+COPY --from=build --chown=vapor:vapor /staging /app
+
+# Ensure all further commands run as the vapor user
+USER vapor:vapor
+
+# Let Docker bind to port 8080
+EXPOSE 8080
+
+# Start the Vapor service when the image is run, default to listening on 8080 in production environment
+ENTRYPOINT ["./Run"]
+CMD ["serve", "--env", "production", "--hostname", "0.0.0.0", "--port", "8080"]

Chapter 06/myProject/Dockerfile

@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
@@ -7,10 +7,22 @@ let package = Package(
        .macOS(.v12)
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/vapor", from: "4.54.0"),
-        .package(url: "https://github.com/vapor/fluent", from: "4.4.0"),
-        .package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.1.0"),
-        .package(url: "https://github.com/binarybirds/swift-html", from: "1.2.0"),
+        .package(
+            url: "https://github.com/vapor/vapor",
+            from: "4.70.0"
+        ),
+        .package(
+            url: "https://github.com/vapor/fluent",
+            from: "4.4.0"
+        ),
+        .package(
+            url: "https://github.com/vapor/fluent-sqlite-driver",
+            from: "4.1.0"
+        ),
+        .package(
+            url: "https://github.com/binarybirds/swift-html",
+            from: "1.2.0"
+        ),
     ],
     targets: [
         .target(name: "App", dependencies: [

Chapter 06/myProject/Makefile

@@ -1,17 +1,14 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 
 public struct AuthenticatedUser {
+
     public let id: UUID
     public let email: String
 
-    public init(id: UUID, email: String) {
+    public init(
+        id: UUID,
+        email: String
+    ) {
         self.id = id
         self.email = email
     }
@@ -20,4 +17,3 @@ public struct AuthenticatedUser {
 extension AuthenticatedUser: SessionAuthenticatable {
     public var sessionID: UUID { id }
 }
-

Chapter 06/myProject/Package.swift

@@ -1,25 +1,24 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2021. 12. 31..
-//
-
 import Vapor
 import Fluent
 
-public protocol DatabaseModelInterface: Fluent.Model where Self.IDValue == UUID {
-    
+public protocol DatabaseModelInterface: Fluent.Model
+    where Self.IDValue == UUID
+{    
     associatedtype Module: ModuleInterface
 
     static var identifier: String { get }
 }
 
 public extension DatabaseModelInterface {
 
-    static var schema: String { Module.identifier + "_" + identifier }
+    static var schema: String {
+        Module.identifier + "_" + identifier
+    }
 
     static var identifier: String {
-        String(describing: self).dropFirst(Module.identifier.count).dropLast(5).lowercased() + "s"
+        String(describing: self)
+            .dropFirst(Module.identifier.count)
+            .dropLast(5)
+            .lowercased() + "s"
     }
 }

Chapter 06/myProject/Sources/App/Controllers/.gitkeep

@@ -1,33 +1,26 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 01. 01..
-//
-
 import Vapor
 
 open class AbstractForm: FormComponent {
-
+    
     open var action: FormAction
     open var fields: [FormComponent]
     open var error: String?
     open var submit: String?
 
-    public init(action: FormAction = .init(),
-                fields: [FormComponent] = [],
-                error: String? = nil,
-                submit: String? = nil) {
+    public init(
+        action: FormAction = .init(),
+        fields: [FormComponent] = [],
+        error: String? = nil,
+        submit: String? = nil
+    ) {
         self.action = action
         self.fields = fields
         self.error = error
         self.submit = submit
 
         self.action.enctype = .multipart
     }
-    
-    // MARK: - FromComponent
-    
+        
     open func load(req: Request) async throws {
         for field in fields {
             try await field.load(req: req)
@@ -67,9 +60,13 @@ open class AbstractForm: FormComponent {
     }
 
     open func render(req: Request) -> TemplateRepresentable {
-        FormTemplate(.init(action: action,
-                           fields: fields.map { $0.render(req: req)},
-                           error: error,
-                           submit: submit))
+        FormTemplate(
+            .init(
+                action: action,
+                fields: fields.map { $0.render(req: req)},
+                error: error,
+                submit: submit
+            )
+        )
     }
 }

Chapter 06/myProject/Sources/App/Framework/AuthenticatedUser.swift

@@ -1,60 +1,61 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 01. 01..
-//
-
 import Vapor
 
-open class AbstractFormField<Input: Decodable, Output: TemplateRepresentable>: FormComponent {
+open class AbstractFormField<
+    Input: Decodable,
+    Output: TemplateRepresentable
+>: FormComponent {
 
     public var key: String
     public var input: Input
     public var output: Output
     public var error: String?
 
-    public init(key: String, input: Input, output: Output, error: String? = nil) {
+    public init(
+        key: String,
+        input: Input,
+        output: Output,
+        error: String? = nil
+    ) {
         self.key = key
         self.input = input
         self.output = output
         self.error = error
     }
 
-    open func config(_ block: (AbstractFormField<Input, Output>) -> Void) -> Self {
+    open func config(
+        _ block: (AbstractFormField<Input, Output>) -> Void
+    ) -> Self {
         block(self)
         return self
     }
 
-    // MARK: - FormComponent
-    
-    open func load(req: Request) async throws {
+    open func load(req: Vapor.Request) async throws {
 
     }
 
-    open func process(req: Request) async throws {
+    open func process(req: Vapor.Request) async throws {
         if let value = try? req.content.get(Input.self, at: key) {
             input = value
         }
     }
 
-    open func validate(req: Request) async throws -> Bool {
+    open func validate(req: Vapor.Request) async throws -> Bool {
         true
     }
 
-    open func write(req: Request) async throws {
+    open func write(req: Vapor.Request) async throws {
 
     }
 
-    open func save(req: Request) async throws {
+    open func save(req: Vapor.Request) async throws {
 
     }
 
-    open func read(req: Request) async throws {
+    open func read(req: Vapor.Request) async throws {
 
     }
 
-    open func render(req: Request) -> TemplateRepresentable {
+    open func render(req: Vapor.Request) -> TemplateRepresentable {
         output
     }
 }

Chapter 06/myProject/Sources/App/Framework/DatabaseModelInterface.swift

@@ -1,25 +1,17 @@
-//
-//  File.swift
-//  
-//
-//  Created by Tibor Bodecs on 2022. 01. 01..
-//
-
-import Vapor
-
-public final class InputField: AbstractFormField<String, InputFieldTemplate> {
+public final class InputField: AbstractFormField<
+    String,
+    InputFieldTemplate
+> {
 
     public convenience init(_ key: String) {
-        self.init(key: key, input: "", output: .init(.init(key: key)))
-    }
-
-    public override func process(req: Request) async throws {
-        try await super.process(req: req)
-        output.context.value = input
-    }
-
-    public override func render(req: Request) -> TemplateRepresentable {
-        output.context.error = error
-        return super.render(req: req)
+        self.init(
+            key: key,
+            input: "",
+            output: .init(
+                .init(
+                    key: key
+                )
+            )
+        )
     }
 }