Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow configuration of a custom SessionManager #67

Merged
merged 3 commits into from
Jun 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,27 @@ modelArrayCall().then { users in

## Settings

Want to log all network calls and responses ?
Want to log all network calls and responses?
```swift
ws.logLevels = .debug
```

Want to hide network activity indicator ?
Want to hide network activity indicator?

```swift
ws.showsNetworkActivityIndicator = false
```

Want to override the default session manager to customize trust policies?

```swift
import Alamofire

ws.sessionManager = SessionManager(serverTrustPolicyManager: ServerTrustPolicyManager(
policies: ["myspecialhostname.com" : .disableEvaluation]
))
```

## Api Example
Here is a Typical CRUD example for Articles :

Expand Down
2 changes: 1 addition & 1 deletion ws.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ws"
s.version = "5.0.0"
s.version = "5.0.1"
s.summary = "Elegant JSON WebService for Swift ☁️"
s.homepage = "https://github.com/freshOS/ws"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand Down
2 changes: 2 additions & 0 deletions ws/WS.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ open class WS {
open var headers = [String: String]()
open var requestAdapter: RequestAdapter?
open var requestRetrier: RequestRetrier?
open var sessionManager: SessionManager?

/**
Create a webservice instance.
Expand Down Expand Up @@ -77,6 +78,7 @@ open class WS {
r.headers = headers
r.requestAdapter = requestAdapter
r.requestRetrier = requestRetrier
r.sessionManager = sessionManager
r.errorHandler = errorHandler
return r
}
Expand Down
9 changes: 5 additions & 4 deletions ws/WSRequest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ open class WSRequest {
open var errorHandler: ((JSON) -> Error?)?
open var requestAdapter: RequestAdapter?
open var requestRetrier: RequestRetrier?
open var sessionManager: SessionManager?

private let logger = WSLogger()

Expand Down Expand Up @@ -68,14 +69,14 @@ open class WSRequest {
}

func wsSessionManager() -> SessionManager {
let sessionManager = Alamofire.SessionManager.default
let activeSessionManager = sessionManager ?? Alamofire.SessionManager.default
if let adapter = requestAdapter {
sessionManager.adapter = adapter
activeSessionManager.adapter = adapter
}
if let retrier = requestRetrier {
sessionManager.retrier = retrier
activeSessionManager.retrier = retrier
}
return sessionManager
return activeSessionManager
}

func wsRequest(_ urlRequest: URLRequestConvertible) -> DataRequest {
Expand Down