Supports AppAuth whether built as a module or not.

google · May 25, 2017 · 6dd4245 · 6dd4245
1 parent 780f6a9
commit 6dd4245
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 11 deletions.
diff --git a/Source/GTMTVAuthorizationRequest.h b/Source/GTMTVAuthorizationRequest.h
@@ -18,7 +18,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "OIDAuthorizationRequest.h"
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
 
 @class GTMTVServiceConfiguration;
 

diff --git a/Source/GTMTVAuthorizationRequest.m b/Source/GTMTVAuthorizationRequest.m
@@ -18,8 +18,13 @@
 
 #import "GTMTVAuthorizationRequest.h"
 
-#import "OIDScopeUtilities.h"
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#import <AppAuth/OIDURLQueryComponent.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
 #import "OIDURLQueryComponent.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
 #import "GTMTVServiceConfiguration.h"
 
 @implementation GTMTVAuthorizationRequest

diff --git a/Source/GTMTVAuthorizationResponse.h b/Source/GTMTVAuthorizationResponse.h
@@ -18,7 +18,11 @@
 
 #import <Foundation/Foundation.h>
 
-#import "OIDAuthorizationResponse.h"
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
 
 @class GTMTVAuthorizationRequest;
 @class OIDTokenRequest;

diff --git a/Source/GTMTVAuthorizationResponse.m b/Source/GTMTVAuthorizationResponse.m
@@ -19,10 +19,16 @@
 #import "GTMTVAuthorizationResponse.h"
 
 #import "GTMTVAuthorizationRequest.h"
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#import <AppAuth/OIDDefines.h>
+#import <AppAuth/OIDFieldMapping.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
 #import "OIDDefines.h"
-#import "OIDError.h"
 #import "OIDFieldMapping.h"
-#import "OIDTokenRequest.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
+
 
 NSString *const GTMTVDeviceTokenGrantType = @"http://oauth.net/grant_type/device/1.0";
 

diff --git a/Source/GTMTVAuthorizationService.m b/Source/GTMTVAuthorizationService.m
@@ -18,11 +18,16 @@
 
 #import "GTMTVAuthorizationService.h"
 
-#import "OIDAuthState.h"
-#import "OIDAuthorizationService.h"
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#import <AppAuth/OIDDefines.h>
+#import <AppAuth/OIDURLQueryComponent.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
 #import "OIDDefines.h"
-#import "OIDErrorUtilities.h"
 #import "OIDURLQueryComponent.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
+
 #import "GTMAppAuthFetcherAuthorization.h"
 #import "GTMTVAuthorizationRequest.h"
 #import "GTMTVAuthorizationResponse.h"

diff --git a/Source/GTMTVServiceConfiguration.h b/Source/GTMTVServiceConfiguration.h
@@ -16,7 +16,11 @@
         limitations under the License.
  */
 
-#import "OIDServiceConfiguration.h"
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Source/GTMTVServiceConfiguration.m b/Source/GTMTVServiceConfiguration.m
@@ -18,9 +18,13 @@
 
 #import "GTMTVServiceConfiguration.h"
 
+#ifndef GTMAPPAUTH_USER_IMPORTS
+#import <AppAuth/AppAuth.h>
+#import <AppAuth/OIDDefines.h>
+#else // GTMAPPAUTH_USER_IMPORTS
+#import "AppAuth.h"
 #import "OIDDefines.h"
-#import "OIDErrorUtilities.h"
-#import "OIDServiceDiscovery.h"
+#endif // GTMAPPAUTH_USER_IMPORTS
 
 /*! @brief The key for the @c TVAuthorizationEndpoint property.
  */