Rename auth transaction classes

auth0 · Nov 2, 2021 · 6ebf91c · 6ebf91c
1 parent 5a99246
commit 6ebf91c
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 54 deletions.
diff --git a/Auth0.podspec b/Auth0.podspec
@@ -6,13 +6,16 @@ web_auth_files = [
   'Auth0/ObjectiveC/A0SHA.h',
   'Auth0/ObjectiveC/A0SHA.m',
   'Auth0/Array+Encode.swift',
+  'Auth0/ASCallbackTransaction.swift',
+  'Auth0/ASTransaction.swift',
   'Auth0/AuthCancelable.swift',
   'Auth0/AuthProvider.swift',
   'Auth0/AuthSession.swift',
   'Auth0/AuthTransaction.swift',
-  'Auth0/AuthenticationServicesSession.swift',
-  'Auth0/AuthenticationServicesSessionCallback.swift',
   'Auth0/Auth0WebAuth.swift',
+  'Auth0/BaseCallbackTransaction.swift',
+  'Auth0/BaseTransaction.swift',
+
   'Auth0/BioAuthentication.swift',
   'Auth0/ClaimValidators.swift',
   'Auth0/IDTokenSignatureValidator.swift',
@@ -25,8 +28,6 @@ web_auth_files = [
   'Auth0/NSURLComponents+OAuth2.swift',
   'Auth0/OAuth2Grant.swift',
   'Auth0/ResponseType.swift',
-  'Auth0/SessionCallbackTransaction.swift',
-  'Auth0/SessionTransaction.swift',
   'Auth0/TransactionStore.swift',
   'Auth0/WebAuth.swift',
   'Auth0/WebAuthError.swift',

diff --git a/Auth0.xcodeproj/project.pbxproj b/Auth0.xcodeproj/project.pbxproj
diff --git a/...thenticationServicesSessionCallback.swift → Auth0/ASCallbackTransaction.swift b/...thenticationServicesSessionCallback.swift → Auth0/ASCallbackTransaction.swift
@@ -1,4 +1,4 @@
-// AuthenticationServicesSessionCallback.swift
+// ASCallbackTransaction.swift
 //
 // Copyright (c) 2020 Auth0 (http://auth0.com)
 //
@@ -23,7 +23,7 @@
 #if WEB_AUTH_PLATFORM
 import AuthenticationServices
 
-final class AuthenticationServicesSessionCallback: SessionCallbackTransaction {
+final class ASCallbackTransaction: BaseCallbackTransaction, ASWebAuthenticationPresentationContextProviding {
 
     init(url: URL, schemeURL: URL, callback: @escaping (Bool) -> Void) {
         super.init(callback: callback)

diff --git a/Auth0/AuthenticationServicesSession.swift → Auth0/ASTransaction.swift b/Auth0/AuthenticationServicesSession.swift → Auth0/ASTransaction.swift
@@ -1,4 +1,4 @@
-// AuthenticationServicesSession.swift
+// ASTransaction.swift
 //
 // Copyright (c) 2020 Auth0 (http://auth0.com)
 //
@@ -23,7 +23,7 @@
 #if WEB_AUTH_PLATFORM
 import AuthenticationServices
 
-final class AuthenticationServicesSession: SessionTransaction {
+final class ASTransaction: BaseTransaction {
 
     init(authorizeURL: URL,
          redirectURL: URL,

diff --git a/Auth0/Auth0WebAuth.swift b/Auth0/Auth0WebAuth.swift
@@ -181,7 +181,7 @@ final class Auth0WebAuth: WebAuth {
                                                   state: state,
                                                   organization: organization,
                                                   invitation: invitation)
-        let session = AuthenticationServicesSession(authorizeURL: authorizeURL,
+        let session = ASTransaction(authorizeURL: authorizeURL,
                                                     redirectURL: redirectURL,
                                                     state: state,
                                                     handler: handler,
@@ -207,7 +207,7 @@ final class Auth0WebAuth: WebAuth {
             return callback(false)
         }
 
-        let session = AuthenticationServicesSessionCallback(url: logoutURL,
+        let session = ASCallbackTransaction(url: logoutURL,
                                                             schemeURL: redirectURL,
                                                             callback: callback)
         self.storage.store(session)

diff --git a/Auth0/SessionCallbackTransaction.swift → Auth0/BaseCallbackTransaction.swift b/Auth0/SessionCallbackTransaction.swift → Auth0/BaseCallbackTransaction.swift
@@ -23,7 +23,7 @@
 #if WEB_AUTH_PLATFORM
 import Foundation
 
-class SessionCallbackTransaction: NSObject, AuthTransaction {
+class BaseCallbackTransaction: NSObject, AuthTransaction {
 
     var authSession: AuthSession?
     var state: String?

diff --git a/Auth0/SessionTransaction.swift → Auth0/BaseTransaction.swift b/Auth0/SessionTransaction.swift → Auth0/BaseTransaction.swift
@@ -23,10 +23,10 @@
 #if WEB_AUTH_PLATFORM
 import Foundation
 
-class SessionTransaction: NSObject, AuthTransaction {
+class BaseTransaction: NSObject, AuthTransaction {
 
     typealias FinishTransaction = (Result<Credentials>) -> Void
-    
+
     var authSession: AuthSession?
     let state: String?
     let redirectURL: URL
@@ -55,15 +55,15 @@ class SessionTransaction: NSObject, AuthTransaction {
 
     func handleUrl(_ url: URL) -> Bool {
         self.logger?.trace(url: url, source: "iOS Safari")
-        if self.resume(url) {
+        if self.resumeAuth(url) {
             authSession?.cancel()
             authSession = nil
             return true
         }
         return false
     }
 
-    private func resume(_ url: URL) -> Bool {
+    private func resumeAuth(_ url: URL) -> Bool {
         guard url.absoluteString.lowercased().hasPrefix(self.redirectURL.absoluteString.lowercased()) else { return false }
         guard let components = URLComponents(url: url, resolvingAgainstBaseURL: true) else {
             self.callback(.failure(AuthenticationError(string: url.absoluteString, statusCode: 200)))

diff --git a/Auth0/DesktopWebAuth.swift b/Auth0/DesktopWebAuth.swift
@@ -68,7 +68,7 @@ public protocol AuthResumable {
 
 }
 
-extension AuthTransaction where Self: SessionCallbackTransaction {
+extension AuthTransaction where Self: BaseCallbackTransaction {
 
     func resume(_ url: URL) -> Bool {
         return self.handleUrl(url)
@@ -77,15 +77,15 @@ extension AuthTransaction where Self: SessionCallbackTransaction {
 }
 
 #if swift(>=5.1)
-extension AuthenticationServicesSession: ASWebAuthenticationPresentationContextProviding {
+extension ASTransaction: ASWebAuthenticationPresentationContextProviding {
 
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return NSApplication.shared()?.windows.filter({ $0.isKeyWindow }).last ?? ASPresentationAnchor()
     }
 
 }
 
-extension AuthenticationServicesSessionCallback: ASWebAuthenticationPresentationContextProviding {
+extension ASCallbackTransaction: ASWebAuthenticationPresentationContextProviding {
 
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return NSApplication.shared()?.windows.filter({ $0.isKeyWindow }).last ?? ASPresentationAnchor()

diff --git a/Auth0/MobileWebAuth.swift b/Auth0/MobileWebAuth.swift
@@ -92,7 +92,7 @@ public extension AuthResumable {
 
 }
 
-extension AuthTransaction where Self: SessionCallbackTransaction {
+extension AuthTransaction where Self: BaseCallbackTransaction {
 
     func resume(_ url: URL, options: [A0URLOptionsKey: Any]) -> Bool {
         return self.handleUrl(url)
@@ -102,7 +102,7 @@ extension AuthTransaction where Self: SessionCallbackTransaction {
 
 #if swift(>=5.1)
 @available(iOS 13.0, *)
-extension AuthenticationServicesSession: ASWebAuthenticationPresentationContextProviding {
+extension ASTransaction: ASWebAuthenticationPresentationContextProviding {
 
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return UIApplication.shared()?.windows.filter({ $0.isKeyWindow }).last ?? ASPresentationAnchor()
@@ -111,7 +111,7 @@ extension AuthenticationServicesSession: ASWebAuthenticationPresentationContextP
 }
 
 @available(iOS 13.0, *)
-extension AuthenticationServicesSessionCallback: ASWebAuthenticationPresentationContextProviding {
+extension ASCallbackTransaction: ASWebAuthenticationPresentationContextProviding {
 
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return UIApplication.shared()?.windows.filter({ $0.isKeyWindow }).last ?? ASPresentationAnchor()

diff --git a/Auth0Tests/SessionTransactionSpec.swift → Auth0Tests/BaseTransactionSpec.swift b/Auth0Tests/SessionTransactionSpec.swift → Auth0Tests/BaseTransactionSpec.swift
@@ -36,10 +36,10 @@ private let Issuer = "\(Domain.absoluteString)/"
 private let Leeway = 60 * 1000
 private let RedirectURL = URL(string: "https://samples.auth0.com/callback")!
 
-class SessionTransactionSpec: QuickSpec {
+class BaseTransactionSpec: QuickSpec {
 
     override func spec() {
-        var transaction: SessionTransaction!
+        var transaction: BaseTransaction!
         var result: Result<Credentials>? = nil
         let callback: (Result<Credentials>) -> () = { result = $0 }
         let authentication = Auth0Authentication(clientId: ClientId, url: Domain)
@@ -55,7 +55,7 @@ class SessionTransactionSpec: QuickSpec {
         let code = "123456"
 
         beforeEach {
-            transaction = SessionTransaction(redirectURL: RedirectURL,
+            transaction = BaseTransaction(redirectURL: RedirectURL,
                                               state: "state",
                                               handler: handler,
                                               logger: nil,