Skip to content

Commit

Permalink
Merge pull request #653 from vapor/tn-model-user
Browse files Browse the repository at this point in the history
Add ModelUser and ModelUserToken
  • Loading branch information
tanner0101 committed Jan 21, 2020
2 parents fa4382f + efaca97 commit 8dede23
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 0 deletions.
48 changes: 48 additions & 0 deletions Sources/Fluent/ModelUser.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import Vapor

public protocol ModelUser: Model, Authenticatable {
static var usernameKey: KeyPath<Self, Field<String>> { get }
static var passwordHashKey: KeyPath<Self, Field<String>> { get }
func verify(password: String) throws -> Bool
}

extension ModelUser {
public static func authenticator(
database: DatabaseID? = nil
) -> ModelUserAuthenticator<Self> {
ModelUserAuthenticator<Self>(database: database)
}

var _$username: Field<String> {
self[keyPath: Self.usernameKey]
}

var _$passwordHash: Field<String> {
self[keyPath: Self.passwordHashKey]
}
}

public struct ModelUserAuthenticator<User>: BasicAuthenticator
where User: ModelUser
{
public let database: DatabaseID?

public func authenticate(
basic: BasicAuthorization,
for request: Request
) -> EventLoopFuture<User?> {
User.query(on: request.db(self.database))
.filter(\._$username == basic.username)
.first()
.flatMapThrowing
{
guard let user = $0 else {
return nil
}
guard try user.verify(password: basic.password) else {
return nil
}
return user
}
}
}
53 changes: 53 additions & 0 deletions Sources/Fluent/ModelUserToken.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import Vapor

public protocol ModelUserToken: Model {
associatedtype User: Model & Authenticatable
static var valueKey: KeyPath<Self, Field<String>> { get }
static var userKey: KeyPath<Self, Parent<User>> { get }
var isValid: Bool { get }
}

extension ModelUserToken {
public static func authenticator(
database: DatabaseID? = nil
) -> ModelUserTokenAuthenticator<Self> {
ModelUserTokenAuthenticator<Self>(database: database)
}

var _$value: Field<String> {
self[keyPath: Self.valueKey]
}

var _$user: Parent<User> {
self[keyPath: Self.userKey]
}
}

public struct ModelUserTokenAuthenticator<Token>: BearerAuthenticator
where Token: ModelUserToken
{
public typealias User = Token.User
public let database: DatabaseID?

public func authenticate(
bearer: BearerAuthorization,
for request: Request
) -> EventLoopFuture<User?> {
let db = request.db(self.database)
return Token.query(on: db)
.filter(\._$value == bearer.token)
.first()
.flatMap
{ token -> EventLoopFuture<User?> in
guard let token = token else {
return request.eventLoop.makeSucceededFuture(nil)
}
guard token.isValid else {
return token.delete(on: db).map { nil }
}
return token._$user.get(on: db)
.map { $0 }
}
}
}

0 comments on commit 8dede23

Please sign in to comment.