Bugfix in manual authentication

Author: troovers

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog Cobalt
 
+## v5.9.2 (19-06-2019)
+- Bugfix manual auth provider
+
 ## v5.9.1 (19-06-2019)
 - Provide a way to store the login state when logging in manually
 
@@ -65,4 +68,4 @@
 - Store `AccessToken` in individual keychains per host, this way you can use multiple `Cobalt` isntances for multiple API's.
 
 ## v5.0.0 (11-07-2018)
-- Initial public release
+- Initial public release

Cobalt.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Cobalt"
-  s.version      = "5.9.1"
+  s.version      = "5.9.2"
   s.author       = { "Bas van Kuijck" => "[email protected]" }
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.homepage     = "http://www.e-sites.nl"

Sources/Core/Authentication/AccessToken.swift

@@ -74,12 +74,14 @@ public class AccessToken: Decodable, CustomStringConvertible {
         return accessToken
     }
 
-    init(grantType: OAuthenticationGrantType, accessToken: String, refreshToken: String, expireDate: Date, host: String? = nil) {
+    init(grantType: OAuthenticationGrantType, accessToken: String, refreshToken: String, expireDate: Date, host: String) {
         self.grantType = grantType
         self.accessToken = accessToken
         self.refreshToken = refreshToken
         self.expireDate = expireDate
-        self.host = host ?? ""
+        self.host = host
+        
+        _setKeychain()
     }
 
     init(host: String) {

Sources/Core/Authentication/AuthenticationProvider.swift

@@ -191,9 +191,8 @@ class AuthenticationProvider {
                                   accessToken: String,
                                   refreshToken: String,
                                   expireDate: Date,
-                                  host: String? = nil) {
-        let oauthHost = (host ?? client.config.host) ?? ""
-        let accessTokenObject = AccessToken(grantType: grantType, accessToken: accessToken, refreshToken: refreshToken, expireDate: expireDate, host: oauthHost)
+                                  host: String) {
+        let accessTokenObject = AccessToken(grantType: grantType, accessToken: accessToken, refreshToken: refreshToken, expireDate: expireDate, host: host)
         accessTokenObject.store()
 
         client.logger?.debug("Store access-token: \(optionalDescription(accessToken))")

Sources/Core/Base/Client.swift

@@ -233,8 +233,11 @@ open class Client: ReactiveCompatible {
     public func loggedIn(grantType: OAuthenticationGrantType,
                          accessToken: String,
                          refreshToken: String,
-                         expireDate: Date,
-                         host: String? = nil) {
+                         expireDate: Date) {
+        guard let host = (host ?? config.host) else {
+            fatalError("No host given, nor a valid host set in the Cobalt.Config")
+        }
+        
         authProvider.handleManualOAuthRequest(grantType: grantType, accessToken: accessToken, refreshToken: refreshToken, expireDate: expireDate, host: host)
     }