diff --git a/Sources/Authentication/Header/Basic.swift b/Sources/Authentication/Header/Basic.swift index be6506e..6c29019 100644 --- a/Sources/Authentication/Header/Basic.swift +++ b/Sources/Authentication/Header/Basic.swift @@ -3,20 +3,20 @@ extension AuthorizationHeader { guard let range = string.range(of: "Basic ") else { return nil } - + let token = string.substring(from: range.upperBound) - + let decodedToken = token.makeBytes().base64Decoded.makeString() guard let separatorRange = decodedToken.range(of: ":") else { return nil } - + let username = decodedToken.substring(to: separatorRange.lowerBound) let password = decodedToken.substring(from: separatorRange.upperBound) - + return Password(username: username, password: password) } - + public init(basic: Password) { let credentials = "\(basic.username):\(basic.password)" let encoded = credentials.makeBytes().base64Encoded.makeString() diff --git a/Sources/Authentication/Header/Bearer.swift b/Sources/Authentication/Header/Bearer.swift index 03bc171..b291800 100644 --- a/Sources/Authentication/Header/Bearer.swift +++ b/Sources/Authentication/Header/Bearer.swift @@ -3,11 +3,11 @@ extension AuthorizationHeader { guard let range = string.range(of: "Bearer ") else { return nil } - + let token = string.substring(from: range.upperBound) return Token(string: token) } - + public init(bearer: Token) { self.init(string: "Bearer \(bearer.string)") }