diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate index 6c9c938..59ef2bd 100644 Binary files a/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate and b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist index f5003f8..6ae6056 100644 --- a/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist @@ -10,5 +10,18 @@ 0 + SuppressBuildableAutocreation + + App + + primary + + + AppTests + + primary + + + diff --git a/Package.swift b/Package.swift index 732222e..4494597 100755 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.8 +// swift-tools-version:6.4.1 import PackageDescription let package = Package( diff --git a/Sources/App/Models/Token.swift b/Sources/App/Models/Token.swift index 6b8ce82..5daa935 100644 --- a/Sources/App/Models/Token.swift +++ b/Sources/App/Models/Token.swift @@ -41,10 +41,14 @@ extension Token { extension Token: ModelTokenAuthenticatable { typealias User = App.User - static let valueKey = \Token.$value - static let userKey = \Token.$user - - var isValid: Bool { - true + + static var valueKey: KeyPath> { + return \Token.$value + } + + static var userKey: KeyPath> { + return \Token.$user } + + var isValid: Bool { true } } diff --git a/Sources/App/Models/User.swift b/Sources/App/Models/User.swift index 5452f8d..889539d 100644 --- a/Sources/App/Models/User.swift +++ b/Sources/App/Models/User.swift @@ -49,15 +49,10 @@ extension User { } } extension User: ModelAuthenticatable { - static let usernameKey = \User.$username - static let passwordHashKey = \User.$passwordHash - - func verify(password: String) throws -> Bool { - try Bcrypt.verify(password, created: self.passwordHash) - } -} - - - - + static var usernameKey: KeyPath> { \User.$username } + static var passwordHashKey: KeyPath> { \User.$passwordHash } + func verify(password: String) throws -> Bool { + try Bcrypt.verify(password, created: self.passwordHash) + } +}