1919//
2020
2121import Foundation
22+ import Logging
2223
2324
2425/// Typealias to ease working with JSON dictionaries.
@@ -40,32 +41,34 @@ open class OAuth2Requestable {
4041 /// Set to `true` to log all the things. `false` by default. Use `"verbose": bool` in settings or assign `logger` yourself.
4142 open var verbose = false {
4243 didSet {
43- logger = verbose ? OAuth2DebugLogger ( ) : nil
44+ logger = verbose ? Logger ( label: " OAuth2 " ) : nil
45+ logger? . logLevel = . debug // make debug logger
4446 }
4547 }
4648
4749 /// The logger being used. Auto-assigned to a debug logger if you set `verbose` to true or false.
48- open var logger : OAuth2Logger ?
50+ open var logger : Logger ?
4951
5052
5153 /**
5254 Base initializer.
5355 */
5456 public init ( verbose: Bool ) {
5557 self . verbose = verbose
56- logger = verbose ? OAuth2DebugLogger ( ) : nil
57- logger? . debug ( " OAuth2 " , msg: " Initialization finished " )
58+ logger = verbose ? Logger ( label: " OAuth2 " ) : nil
59+ logger? . logLevel = . debug // make debug logger
60+ logger? . debug ( " Initialization finished " )
5861 }
5962
6063 /**
6164 Designated initializer.
6265
63- - parameter logger: An optional `OAuth2Logger` instance to use
66+ - parameter logger: An optional `Logger` (swift-log) instance to use
6467 */
65- public init ( logger: OAuth2Logger ? ) {
68+ public init ( logger: Logger ? ) {
6669 self . logger = logger
6770 self . verbose = ( nil != logger)
68- logger? . debug ( " OAuth2 " , msg : " Initialization finished " )
71+ logger? . debug ( " Initialization finished " )
6972 }
7073
7174
@@ -116,14 +119,14 @@ open class OAuth2Requestable {
116119 - returns : OAuth2 response
117120 */
118121 open func perform( request: URLRequest ) async -> OAuth2Response {
119- self . logger? . trace ( " OAuth2 " , msg : " REQUEST \n \( request. debugDescription) \n --- " )
122+ self . logger? . trace ( " REQUEST \n \( request. debugDescription) \n --- " )
120123 let performer = requestPerformer ?? OAuth2DataTaskRequestPerformer ( session: session)
121124 requestPerformer = performer
122125
123126 do {
124127 // TODO: add support for aborting the request, see https://www.hackingwithswift.com/quick-start/concurrency/how-to-cancel-a-task
125128 let ( sessData, sessResponse) = try await performer. perform ( request: request)
126- self . logger? . trace ( " OAuth2 " , msg : " RESPONSE \n \( sessResponse. debugDescription) \n \n \( String ( data: sessData ?? Data ( ) , encoding: String . Encoding. utf8) ?? " no data " ) \n --- " )
129+ self . logger? . trace ( " RESPONSE \n \( sessResponse. debugDescription) \n \n \( String ( data: sessData ?? Data ( ) , encoding: String . Encoding. utf8) ?? " no data " ) \n --- " )
127130
128131 guard let response = sessResponse as? HTTPURLResponse else {
129132 throw CommonError . castError (
@@ -135,7 +138,7 @@ open class OAuth2Requestable {
135138 return OAuth2Response ( data: sessData, request: request, response: response, error: nil )
136139
137140 } catch {
138- self . logger? . trace ( " OAuth2 " , msg : " RESPONSE \n no response \n \n no data \n --- " )
141+ self . logger? . trace ( " RESPONSE \n no response \n \n no data \n --- " )
139142
140143 let http = HTTPURLResponse ( url: request. url!, statusCode: 499 , httpVersion: nil , headerFields: nil ) !
141144 return OAuth2Response ( data: nil , request: request, response: http, error: error)
@@ -154,7 +157,7 @@ open class OAuth2Requestable {
154157 guard let task = abortableTask else {
155158 return false
156159 }
157- logger? . debug ( " OAuth2 " , msg : " Aborting request " )
160+ logger? . debug ( " Aborting request " )
158161 task. cancel ( )
159162 return true
160163 }
@@ -175,13 +178,13 @@ open class OAuth2Requestable {
175178 return json
176179 }
177180 if let str = String ( data: data, encoding: String . Encoding. utf8) {
178- logger? . warn ( " OAuth2 " , msg : " JSON did not resolve to a dictionary, was: \( str) " )
181+ logger? . warning ( " JSON did not resolve to a dictionary, was: \( str) " )
179182 }
180183 throw OAuth2Error . jsonParserError
181184 }
182185 catch let errorwhere NSCocoaErrorDomain == error. _domain && 3840 == error. _code { // JSON parser error
183186 if let str = String ( data: data, encoding: String . Encoding. utf8) {
184- logger? . warn ( " OAuth2 " , msg : " Unparsable JSON was: \( str) " )
187+ logger? . warning ( " Unparsable JSON was: \( str) " )
185188 }
186189 throw OAuth2Error . jsonParserError
187190 }
0 commit comments