fix: podfile source path. feat: add protocol for managing auth flow session and calling on id instance conforming to UIApplicationDelegate in order to get reference to rootViewController

Author: hakonk

ios/RNAppAuth.h

@@ -1,11 +1,6 @@
-
-#if __has_include("RCTBridgeModule.h")
-#import "RCTBridgeModule.h"
-#else
 #import <React/RCTBridgeModule.h>
-#endif
 
 @interface RNAppAuth : NSObject <RCTBridgeModule>
 
 @end
-  
+  

ios/RNAppAuth.m

@@ -1,9 +1,8 @@
-
 #import "RNAppAuth.h"
 #import <AppAuth/AppAuth.h>
 #import <React/RCTLog.h>
 #import <React/RCTConvert.h>
-#import "AppDelegate.h"
+#import "RNAppAuthAuthorizationFlowManager.h"
 
 @implementation RNAppAuth
 
@@ -36,15 +35,15 @@ - (dispatch_queue_t)methodQueue
                     additionalParameters: additionalParameters
                                  resolve: resolve
                                   reject: reject];
-
+        
     } else {
         [OIDAuthorizationService discoverServiceConfigurationForIssuer:[NSURL URLWithString:issuer]
                                                             completion:^(OIDServiceConfiguration *_Nullable configuration, NSError *_Nullable error) {
                                                                 if (!configuration) {
                                                                     reject(@"RNAppAuth Error", [error localizedDescription], error);
                                                                     return;
                                                                 }
-
+                                                                
                                                                 [self authorizeWithConfiguration: configuration
                                                                                      redirectUrl: redirectUrl
                                                                                         clientId: clientId
@@ -73,15 +72,15 @@ - (dispatch_queue_t)methodQueue
     if (serviceConfiguration) {
         OIDServiceConfiguration *configuration = [self createServiceConfiguration:serviceConfiguration];
         [self refreshWithConfiguration: configuration
-                             redirectUrl: redirectUrl
-                                clientId: clientId
-                            clientSecret: clientSecret
-                            refreshToken: refreshToken
-                                  scopes: scopes
-                    additionalParameters: additionalParameters
-                                 resolve: resolve
-                                  reject: reject];
-
+                           redirectUrl: redirectUrl
+                              clientId: clientId
+                          clientSecret: clientSecret
+                          refreshToken: refreshToken
+                                scopes: scopes
+                  additionalParameters: additionalParameters
+                               resolve: resolve
+                                reject: reject];
+        
     } else {
         // otherwise hit up the discovery endpoint
         [OIDAuthorizationService discoverServiceConfigurationForIssuer:[NSURL URLWithString:issuer]
@@ -111,13 +110,13 @@ - (OIDServiceConfiguration *) createServiceConfiguration: (NSDictionary *) servi
     NSURL *authorizationEndpoint = [NSURL URLWithString: [serviceConfiguration objectForKey:@"authorizationEndpoint"]];
     NSURL *tokenEndpoint = [NSURL URLWithString: [serviceConfiguration objectForKey:@"tokenEndpoint"]];
     NSURL *registrationEndpoint = [NSURL URLWithString: [serviceConfiguration objectForKey:@"registrationEndpoint"]];
-
+    
     OIDServiceConfiguration *configuration =
     [[OIDServiceConfiguration alloc]
      initWithAuthorizationEndpoint:authorizationEndpoint
      tokenEndpoint:tokenEndpoint
      registrationEndpoint:registrationEndpoint];
-
+    
     return configuration;
 }
 
@@ -142,12 +141,11 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
                                                redirectURL:[NSURL URLWithString:redirectUrl]
                                               responseType:OIDResponseTypeCode
                                       additionalParameters:additionalParameters];
-
-
+    
     // performs authentication request
-    AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
-
-    appDelegate.currentAuthorizationFlow =
+    id<UIApplicationDelegate, RNAppAuthAuthorizationFlowManager> appDelegate = (id<UIApplicationDelegate, RNAppAuthAuthorizationFlowManager>)[UIApplication sharedApplication].delegate;
+    
+    id<OIDAuthorizationFlowSession> currentSession =
     [OIDAuthState authStateByPresentingAuthorizationRequest:request
                                    presentingViewController:appDelegate.window.rootViewController
                                                    callback:^(OIDAuthState *_Nullable authState,
@@ -157,8 +155,15 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
                                                        } else {
                                                            reject(@"RNAppAuth Error", [error localizedDescription], error);
                                                        }
-
+                                                       
                                                    }]; // end [OIDAuthState authStateByPresentingAuthorizationRequest:request
+    if ([[appDelegate class] conformsToProtocol:@protocol(RNAppAuthAuthorizationFlowManager)]
+        && [appDelegate respondsToSelector: @selector(setCurrentAuthorizationFlowSession:)]) {
+        [appDelegate setCurrentAuthorizationFlowSession:currentSession];
+    } else {
+        [NSException raise:@"RNAppAuth Missing protocol conformance"
+                    format:@"%@ does not conform to RNAppAuthAuthorizationFlowManager", appDelegate];
+    }
 }
 
 
@@ -174,7 +179,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
             additionalParameters: (NSDictionary *_Nullable) additionalParameters
                          resolve:(RCTPromiseResolveBlock) resolve
                           reject: (RCTPromiseRejectBlock)  reject {
-
+    
     OIDTokenRequest *tokenRefreshRequest =
     [[OIDTokenRequest alloc] initWithConfiguration:configuration
                                          grantType:@"refresh_token"
@@ -186,7 +191,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
                                       refreshToken:refreshToken
                                       codeVerifier:nil
                               additionalParameters:additionalParameters];
-
+    
     [OIDAuthorizationService performTokenRequest:tokenRefreshRequest
                                         callback:^(OIDTokenResponse *_Nullable response,
                                                    NSError *_Nullable error) {
@@ -196,7 +201,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
                                                 reject(@"RNAppAuth Error", [error localizedDescription], error);
                                             }
                                         }];
-
+    
 }
 
 /*
@@ -207,7 +212,7 @@ - (NSDictionary*)formatResponse: (OIDTokenResponse*) response {
     dateFormat.timeZone = [NSTimeZone timeZoneWithAbbreviation: @"UTC"];
     [dateFormat setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
     [dateFormat setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss'Z'"];
-
+    
     return @{@"accessToken": response.accessToken ? response.accessToken : @"",
              @"accessTokenExpirationDate": response.accessTokenExpirationDate ? [dateFormat stringFromDate:response.accessTokenExpirationDate] : @"",
              @"additionalParameters": response.additionalParameters,

ios/RNAppAuth.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.author             = { "author" => "[email protected]" }
   s.platform     = :ios, "7.0"
   s.source       = { :git => "https://github.com/FormidableLabs/react-native-app-auth.git", :tag => "master" }
-  s.source_files  = "RNAppAuth/**/*.{h,m}"
+  s.source_files  = "**/*.{h,m}"
   s.requires_arc = true
 
   s.dependency "React"

ios/RNAppAuth.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libRNAppAuth.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNAppAuth.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		19C8EE5020E3796B00C4D522 /* RNAppAuthAuthorizationFlowManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNAppAuthAuthorizationFlowManager.h; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* RNAppAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNAppAuth.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RNAppAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNAppAuth.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -52,6 +53,7 @@
 			children = (
 				B3E7B5881CC2AC0600A0062D /* RNAppAuth.h */,
 				B3E7B5891CC2AC0600A0062D /* RNAppAuth.m */,
+				19C8EE5020E3796B00C4D522 /* RNAppAuthAuthorizationFlowManager.h */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -204,7 +206,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
-				"$(inherited)",
+					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",

ios/RNAppAuthAuthorizationFlowManager.h

@@ -0,0 +1,7 @@
+#import <Foundation/Foundation.h>
+#import <AppAuth/AppAuth.h>
+
+@protocol RNAppAuthAuthorizationFlowManager <NSObject>
+@required
+-(void)setCurrentAuthorizationFlowSession:(id<OIDAuthorizationFlowSession>)session;
+@end