refactor: handle auth session from within RNAppAuth instance. Make use of delegate pattern for handling application:openURL:options:

Author: hakonk

ios/RNAppAuth.m

@@ -4,8 +4,17 @@
 #import <React/RCTConvert.h>
 #import "RNAppAuthAuthorizationFlowManager.h"
 
+@interface RNAppAuth()<RNAppAuthAuthorizationFlowManagerDelegate> {
+    id<OIDExternalUserAgentSession> _currentSession;
+}
+@end
+
 @implementation RNAppAuth
 
+-(BOOL)resumeExternalUserAgentFlowWithURL:(NSURL *)url {
+    return [_currentSession resumeExternalUserAgentFlowWithURL:url];
+}
+
 - (dispatch_queue_t)methodQueue
 {
     return dispatch_get_main_queue();
@@ -141,26 +150,24 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
 
     // performs authentication request
     id<UIApplicationDelegate, RNAppAuthAuthorizationFlowManager> appDelegate = (id<UIApplicationDelegate, RNAppAuthAuthorizationFlowManager>)[UIApplication sharedApplication].delegate;
-
-    id<OIDAuthorizationFlowSession> currentSession =
-    [OIDAuthState authStateByPresentingAuthorizationRequest:request
+    if (![[appDelegate class] conformsToProtocol:@protocol(RNAppAuthAuthorizationFlowManager)]) {
+        [NSException raise:@"RNAppAuth Missing protocol conformance"
+                    format:@"%@ does not conform to RNAppAuthAuthorizationFlowManager", appDelegate];
+    }
+    appDelegate.authorizationFlowManagerDelegate = self;
+    __weak typeof(self) weakSelf = self;
+    _currentSession = [OIDAuthState authStateByPresentingAuthorizationRequest:request
                                    presentingViewController:appDelegate.window.rootViewController
                                                    callback:^(OIDAuthState *_Nullable authState,
                                                               NSError *_Nullable error) {
+                                                       typeof(self) strongSelf = weakSelf;
+                                                       strongSelf->_currentSession = nil;
                                                        if (authState) {
                                                            resolve([self formatResponse:authState.lastTokenResponse]);
                                                        } 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];
-    }
 }
 
 

ios/RNAppAuth.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "AppAuth"
+  s.dependency "AppAuth", "0.94.0"
 end

ios/RNAppAuthAuthorizationFlowManager.h

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

ios/RNAppAuthAuthorizationFlowManagerDelegate.h

@@ -0,0 +1,6 @@
+#import <Foundation/Foundation.h>
+
+@protocol RNAppAuthAuthorizationFlowManagerDelegate <NSObject>
+@required
+-(BOOL)resumeExternalUserAgentFlowWithURL:(NSURL *)url;
+@end