[CRD iOS] Refactor an interface for RemotingAuthorization

remoting/ios/app/app_delegate.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #import "remoting/ios/app/app_delegate.h"
 
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #import "remoting/ios/app/app_view_controller.h"
 #import "remoting/ios/app/remoting_view_controller.h"
-#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_oauth_authentication.h"
 #import "remoting/ios/facade/remoting_service.h"
 
 @interface AppDelegate () {
   AppViewController* _appViewController;
 }
 @end
 
 @implementation AppDelegate
 
 @synthesize window = _window;
 
 - (BOOL)application:(UIApplication*)application
     willFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
   self.window =
       [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
   self.window.backgroundColor = [UIColor whiteColor];
+  _appViewController = [[AppViewController alloc] init];
+  [[RemotingService SharedInstance]
+      setAuthentication:_appViewController.authentication];

[nicholss, 2017/06/21 21:31:06]

This feels backwards to me. The view controller should not setup the
authentication and then set the service, the service should have this set and
then the app view controller should always use the service's authentication
object. I realized you are doing this because this is the hook we have to set
differences between chromium and private but still seems wrong. 

Maybe we do need a private vs chromium main.mm to help us inject things into the
singletons.

[Yuwei, 2017/06/21 22:44:15]

Done. It's now injected in the main function.

   return YES;
 }
 
 - (BOOL)application:(UIApplication*)application
     didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
   [self launchRemotingViewController];
   return YES;
 }
 
 - (BOOL)application:(UIApplication*)application handleOpenURL:(NSURL*)url {
+  if (![_appViewController.authentication

[nicholss, 2017/06/21 21:31:06]

Could it be cleaner to wrap this method in something that means #ifdef
chromium_build rather than typechecking the auth provider?

[Yuwei, 2017/06/21 22:44:15]

Done. Use marco here. I put the DCHECK here just to be safe.

+          isKindOfClass:[RemotingOAuthAuthentication class]]) {
+    NSLog(@"OAuth authentication is not supported.");
+    return NO;
+  }
+
   NSMutableDictionary* components = [[NSMutableDictionary alloc] init];
   NSArray* urlComponents = [[url query] componentsSeparatedByString:@"&"];
 
   for (NSString* componentPair in urlComponents) {
     NSArray* pair = [componentPair componentsSeparatedByString:@"="];
     NSString* key = [[pair firstObject] stringByRemovingPercentEncoding];
     NSString* value = [[pair lastObject] stringByRemovingPercentEncoding];
     [components setObject:value forKey:key];
   }
   NSString* authorizationCode = [components objectForKey:@"code"];
 
-  [[RemotingService SharedInstance].authentication
+  [(RemotingOAuthAuthentication*)_appViewController.authentication
       authenticateWithAuthorizationCode:authorizationCode];
 
   [self launchRemotingViewController];
   return YES;
 }
 
 #pragma mark - Public
 - (void)showMenuAnimated:(BOOL)animated {
   DCHECK(_appViewController != nil);
   [_appViewController showMenuAnimated:animated];
@@ skipping 15 matching lines @@
   return (AppDelegate*)UIApplication.sharedApplication.delegate;
 }
 
 #pragma mark - Private
 
 - (void)launchRemotingViewController {
   RemotingViewController* vc = [[RemotingViewController alloc] init];
   UINavigationController* navController =
       [[UINavigationController alloc] initWithRootViewController:vc];
   navController.navigationBarHidden = true;
-
-  _appViewController =
-      [[AppViewController alloc] initWithMainViewController:navController];
+  _appViewController.mainViewController = navController;
   self.window.rootViewController = _appViewController;
   [self.window makeKeyAndVisible];
 }
 
 @end