Remove deprecated types (#156)

### Summary
- Remove deprecated types: `BearerOAuth2Token`, `OAuth2TokenAES256CBCCipher`, and `OAuth2TokenDiskStore`
- Set `IPHONEOS_DEPLOYMENT_TARGET` to 9.0 for all Conduit targets

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## master
 
 #### Breaking
-- None
+- Remove deprecated types: `BearerOAuth2Token`, `OAuth2TokenAES256CBCCipher`, and `OAuth2TokenDiskStore`
 
 #### Enhancements
 - None

Sources/Conduit/Auth/Models/OAuth2Token.swift

@@ -110,13 +110,6 @@ extension BearerToken {
     }
 }
 
-extension BearerToken {
-    @available(*, deprecated, message: "BearerOAuth2Token will be removed in a future version.")
-    init(legacyToken: BearerOAuth2Token) {
-        self.init(accessToken: legacyToken.accessToken, refreshToken: legacyToken.refreshToken, expiration: legacyToken.expiration)
-    }
-}
-
 extension BasicToken {
     func base64EncodedUsernameAndPassword() -> String {
         let usernamePasswordString = "\(username):\(password)"

Sources/Conduit/Auth/OAuth2RequestPipelineMiddleware.swift

@@ -28,11 +28,10 @@ public struct OAuth2RequestPipelineMiddleware: RequestPipelineMiddleware {
     let tokenStorage: OAuth2TokenStore
 
     var token: BearerToken? {
-        if let token: BearerToken = tokenStorage.tokenFor(client: clientConfiguration, authorization: authorization) {
-            return token
+        guard let token: BearerToken = tokenStorage.tokenFor(client: clientConfiguration, authorization: authorization) else {
+            return nil
         }
-        let legacyToken: BearerOAuth2Token? = tokenStorage.tokenFor(client: clientConfiguration, authorization: authorization)
-        return legacyToken?.converted
+        return token
     }
 
     /// Creates a new OAuth2RequestPipelineMiddleware

Tests/ConduitTests/Auth/OAuth2RequestPipelineMiddlewareTests.swift

@@ -309,32 +309,6 @@ class OAuth2RequestPipelineMiddlewareTests: XCTestCase {
         waitForExpectations(timeout: 1)
     }
 
-    func testLegacyTokenMigration() throws {
-        let randomToken = BearerOAuth2Token(accessToken: randomTokenAccessToken, refreshToken: "notused", expiration: Date().addingTimeInterval(1_000_000))
-        let authorization = OAuth2Authorization(type: .bearer, level: .user)
-        let validClientConfiguration = try makeValidClientConfiguration()
-
-        let tokenStorage = OAuth2TokenMemoryStore()
-        tokenStorage.store(token: randomToken, for: validClientConfiguration, with: authorization)
-
-        let request = try makeDummyRequest()
-        let sut = OAuth2RequestPipelineMiddleware(clientConfiguration: validClientConfiguration, authorization: authorization, tokenStorage: tokenStorage)
-
-        let decorateRequestExpectation = expectation(description: "request immediately decorated")
-        sut.prepareForTransport(request: request) { result in
-            guard case .value(let request) = result else {
-                XCTFail("No value")
-                return
-            }
-            XCTAssert(request.allHTTPHeaderFields?["Authorization"] == randomToken.authorizationHeaderValue)
-            decorateRequestExpectation.fulfill()
-        }
-
-        XCTAssertNotNil(sut.token)
-
-        waitForExpectations(timeout: 0.1)
-    }
-
     func testCoordinatesRefreshesBetweenMultipleSessions() throws {
         /// Simulates multiple sessions (different processes) triggering token refreshes at once