Merge pull request #151 from hakonk/refactor/auth-session-handling

Uniform auth session handling (iOS)

Author: kadikraman

Example/ios/AppAuthExample/AppDelegate.h

@@ -8,8 +8,10 @@
  */
 
 #import <UIKit/UIKit.h>
+#import <RNAppAuth/RNAppAuthAuthorizationFlowManager.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, RNAppAuthAuthorizationFlowManager>
 @property (nonatomic, strong, nullable) UIWindow *window;
+@property(nonatomic, weak)id<RNAppAuthAuthorizationFlowManagerDelegate>authorizationFlowManagerDelegate;
 @end
 

Example/ios/AppAuthExample/AppDelegate.m

@@ -10,20 +10,9 @@
 #import "AppDelegate.h"
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
-#import <AppAuth/AppAuth.h>
-#import <RNAppAuth/RNAppAuthAuthorizationFlowManager.h>
-
-@interface AppDelegate()<RNAppAuthAuthorizationFlowManager> {
-  id <OIDAuthorizationFlowSession> _currentSession;
-}
-@end
 
 @implementation AppDelegate
 
--(void)setCurrentAuthorizationFlowSession:(id<OIDAuthorizationFlowSession>)session {
-  _currentSession = session;
-}
-
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
@@ -45,9 +34,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 }
 
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
-  BOOL shouldOpenUrl = [_currentSession resumeAuthorizationFlowWithURL:url];
-  _currentSession = nil;
-  return shouldOpenUrl;
+  return [self.authorizationFlowManagerDelegate resumeExternalUserAgentFlowWithURL:url];
 }
 
 @end

README.md

@@ -213,7 +213,7 @@ AppAuth supports three options for dependency management.
 
        pod 'AppAuth', '>= 0.94'
 
-   Then run `pod install`. Note that version 0.91 is the first of the library to support iOS 11.
+   Then run `pod install`. Note that version 0.94 is the first of the library to support iOS 11.
 
 2. **Carthage**
 
@@ -265,58 +265,39 @@ authorization flow from the redirect. Follow these steps:
 
 `RNAppAuth` will call on the given app's delegate via `[UIApplication sharedApplication].delegate`.
 Furthermore, `RNAppAuth` expects the delegate instance to conform to the protocol `RNAppAuthAuthorizationFlowManager`.
-Make `AppDelegate` conform to `RNAppAuthAuthorizationFlowManager`:
+Make `AppDelegate` conform to `RNAppAuthAuthorizationFlowManager` with the following changes to `AppDelegate.h`:
 
 ```diff
-+ // Depending on build configurations, import either with:
-+@import RNAppAuth;
-+ // or:
-+import <AppAuth/AppAuth.h>
-+import "RNAppAuthAuthorizationFlowManager.h"
-
-+ @interface AppDelegate()<RNAppAuthAuthorizationFlowManager> {
-+  id <OIDAuthorizationFlowSession> _currentSession;
-+ }
-+ @end
-```
-
-Implement the required method of `RNAppAuthAuthorizationFlowManager` in `AppDelegate`:
-
-```diff
-+ -(void)setCurrentAuthorizationFlowSession:(id<OIDAuthorizationFlowSession>)session {
-+    // retain session for further use
-+    _currentSession = session;
-+ }
++#import <RNAppAuth/RNAppAuthAuthorizationFlowManager.h>
++@interface AppDelegate : UIResponder <UIApplicationDelegate, RNAppAuthAuthorizationFlowManager>
++@property(nonatomic, weak)id<RNAppAuthAuthorizationFlowManagerDelegate>authorizationFlowManagerDelegate;
 ```
 
 The authorization response URL is returned to the app via the iOS openURL app delegate method, so
 you need to pipe this through to the current authorization session (created in the previous
-instruction). Thus, implement the following method from `UIApplicationDelegate` in `AppDelegate`:
+instruction). Thus, implement the following method from `UIApplicationDelegate` in `AppDelegate.m`:
 
 ```diff
 + - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
-+   BOOL shouldOpenUrl = [_currentSession resumeAuthorizationFlowWithURL:url];
-+   _currentSession = nil;
-+   return shouldOpenUrl;
++ return return [self.authorizationFlowManagerDelegate resumeExternalUserAgentFlowWithURL:url];
 + }
 ```
 
 #### Integration of the library with a Swift iOS project
 
 The approach mentioned above should also be possible to employ with Swift. In this case one should have to import `RNAppAuth`
 and make `AppDelegate` conform to `RNAppAuthAuthorizationFlowManager`. Note that this has not been tested.
-`AppDelegate` should look something like this:
+`AppDelegate.swift` should look something like this:
 
 ```swift
 @import RNAppAuth
 class AppDelegate: UIApplicationDelegate, RNAppAuthAuthorizationFlowManager {
-  private var currentAuthorizationFlow: OIDAuthorizationFlowSession?
+  public weak var authorizationFlowManagerDelegate: RNAppAuthAuthorizationFlowManagerDelegate?
   func application(
       _ app: UIApplication,
       open url: URL,
       options: [UIApplicationOpenURLOptionsKey: Any] = [:]) -> Bool {
-      defer { currentAuthorizationFlow = nil }
-      return currentAuthorizationFlow?.resumeAuthorizationFlow(with: url) ?? false
+      return authorizationFlowManagerDelegate?.resumeExternalUserAgentFlowWithURL(with: url) ?? false
   }
 }
 ```

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