Merge pull request #9 from cardoso/master

Add AuthorizationHeader initializers for Basic and Bearer
vapor · Jul 20, 2017 · dead10f · dead10f
2 parents 2e697a4 + f53b922
commit dead10f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Sources/Authentication/Header/Basic.swift b/Sources/Authentication/Header/Basic.swift
@@ -1,5 +1,3 @@
-import Core
-
 extension AuthorizationHeader {
     public var basic: Password? {
         guard let range = string.range(of: "Basic ") else {
@@ -18,4 +16,10 @@ extension AuthorizationHeader {
 
         return Password(username: username, password: password)
     }
+
+    public init(basic: Password) {
+        let credentials = "\(basic.username):\(basic.password)"
+        let encoded = credentials.makeBytes().base64Encoded.makeString()
+        self.init(string: "Basic \(encoded)")
+    }
 }
diff --git a/Sources/Authentication/Header/Bearer.swift b/Sources/Authentication/Header/Bearer.swift
@@ -7,4 +7,8 @@ extension AuthorizationHeader {
         let token = string.substring(from: range.upperBound)
         return Token(string: token)
     }
+
+    public init(bearer: Token) {
+        self.init(string: "Bearer \(bearer.string)")
+    }
 }