Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
dillon-mce committed Aug 9, 2021
1 parent d85964b commit 48ce326
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Sources/Handler/ASWebAuthenticationURLHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import AuthenticationServices
import Foundation

@available(iOS 13.0, macCatalyst 13.0, *)
@available(iOSApplicationExtension, unavailable)
open class ASWebAuthenticationURLHandler: OAuthSwiftURLHandlerType {
var webAuthSession: ASWebAuthenticationSession!
let prefersEphemeralWebBrowserSession: Bool
Expand Down Expand Up @@ -55,6 +56,7 @@ open class ASWebAuthenticationURLHandler: OAuthSwiftURLHandlerType {
}

@available(iOS 13.0, macCatalyst 13.0, *)
@available(iOSApplicationExtension, unavailable)
extension ASWebAuthenticationURLHandler {
static func isCancelledError(domain: String, code: Int) -> Bool {
return domain == ASWebAuthenticationSessionErrorDomain &&
Expand Down
1 change: 1 addition & 0 deletions Sources/Handler/OAuthSwiftOpenURLExternally.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import AppKit
#endif

/// Open externally using open url application function.
@available(iOSApplicationExtension, unavailable)
open class OAuthSwiftOpenURLExternally: OAuthSwiftURLHandlerType {

public static var sharedInstance: OAuthSwiftOpenURLExternally = OAuthSwiftOpenURLExternally()
Expand Down
1 change: 1 addition & 0 deletions Sources/Handler/OAuthWebViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public protocol OAuthWebViewControllerDelegate: AnyObject {
}

/// A web view controller, which handler OAuthSwift authentification. Must be override to display a web view.
@available(iOSApplicationExtension, unavailable)
open class OAuthWebViewController: OAuthViewController, OAuthSwiftURLHandlerType {

#if os(iOS) || os(tvOS) || os(OSX)
Expand Down
2 changes: 2 additions & 0 deletions Sources/Handler/SFAuthenticationURLHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import AuthenticationServices

#if !targetEnvironment(macCatalyst)
@available(iOS, introduced: 11.0, deprecated: 12.0)
@available(iOSApplicationExtension, unavailable)
open class SFAuthenticationURLHandler: OAuthSwiftURLHandlerType {
var webAuthSession: SFAuthenticationSession!
let callbackUrlScheme: String
Expand Down Expand Up @@ -50,6 +51,7 @@ open class SFAuthenticationURLHandler: OAuthSwiftURLHandlerType {
}

@available(iOS, introduced: 11.0, deprecated: 12.0)
@available(iOSApplicationExtension, unavailable)
extension SFAuthenticationURLHandler {
static func isCancelledError(domain: String, code: Int) -> Bool {
return domain == SFAuthenticationErrorDomain &&
Expand Down
1 change: 1 addition & 0 deletions Sources/Handler/SafariURLHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import AuthenticationServices
#endif

@available(iOS 9.0, *)
@available(iOSApplicationExtension, unavailable)
open class SafariURLHandler: NSObject, OAuthSwiftURLHandlerType, SFSafariViewControllerDelegate {

public typealias UITransion = (_ controller: SFSafariViewController, _ handler: SafariURLHandler) -> Void
Expand Down
1 change: 1 addition & 0 deletions Sources/NSError+OAuthSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import Foundation

@available(iOSApplicationExtension, unavailable)
public extension NSError {

/// Checks the headers contained in the userInfo whether this error was caused by an
Expand Down
2 changes: 2 additions & 0 deletions Sources/NotificationCenter+OAuthSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@

import Foundation

@available(iOSApplicationExtension, unavailable)
public extension Notification.Name {
@available(*, deprecated, renamed: "OAuthSwift.didHandleCallbackURL")
static let OAuthSwiftHandleCallbackURL: Notification.Name = OAuthSwift.didHandleCallbackURL
}
@available(iOSApplicationExtension, unavailable)
public extension OAuthSwift {
static let didHandleCallbackURL: Notification.Name = .init("OAuthSwiftCallbackNotificationName")
}
1 change: 1 addition & 0 deletions Sources/OAuth1Swift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import Foundation

@available(iOSApplicationExtension, unavailable)
open class OAuth1Swift: OAuthSwift {

/// If your oauth provider doesn't provide `oauth_verifier`
Expand Down
1 change: 1 addition & 0 deletions Sources/OAuth2Swift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import Foundation

@available(iOSApplicationExtension, unavailable)
open class OAuth2Swift: OAuthSwift {

/// If your oauth provider need to use basic authentification
Expand Down
4 changes: 4 additions & 0 deletions Sources/OAuthSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import Foundation

@available(iOSApplicationExtension, unavailable)
open class OAuthSwift: NSObject, OAuthSwiftRequestHandle {

// MARK: Properties
Expand All @@ -18,6 +19,7 @@ open class OAuthSwift: NSObject, OAuthSwiftRequestHandle {
open var version: OAuthSwiftCredential.Version { return self.client.credential.version }

/// Handle the authorize url into a web view or browser
@available(iOSApplicationExtension, unavailable)
open var authorizeURLHandler: OAuthSwiftURLHandlerType = OAuthSwiftURLHandlerTypeFactory.default

fileprivate var currentRequests: [String: OAuthSwiftRequestHandle] = [:]
Expand Down Expand Up @@ -99,6 +101,7 @@ open class OAuthSwift: NSObject, OAuthSwiftRequestHandle {
}

// MARK: - alias
@available(iOSApplicationExtension, unavailable)
extension OAuthSwift {

public typealias Parameters = [String: Any]
Expand All @@ -112,6 +115,7 @@ extension OAuthSwift {
}

// MARK: - Logging
@available(iOSApplicationExtension, unavailable)
extension OAuthSwift {

static var log: OAuthLogProtocol?
Expand Down
1 change: 1 addition & 0 deletions Sources/OAuthSwiftClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public var OAuthSwiftDataEncoding: String.Encoding = .utf8
func cancel()
}

@available(iOSApplicationExtension, unavailable)
open class OAuthSwiftClient: NSObject {

fileprivate(set) open var credential: OAuthSwiftCredential
Expand Down
2 changes: 2 additions & 0 deletions Sources/OAuthSwiftCredential.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import Foundation

/// Allow to customize computed headers
@available(iOSApplicationExtension, unavailable)
public protocol OAuthSwiftCredentialHeadersFactory {
func make(_ url: URL, method: OAuthSwiftHTTPRequest.Method, parameters: OAuthSwift.Parameters, body: Data?) -> [String: String]
}
Expand Down Expand Up @@ -40,6 +41,7 @@ public enum OAuthSwiftHashMethod: String {
}

/// The credential for authentification
@available(iOSApplicationExtension, unavailable)
open class OAuthSwiftCredential: NSObject, NSSecureCoding, Codable {

public static let supportsSecureCoding = true
Expand Down
1 change: 1 addition & 0 deletions Sources/OAuthSwiftError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ extension OAuthSwiftError: CustomStringConvertible {
}
}

@available(iOSApplicationExtension, unavailable)
extension OAuthSwift {
static func retainError(_ completionHandler: OAuthSwiftHTTPRequest.CompletionHandler?) {
#if !OAUTH_NO_RETAIN_ERROR
Expand Down
3 changes: 3 additions & 0 deletions Sources/OAuthSwiftHTTPRequest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import UIKit

let kHTTPHeaderContentType = "Content-Type"

@available(iOSApplicationExtension, unavailable)
open class OAuthSwiftHTTPRequest: NSObject, OAuthSwiftRequestHandle {

// Using NSLock for Linux compatible locking
Expand Down Expand Up @@ -308,6 +309,7 @@ open class OAuthSwiftHTTPRequest: NSObject, OAuthSwiftRequestHandle {
}

// MARK: - Request configuraiton
@available(iOSApplicationExtension, unavailable)
extension OAuthSwiftHTTPRequest {

/// Configuration for request
Expand Down Expand Up @@ -454,6 +456,7 @@ public struct URLSessionFactory {

// MARK: - status code mapping

@available(iOSApplicationExtension, unavailable)
extension OAuthSwiftHTTPRequest {

class func descriptionForHTTPStatus(_ status: Int, responseString: String) -> String {
Expand Down
1 change: 1 addition & 0 deletions Sources/OAuthSwiftURLHandlerType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ import AppKit

public struct OAuthSwiftURLHandlerTypeFactory {

@available(iOSApplicationExtension, unavailable)
static var `default`: OAuthSwiftURLHandlerType = OAuthSwiftOpenURLExternally.sharedInstance
}
1 change: 1 addition & 0 deletions Sources/String+OAuthSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ extension String {
return parameters
}

@available(iOSApplicationExtension, unavailable)
public var headerDictionary: OAuthSwift.Headers {
return dictionaryBySplitting(",", keyValueSeparator: "=")
}
Expand Down
1 change: 1 addition & 0 deletions Sources/UIApplication+OAuthSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#if os(iOS) || os(tvOS)
import UIKit

@available(iOSApplicationExtension, unavailable)
extension UIApplication {
@nonobjc static var topViewController: UIViewController? {
#if !OAUTH_APP_EXTENSIONS
Expand Down

0 comments on commit 48ce326

Please sign in to comment.