Objc compilation error fix and release increment (okta#219)

* Fix compilation errors for pure obj-c projects * Release increment
moxionio · Apr 21, 2020 · 06256f5 · 06256f5
1 parent 6d88e41
commit 06256f5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 49 deletions.
diff --git a/Okta/Framework/Info.plist b/Okta/Framework/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

diff --git a/Okta/OktaOidc/Internal/OktaUserAgent.m b/Okta/OktaOidc/Internal/OktaUserAgent.m
@@ -16,7 +16,7 @@
 @implementation OktaUserAgent
 
 +(NSString*)userAgentVersion {
-    return @"3.6.0";
+    return @"3.6.1";
 }
 
 +(NSString*)userAgentHeaderKey {

diff --git a/Okta/OktaOidc/Internal/iOS/OktaOidcBrowserProtocolIOS.swift b/Okta/OktaOidc/Internal/iOS/OktaOidcBrowserProtocolIOS.swift
@@ -12,22 +12,11 @@
 
 import Foundation
 
-public protocol OktaOidcBrowserProtocolIOS {
+@objc public protocol OktaOidcBrowserProtocolIOS {
     func signInWithBrowser(from presenter: UIViewController,
                            callback: @escaping ((OktaOidcStateManager?, Error?) -> Void))
     func signOutOfOkta(_ authStateManager: OktaOidcStateManager,
                        from presenter: UIViewController,
                        callback: @escaping ((Error?) -> Void))
-    func signOut(authStateManager: OktaOidcStateManager,
-                 from presenter: UIViewController,
-                 progressHandler: @escaping ((OktaSignOutOptions) -> Void),
-                 completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void))
-    func signOut(with options: OktaSignOutOptions,
-                 authStateManager: OktaOidcStateManager,
-                 from presenter: UIViewController,
-                 progressHandler: @escaping ((OktaSignOutOptions) -> Void),
-                 completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void))
     func cancelBrowserSession(completion: (()-> Void)?)
-    @available(iOS, obsoleted: 11.0, message: "Unused on iOS 11+")
-    func resume(_ url: URL, options: [UIApplication.OpenURLOptionsKey : Any]) -> Bool
 }
diff --git a/Okta/OktaOidc/Internal/macOS/OktaOidcBrowserProtocolMAC.swift b/Okta/OktaOidc/Internal/macOS/OktaOidcBrowserProtocolMAC.swift
@@ -12,21 +12,12 @@
 
 import Foundation
 
-public protocol OktaOidcBrowserProtocolMAC {
+@objc public protocol OktaOidcBrowserProtocolMAC {
     func signInWithBrowser(redirectServerConfiguration: OktaRedirectServerConfiguration?,
                            callback: @escaping ((OktaOidcStateManager?, Error?) -> Void))
     func signOutOfOkta(authStateManager: OktaOidcStateManager,
                        redirectServerConfiguration: OktaRedirectServerConfiguration?,
                        callback: @escaping ((Error?) -> Void))
-    func signOut(authStateManager: OktaOidcStateManager,
-                 redirectServerConfiguration: OktaRedirectServerConfiguration?,
-                 progressHandler: @escaping ((OktaSignOutOptions) -> Void),
-                 completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void))
-    func signOut(with options: OktaSignOutOptions,
-                 authStateManager: OktaOidcStateManager,
-                 redirectServerConfiguration: OktaRedirectServerConfiguration?,
-                 progressHandler: @escaping ((OktaSignOutOptions) -> Void),
-                 completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void))
     func cancelBrowserSession(completion: (()-> Void)?)
 }
 
@@ -43,26 +34,6 @@ public extension OktaOidcBrowserProtocolMAC {
                       redirectServerConfiguration: redirectServerConfiguration,
                       callback: callback)
     }
-    func signOut(authStateManager: OktaOidcStateManager,
-                 redirectServerConfiguration: OktaRedirectServerConfiguration? = nil,
-                 progressHandler: @escaping ((OktaSignOutOptions) -> Void),
-                 completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void)) {
-        signOut(authStateManager: authStateManager,
-                redirectServerConfiguration: redirectServerConfiguration,
-                progressHandler: progressHandler,
-                completionHandler: completionHandler)
-    }
-    func signOut(with options: OktaSignOutOptions,
-                 authStateManager: OktaOidcStateManager,
-                 redirectServerConfiguration: OktaRedirectServerConfiguration? = nil,
-                 progressHandler: @escaping ((OktaSignOutOptions) -> Void),
-                 completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void)) {
-        signOut(with: options,
-                authStateManager: authStateManager,
-                redirectServerConfiguration: redirectServerConfiguration,
-                progressHandler: progressHandler,
-                completionHandler: completionHandler)
-    }
     func cancelBrowserSession(completion: (()-> Void)? = nil) {
         cancelBrowserSession(completion: completion)
     }

diff --git a/Okta/OktaOidc/OktaOidcStateManager.swift b/Okta/OktaOidc/OktaOidcStateManager.swift
@@ -168,18 +168,18 @@ open class OktaOidcStateManager: NSObject, NSSecureCoding {
     }
 }
 
-public extension OktaOidcStateManager {
+@objc public extension OktaOidcStateManager {
 
     @available(*, deprecated, message: "Please use readFromSecureStorage(for config: OktaOidcConfig) function")
     class func readFromSecureStorage() -> OktaOidcStateManager? {
         return readFromSecureStorage(forKey: "OktaAuthStateManager")
     }
 
-    class func readFromSecureStorage(for config: OktaOidcConfig) -> OktaOidcStateManager? {
+    @objc class func readFromSecureStorage(for config: OktaOidcConfig) -> OktaOidcStateManager? {
         return readFromSecureStorage(forKey: config.clientId)
     }
 
-    func writeToSecureStorage() {
+    @objc func writeToSecureStorage() {
         let authStateData: Data
         do {
             if #available(iOS 11, OSX 10.14, *) {

diff --git a/OktaOidc.podspec b/OktaOidc.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'OktaOidc'
-  s.version          = '3.6.0'
+  s.version          = '3.6.1'
   s.summary          = 'SDK to easily integrate AppAuth with Okta'
   s.description      = <<-DESC
 Integrate your native app with Okta using the AppAuth library.

diff --git a/macTests/Mocks/OktaOidcMacMock.swift b/macTests/Mocks/OktaOidcMacMock.swift
@@ -13,7 +13,7 @@
 import Foundation
 @testable import OktaOidc
 
-class OktaOidcMacMock: OktaOidcBrowserProtocolMAC {
+class OktaOidcMacMock: NSObject, OktaOidcBrowserProtocolMAC {
     func signInWithBrowser(redirectServerConfiguration: OktaRedirectServerConfiguration? = nil, callback: @escaping ((OktaOidcStateManager?, Error?) -> Void)) {
 
     }
@@ -26,6 +26,10 @@ class OktaOidcMacMock: OktaOidcBrowserProtocolMAC {
 
     }
 
+    func cancelBrowserSession(completion: (() -> Void)? = nil) {
+
+    }
+
     func signOut(with options: OktaSignOutOptions, authStateManager: OktaOidcStateManager, redirectServerConfiguration: OktaRedirectServerConfiguration? = nil, progressHandler: @escaping ((OktaSignOutOptions) -> Void), completionHandler: @escaping ((Bool, OktaSignOutOptions) -> Void)) {
         completionHandler(true, .allOptions)
     }