@@ -2,11 +2,16 @@ import Foundation
22import TSCBasic
33
44/// Supplies `Authorization` header, typically to be appended to `URLRequest`
5+
6+ // deprecated 9/2021
7+ @available ( * , deprecated)
58public protocol AuthorizationProviding {
69 /// Optional `Authorization` header, likely added to `URLRequest`
710 func authorization( for url: Foundation . URL ) -> String ?
811}
912
13+ // deprecated 9/2021
14+ @available ( * , deprecated)
1015extension AuthorizationProviding {
1116 public func authorization( for url: Foundation . URL ) -> String ? {
1217 return nil
@@ -17,9 +22,9 @@ extension AuthorizationProviding {
1722 Netrc feature depends upon `NSTextCheckingResult.range(withName name: String) -> NSRange`,
1823 which is only available in macOS 10.13+, iOS 11+, etc at this time.
1924 */
20- @available ( macOS 10 . 13 , iOS 11 , tvOS 11 , watchOS 4 , * )
2125/// Container of parsed netrc connection settings
22- public struct Netrc : AuthorizationProviding {
26+ @available ( macOS 10 . 13 , iOS 11 , tvOS 11 , watchOS 4 , * )
27+ public struct Netrc {
2328 /// Representation of `machine` connection settings & `default` connection settings.
2429 /// If `default` connection settings present, they will be last element.
2530 public let machines : [ Machine ]
@@ -62,7 +67,7 @@ public struct Netrc: AuthorizationProviding {
6267
6368 let machines : [ Machine ] = matches. compactMap {
6469 return Machine ( for: $0, string: content, variant: " lp " ) ??
65- Machine ( for: $0, string: content, variant: " pl " )
70+ Machine ( for: $0, string: content, variant: " pl " )
6671 }
6772
6873 if let defIndex = machines. firstIndex ( where: { $0. isDefault } ) {
@@ -88,6 +93,11 @@ public struct Netrc: AuthorizationProviding {
8893 }
8994}
9095
96+ // deprecated 9/2021
97+ @available ( * , deprecated)
98+ @available ( macOS 10 . 13 , iOS 11 , tvOS 11 , watchOS 4 , * )
99+ extension Netrc : AuthorizationProviding { }
100+
91101@available ( macOS 10 . 13 , iOS 11 , tvOS 11 , watchOS 4 , * )
92102public extension Netrc {
93103 enum Error : Swift . Error {
@@ -117,10 +127,10 @@ public extension Netrc {
117127
118128 init ? ( for match: NSTextCheckingResult , string: String , variant: String = " " ) {
119129 guard let name = RegexUtil . Token. machine. capture ( in: match, string: string) ?? RegexUtil . Token. default. capture ( in: match, string: string) ,
120- let login = RegexUtil . Token. login. capture ( prefix: variant, in: match, string: string) ,
121- let password = RegexUtil . Token. password. capture ( prefix: variant, in: match, string: string) else {
122- return nil
123- }
130+ let login = RegexUtil . Token. login. capture ( prefix: variant, in: match, string: string) ,
131+ let password = RegexUtil . Token. password. capture ( prefix: variant, in: match, string: string) else {
132+ return nil
133+ }
124134 self = Machine ( name: name, login: login, password: password)
125135 }
126136 }
0 commit comments