wip: improve website location, refactor auth

Author: erikbdev

Sources/App/Middlewares/SiteMiddleware.swift

@@ -29,14 +29,14 @@ struct SiteMiddleware<Context: RequestContext>: RouterController {
         case .api(.activity(.all)):
           return try JSONEncoder().encode(self.activityClient.activity(), from: req, context: ctx)
         case let .api(.activity(.location(location))):
-          guard let auth = req.headers[.authorization].flatMap({ try? Auth.parser.parse($0) }) else {
+          guard let auth = req.headers.authorization else {
             throw HTTPError(.notFound)
           }
           try auth.validate()
           self.activityClient.updateLocation(location)
           return Response(status: .ok)
         case let .api(.activity(.nowPlaying(nowPlaying))):
-          guard let auth = req.headers[.authorization].flatMap({ try? Auth.parser.parse($0) }) else {
+          guard let auth = req.headers.authorization else {
             throw HTTPError(.notFound)
           }
           try auth.validate()

Sources/App/Utils/Auth.swift

@@ -3,40 +3,7 @@ import Foundation
 import Dependencies
 import Parsing
 
-enum Auth: Sendable, Equatable {
-  /// Token
-  case bearer(String)
-
-  /// base64-encoded credentials
-  case basic(String, String)
-
-  /// sha256-algorithm
-  case digest(String)
-
-  static var parser: some Parser<Substring, Auth> {
-    OneOf {
-      Parse(.case(Auth.bearer)) {
-        "Bearer "
-        Rest().map(.string)
-      }
-
-      Parse(.case(Auth.basic)) {
-        "Basic "
-
-        Rest().map(Base64SubstringToSubstring()).pipe {
-          Prefix { $0 != ":" }.map(.string)
-          ":"
-          Rest().map(.string)
-        }
-      }
-
-      Parse(.case(Auth.digest)) {
-        "Digest "
-        Rest().map(.string)
-      }
-    }
-  }
-
+extension HTTPFields.Authorization {
   func validate() throws {
     @Dependency(\.envVar) var env
     switch self {
@@ -47,22 +14,4 @@ enum Auth: Sendable, Equatable {
     default: throw HTTPError(.notFound)
     }
   }
-}
-
-struct Base64SubstringToSubstring: Conversion {
-  @usableFromInline
-  init() {}
-
-  @inlinable
-  func apply(_ input: Substring) -> Substring {
-    Data(base64Encoded: String(input)).flatMap {
-      String(data: $0, encoding: .utf8)?[...]
-    } ?? ""
-  }
-
-  @inlinable
-  func unapply(_ output: Substring) -> Substring {
-    output.data(using: .utf8)?
-      .base64EncodedString()[...] ?? ""
-  }
 }

Sources/Pages/HomePage.swift

@@ -11,32 +11,38 @@ public struct HomePage: Page {
     let svgIcon = Class(module: "svgIcon")
 
     var body: some Rule {
-      container => {
-        Display(.flex)
-        Background("#1c1c1c")
-        Color(.white)
-        // AnyProperty("justify-self", "center")
+      Pseudo(class: .root) => { 
+        Variable("pico-background-color", value: "#1c1c1c")
       }
 
-      container > Class("main") => {
+      // self.container => {
+      //   Display(.flex)
+      //   Background("#1c1c1c")
+      //   Color(.white)
+      //   // AnyProperty("justify-self", "center")
+      // }
+
+      // self.container > Class("main") => {
         // Width(.full)
         // Height(.full)
 
         // Media(maxWidth: 2xl) => {
         //   MaxWidth(.rem(20))
         // }
-      }
-
-      // .svg-icon {
-      //   display: inline-block;
-      //   vertical-align: middle;
-      //   position: relative;
-      //   bottom: 0.125em;
-      //   height: 1em;
-      //   width: 1em;
       // }
-      svgIcon => {
+
+      self.svgIcon => {
         Display(.inlineBlock)
+        AnyProperty("vertical-align", "middle")
+        AnyProperty("position", "relative")
+        AnyProperty("bottom", "0.125em")
+        AnyProperty("width", "1em")
+        AnyProperty("height", "1em")
+        AnyProperty("margin-right", "0.25rem")
+      }
+
+      Class("reversed") => {
+        AnyProperty("scale", "calc(100% * -1) 100%")
       }
     }
   }
@@ -64,77 +70,76 @@ public struct HomePage: Page {
         meta(.charset(.utf8))
         meta(name: .viewport, content: "width=device-width, initial-scale=1.0")
         link(.rel(.stylesheet), .href("https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css"))
-        // style(styling)
+        style(styling)
         // script(.src("https://cdn.jsdelivr.net/npm/alpinejs@3.14.8/dist/cdn.min.js"), .defer) {}
       }
-      body {
-        main(.class("container")) {
-          section(.class("p-8 pb-8"), .ariaLabel("About")) {
-            h1(.class("font-bold")) { "Erik Bautista Santibanez" }
-            p(.class("opacity-70")) { "Swift & Web Developer" }
+      body(.class("container")) {
+        header(.ariaLabel("About")) {
+          hgroup {
+            h1 { "Erik Bautista Santibanez" }
+            p { "Swift & Web Developer" }
 
             let location = self.activityClient.location()
             let residency = location?.residency ?? .default
 
-            p(.ariaLabel("Residency")) {
-              svg(.xmlns(), .fill("currentColor"), .viewBox("0 0 256 256"), .class("opacity-70 svg-icon mr-1"), .ariaLabel("Map pin icon")) {
+            p(.ariaLabel("Location")) {
+              svg(.xmlns(), .fill("currentColor"), .viewBox("0 0 256 256"), .ariaLabel("Map pin icon"), .class(styling.svgIcon)) {
                 path(
                   .d("M128,64a40,40,0,1,0,40,40A40,40,0,0,0,128,64Zm0,64a24,24,0,1,1,24-24A24,24,0,0,1,128,128Zm0-112a88.1,88.1,0,0,0-88,88c0,31.4,14.51,64.68,42,96.25a254.19,254.19,0,0,0,41.45,38.3,8,8,0,0,0,9.18,0A254.19,254.19,0,0,0,174,200.25c27.45-31.57,42-64.85,42-96.25A88.1,88.1,0,0,0,128,16Zm0,206c-16.53-13-72-60.75-72-118a72,72,0,0,1,144,0C200,161.23,144.53,209,128,222Z")
                 )
               }
 
               "\(residency)"
-            }
 
-            if let location, location.city != residency.city || location.state != residency.state {
-              p(.ariaLabel("Location"), .class("italic pt-1")) {
-                svg(.xmlns(), .fill("currentColor"), .viewBox("0 0 256 256"), .class("-scale-x-100 svg-icon mr-1"), .ariaLabel("Navigation icon")) {
+              if let location, location.city != residency.city || location.state != residency.state {
+                " \u{2022} "
+                svg(.xmlns(), .fill("currentColor"), .viewBox("0 0 256 256"), .class(styling.svgIcon), .class("reversed"), .ariaLabel("Navigation icon")) {
                   path(.d("M234.35,129,152,152,129,234.35a8,8,0,0,1-15.21.27l-65.28-176A8,8,0,0,1,58.63,48.46l176,65.28A8,8,0,0,1,234.35,129Z"))
                   path(.d("M237.33,106.21,61.41,41l-.16-.05A16,16,0,0,0,40.9,61.25a1,1,0,0,0,.05.16l65.26,175.92A15.77,15.77,0,0,0,121.28,248h.3a15.77,15.77,0,0,0,15-11.29l.06-.2,21.84-78,78-21.84.2-.06a16,16,0,0,0,.62-30.38ZM149.84,144.3a8,8,0,0,0-5.54,5.54L121.3,232l-.06-.17L56,56l175.82,65.22.16.06Z"))
                 }
 
-                span(.class("opacity-60")) { "Currently in " }
+                span { "Currently in " }
                 [location.city, location.state, location.region == "United States" ? nil : location.region]
                   .compactMap(\.self)
                   .joined(separator: ", ")
               }
             }
           }
-
-          section(.class("px-8 pb-8"), .ariaLabel("Experience")) {
-            h1(.class("font-bold")) { "Experience" }
+        }
+        main {
+          section(.ariaLabel("Experience")) {
+            h3 { "Experience" }
           }
 
-          section(.class("px-8 pb-8"), .ariaLabel("Projects")) {
-            h1(.class("font-bold")) { "Projects" }
+          section(.ariaLabel("Projects")) {
+            h3 { "Projects" }
           }
 
-          section(.class("px-8 pb-8"), .ariaLabel("Education")) {
-            h1(.class("font-bold")) { "Education" }
-            div(.class("flex flex-col md:flex-row")) {
-              div(.class("flex-1")) {
-                h2(.class("font-medium")) {
-                  a(.target(.blank), .rel("noopener noreferrer"), .href("https://stedwards.edu/")) { 
-                    "St. Edward's University" 
+          section(.ariaLabel("Education")) {
+            h3 { "Education" }
+            div {
+              div {
+                h6 {
+                  a(.target(.blank), .rel("noopener noreferrer"), .href("https://stedwards.edu/")) {
+                    "St. Edward's University"
                   }
                 }
-                p(.class("opacity-80")) { "Bachelor of Science in Computer Science" }
+                p { "Bachelor of Science in Computer Science" }
               }
 
-              p(.class("md:self-baseline opacity-80")) { "2018-2023" }
+              p { "2018-2023" }
             }
           }
-
-          footer(.class("px-8 pb-16 text-xs opacity-70"), .ariaLabel("Credits")) {
-            hr(.class("pb-6 border-top border-neutral-600"))
-            p(.class("px-6 text-center")) {  "©\(self.year) Erik Bautista Santibanez" }
-            p(.class("pt-2 px-6 text-center")) { 
-              "Made with \u{2764} using "
-              a(.target(.blank), .rel("noopener noreferrer"), .href("https://swift.org")) { "Swift" }
-              " + "
-              a(.target(.blank), .rel("noopener noreferrer"), .href("https://hummingbird.codes")) { "Hummingbird" }
-              "."
-            }
+        }
+        footer(.ariaLabel("Credits")) {
+          hr()
+          p { "©\(self.year) Erik Bautista Santibanez" }
+          p {
+            "Made with \u{2764} using "
+            a(.target(.blank), .rel("noopener noreferrer"), .href("https://swift.org")) { "Swift" }
+            " + "
+            a(.target(.blank), .rel("noopener noreferrer"), .href("https://hummingbird.codes")) { "Hummingbird" }
+            "."
           }
         }
       }
@@ -144,7 +149,7 @@ public struct HomePage: Page {
 
 // private enum PackageTheme: Theme {
 //   static var className: String? { "swift-package-code-block" }
-// 
+//
 //   static func style(for tokenSyntax: TokenSyntax) -> [Token] {
 //     switch tokenSyntax.tokenKind {
 //     case .keyword: [Token("\(tokenSyntax)", className: "text-blue-400")]

Sources/Routes/Utils/URLRequestData+Hummingbird.swift

@@ -3,6 +3,7 @@ import struct Hummingbird.Request
 import struct HTTPTypes.HTTPFields
 import struct Foundation.Data
 import struct NIO.ByteBuffer
+import Parsing
 
 public extension URLRequestData {
   init(request: Hummingbird.Request) async {
@@ -16,11 +17,13 @@ public extension URLRequestData {
       body = nil
     }
 
+    let authorization = request.headers.basicAuthorization
+
     self.init(
       method: request.method.rawValue,
       scheme: request.uri.scheme?.rawValue,
-      user: request.headers.basicAuthorization?.0,
-      password: request.headers.basicAuthorization?.1,
+      user: authorization?.0,
+      password: authorization?.1,
       host: request.uri.host,
       port: request.uri.port,
       path: request.uri.path,
@@ -46,27 +49,83 @@ public extension URLRequestData {
 
 extension HTTPFields {
   public var basicAuthorization: (String, String)? {
+    if case let .basic(username, password) = self.authorization {
+      return (username, password)
+    } else {
+      return nil
+    }
+  }
+
+  public var authorization: Authorization? {
     if let string = self[.authorization] {
-      let headerParts = string
-        .split(separator: " ", maxSplits: 1, omittingEmptySubsequences: false)
+      try? Authorization.parser.parse(string)
+    } else {
+      nil
+    }
+  }
 
-      guard headerParts.count == 2 else {
-        return nil
-      }
-      guard headerParts[0].lowercased() == "basic" else {
-        return nil
-      }
-      guard let decodedToken = Data(base64Encoded: String(headerParts[1])) else {
-        return nil
-      }
-      let parts = String(decoding: decodedToken, as: UTF8.self)
-        .split(separator: ":", maxSplits: 1, omittingEmptySubsequences: false)
-      guard parts.count == 2 else {
-        return nil
+  public enum Authorization: Sendable, Equatable {
+    /// Token
+    case bearer(String)
+
+    /// base64-encoded credentials
+    case basic(String, String)
+
+    /// sha256-algorithm
+    case digest(String)
+
+    static var parser: some Parser<Substring, Self> {
+      OneOf {
+        Parse(.case(Self.bearer)) {
+          OneOf { 
+            "Bearer"
+            "bearer"
+          }
+          " "
+          Rest().map(.string)
+        }
+
+        Parse(.case(Self.basic)) {
+          OneOf {
+            "Basic"
+            "basic"
+          }
+          " "
+
+          Rest().map(Base64EncodedSubstringToSubstring()).pipe {
+            Prefix { $0 != ":" }.map(.string)
+            ":"
+            Rest().map(.string)
+          }
+        }
+
+        Parse(.case(Self.digest)) {
+          OneOf {
+            "Digest"
+            "digest"
+          }
+          " "
+          Rest().map(.string)
+        }
       }
-      return (String(parts[0]), String(parts[1]))
-    } else {
-      return nil
     }
   }
 }
+
+private struct Base64EncodedSubstringToSubstring: Conversion {
+  @usableFromInline
+  init() {}
+
+  @inlinable
+  func apply(_ input: Substring) -> Substring {
+    Data(base64Encoded: String(input)).flatMap {
+      String(decoding: $0, as: UTF8.self)[...]
+    } ?? ""
+  }
+
+  @inlinable
+  func unapply(_ output: Substring) -> Substring {
+    output.data(using: .utf8)?
+      .base64EncodedString()[...] ?? ""
+  }
+}