Rollback the EnterpriseUserAgent target. (openid#693)

visma-ios-if · Mar 18, 2022 · 6f48321 · 6f48321
1 parent ac3e1e0
commit 6f48321
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 464 deletions.
diff --git a/AppAuth.podspec b/AppAuth.podspec
@@ -62,13 +62,6 @@ It follows the OAuth 2.0 for Native Apps best current practice
     externalUserAgent.osx.weak_frameworks   = "AuthenticationServices"
   end
 
-  s.subspec 'EnterpriseUserAgent' do |enterpriseUserAgent|
-    enterpriseUserAgent.dependency 'AppAuth/Core'
-
-    enterpriseUserAgent.ios.source_files = "Source/AppAuthEnterpriseUserAgent.h", "Source/AppAuthEnterpriseUserAgent/iOS/**/*.{h,m}"
-    enterpriseUserAgent.ios.deployment_target = "7.0"
-  end
-
   # Subspec for the full AppAuth library, including platform-dependant external user agents.
   s.subspec 'TV' do |tv|
     tv.source_files = "Source/AppAuthTV.h", "Source/AppAuthTV/*.{h,m}"

diff --git a/AppAuth.xcodeproj/project.pbxproj b/AppAuth.xcodeproj/project.pbxproj
diff --git a/AppAuth.xcodeproj/xcshareddata/xcschemes/AppAuthEnterpriseUserAgent.xcscheme b/AppAuth.xcodeproj/xcshareddata/xcschemes/AppAuthEnterpriseUserAgent.xcscheme
diff --git a/Package.swift b/Package.swift
@@ -35,9 +35,6 @@ let package = Package(
         .library(
             name: "AppAuth",
             targets: ["AppAuth"]),
-        .library(
-	        name: "AppAuthEnterpriseUserAgent",
-	        targets: ["AppAuthEnterpriseUserAgent"]),
         .library(
             name: "AppAuthTV",
             targets: ["AppAuthTV"])
@@ -61,16 +58,6 @@ let package = Package(
                 .headerSearchPath("macOS/LoopbackHTTPServer"),
             ]
         ),
-        .target(
-            name: "AppAuthEnterpriseUserAgent",
-            dependencies: ["AppAuthCore"],
-            path: "Source/AppAuthEnterpriseUserAgent",
-            sources: ["iOS"],
-            publicHeadersPath: "",
-            cSettings: [
-                .headerSearchPath("iOS"),
-            ]
-        ),
         .target(
             name: "AppAuthTV",
             dependencies: ["AppAuthCore"],

diff --git a/README.md b/README.md
@@ -631,24 +631,6 @@ try, or use as a reference for your own implementation. One of them,
 enables you to use a different browser for authentication, like Chrome for iOS
 or Firefox for iOS.
 
-##### CocoaPods
-Include the `EnterpriseUserAgent` subspec alongside any pods/subspecs you were already using, e.g.:
-```
-	pod 'AppAuth'
-	pod 'AppAuth/EnterpriseUserAgent'
-```
-
-Make sure to import `AppAuthEnterpriseUserAgent.h` in addition to `AppAuth.h` if you are using the full `AppAuth` functionality.
-
-##### Carthage
-Use the `AppAuthEnterpriseUserAgent` framework, which includes all the headers of the `AppAuth` framework.
-Make sure to import `<AppAuthEnterpriseUserAgent/AppAuthEnterpriseUserAgent.h>`. This includes all the files included by AppAuth/AppAuthCore, so only this import is necessary.
-
-##### Swift Package Manager
-Include the `AppAuthEnterpriseUserAgent` target alongside any targets you were already using.
-
-Make sure to import `AppAuthEnterpriseUserAgent.h` in addition to `AppAuth.h` if you are using the full `AppAuth` functionality.
-
 Here's how to configure AppAuth to use a custom browser using the
 `OIDExternalUserAgentIOSCustomBrowser` user agent:
 
@@ -669,9 +651,6 @@ This is required so that AppAuth can test for the browser and open the app store
 if it's not installed (the default behavior of this user-agent). You only need
 to include the URL scheme of the actual browser you intend to use.
 
-Next, make sure to import the correct header file.
-If using CocoaPods/Swift Package manager, make sure to import AppAuthEnterpriseUserAgent alongside AppAuth/AppAuthCore.
-
 <sub>Objective-C</sub>
 ```objc
 // performs authentication request

diff --git a/Source/AppAuth.h b/Source/AppAuth.h
@@ -49,6 +49,7 @@
 #import "OIDAuthState+IOS.h"
 #import "OIDAuthorizationService+IOS.h"
 #import "OIDExternalUserAgentIOS.h"
+#import "OIDExternalUserAgentIOSCustomBrowser.h"
 #import "OIDExternalUserAgentCatalyst.h"
 #elif TARGET_OS_OSX
 #import "OIDAuthState+Mac.h"

diff --git a/...OS/OIDExternalUserAgentIOSCustomBrowser.h → ...OS/OIDExternalUserAgentIOSCustomBrowser.h b/...OS/OIDExternalUserAgentIOSCustomBrowser.h → ...OS/OIDExternalUserAgentIOSCustomBrowser.h
diff --git a/...OS/OIDExternalUserAgentIOSCustomBrowser.m → ...OS/OIDExternalUserAgentIOSCustomBrowser.m b/...OS/OIDExternalUserAgentIOSCustomBrowser.m → ...OS/OIDExternalUserAgentIOSCustomBrowser.m
diff --git a/Source/AppAuthEnterpriseUserAgent.h b/Source/AppAuthEnterpriseUserAgent.h
diff --git a/Source/EnterpriseUserAgentFramework/AppAuthEnterpriseUserAgent.h b/Source/EnterpriseUserAgentFramework/AppAuthEnterpriseUserAgent.h
diff --git a/Source/EnterpriseUserAgentFramework/Info.plist b/Source/EnterpriseUserAgentFramework/Info.plist
diff --git a/Source/Framework/AppAuth.h b/Source/Framework/AppAuth.h
@@ -57,6 +57,7 @@ FOUNDATION_EXPORT const unsigned char AppAuthVersionString[];
 #import <AppAuth/OIDAuthState+IOS.h>
 #import <AppAuth/OIDAuthorizationService+IOS.h>
 #import <AppAuth/OIDExternalUserAgentIOS.h>
+#import <AppAuth/OIDExternalUserAgentIOSCustomBrowser.h>
 #import "AppAuth/OIDExternalUserAgentCatalyst.h"
 #elif TARGET_OS_OSX
 #import <AppAuth/OIDAuthState+Mac.h>