Change Authentication Handler options to incorporate provider options

Vikas Dadheech · Vikas Dadheech · commit 82ef6371b406 · 2019-04-30T14:31:57.000+05:30
diff --git a/MSGraphClientSDK/MSGraphClientSDK/Authentication/MSAuthenticationProvider.h b/MSGraphClientSDK/MSGraphClientSDK/Authentication/MSAuthenticationProvider.h
@@ -3,6 +3,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "MSAuthenticationProviderOptions.h"
 
 typedef void(^MSAuthenticationCompletion)(NSMutableURLRequest *request, NSError *error);
 
@@ -14,9 +15,10 @@ typedef void(^MSAuthenticationCompletion)(NSMutableURLRequest *request, NSError
 
 /**
  Gets the access token. This method should be implemented by a class which should provide the capability of providing the access token.
+ @param authProviderOptions Options which can be used to control the behaviour of AuthenticationProvider
  @param completion The completion handler to be called when access token or an error can be returned.
  */
 
-- (void) getAccessTokenWithCompletion:(void (^)(NSString *accessToken, NSError *error))completion;
+- (void) getAccessTokenForProviderOptions:(id<MSAuthenticationProviderOptions>)authProviderOptions andCompletion:(void (^)(NSString *accessToken, NSError *error))completion;
 
 @end
diff --git a/MSGraphClientSDK/MSGraphClientSDK/HTTPClient/MSClientFactory.m b/MSGraphClientSDK/MSGraphClientSDK/HTTPClient/MSClientFactory.m
@@ -8,9 +8,6 @@
 #import "MSMiddlewareFactory.h"
 #import "MSRedirectHandler.h"
 #import "MSRetryHandler.h"
-#import "MSAuthenticationHandlerOptions.h"
-#import "MSRedirectHandlerOptions.h"
-#import "MSRetryHandlerOptions.h"
 
 @implementation MSClientFactory
 
@@ -21,10 +18,11 @@ +(MSHTTPClient *)createHTTPClientWithAuthenticationProvider:(id<MSAuthentication
     //Creating a default chain of middlewares starting from Authentication
 
     //Initializing different default middlewares
-    MSAuthenticationHandler *authenticationHandler = (MSAuthenticationHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeAuthentication withOptions:[[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:authenticationProvider]];
-    MSRedirectHandler *redirectHandler = (MSRedirectHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRedirect withOptions:[[MSRedirectHandlerOptions alloc] init]];
-    MSRetryHandler *retryHandler = (MSRetryHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRetry withOptions:[[MSRetryHandlerOptions alloc] init]];
-    MSURLSessionManager *sessionManager = (MSURLSessionManager *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeHTTP withOptions:nil];
+    MSAuthenticationHandler *authenticationHandler = (MSAuthenticationHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeAuthentication];
+    authenticationHandler.authenticationProvider = authenticationProvider;
+    MSRedirectHandler *redirectHandler = (MSRedirectHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRedirect];
+    MSRetryHandler *retryHandler = (MSRetryHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRetry];
+    MSURLSessionManager *sessionManager = (MSURLSessionManager *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeHTTP];
     //Creating a default chain
     [authenticationHandler setNext:redirectHandler];
     [redirectHandler setNext:retryHandler];
@@ -41,9 +39,10 @@ +(MSHTTPClient *)createHTTPClientWithAuthenticationProvider:(id<MSAuthentication
     //Creating a default chain of middlewares starting from Authentication
 
     //Initializing different default middlewares
-    MSAuthenticationHandler *authenticationHandler = (MSAuthenticationHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeAuthentication withOptions:[[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:authenticationProvider]];
-    MSRedirectHandler *redirectHandler = (MSRedirectHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRedirect withOptions:[[MSRedirectHandlerOptions alloc] init]];
-    MSRetryHandler *retryHandler = (MSRetryHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRetry withOptions:[[MSRetryHandlerOptions alloc] init]];
+    MSAuthenticationHandler *authenticationHandler = (MSAuthenticationHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeAuthentication];
+    authenticationHandler.authenticationProvider = authenticationProvider;
+    MSRedirectHandler *redirectHandler = (MSRedirectHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRedirect];
+    MSRetryHandler *retryHandler = (MSRetryHandler *)[MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRetry];
     
     //Create session manager with custom session configuration
     MSURLSessionManager *sessionManager = [[MSURLSessionManager alloc] initWithSessionConfiguration:sessionConfiguration];
diff --git a/MSGraphClientSDK/MSGraphClientSDK/HTTPClient/MSMiddlewareFactory.h b/MSGraphClientSDK/MSGraphClientSDK/HTTPClient/MSMiddlewareFactory.h
@@ -4,7 +4,6 @@
 
 #import <Foundation/Foundation.h>
 #import "MSGraphMiddleware.h"
-#import "MSMiddlewareOptions.h"
 
 @interface MSMiddlewareFactory : NSObject
 
@@ -24,6 +23,6 @@ typedef NS_ENUM(NSInteger, MSMiddlewareType)
  @param middlewareType Type of middleware which this method will create
  @return The middleware object of given type.
  */
-+(id<MSGraphMiddleware>)createMiddleware:(MSMiddlewareType)middlewareType withOptions:(id<MSMiddlewareOptions>)middlewareOptions;
++(id<MSGraphMiddleware>)createMiddleware:(MSMiddlewareType)middlewareType;
 
 @end
diff --git a/MSGraphClientSDK/MSGraphClientSDK/HTTPClient/MSMiddlewareFactory.m b/MSGraphClientSDK/MSGraphClientSDK/HTTPClient/MSMiddlewareFactory.m
@@ -10,7 +10,7 @@
 
 @implementation MSMiddlewareFactory
 
-+(id<MSGraphMiddleware>)createMiddleware:(MSMiddlewareType)middlewareType withOptions:(id<MSMiddlewareOptions>)middlewareOptions
++(id<MSGraphMiddleware>)createMiddleware:(MSMiddlewareType)middlewareType
 {
     switch (middlewareType)
     {
@@ -21,37 +21,19 @@ @implementation MSMiddlewareFactory
         }
         case MSMiddlewareTypeRedirect:
         {
-            MSRedirectHandler *redirectHandler;
-            if(middlewareOptions)
-            {
-                redirectHandler = [[MSRedirectHandler alloc] initWithOptions:(MSRedirectHandlerOptions *)middlewareOptions];
-            }else{
-                redirectHandler = [[MSRedirectHandler alloc] init];
-            }
+            MSRedirectHandler *redirectHandler = [[MSRedirectHandler alloc] init];
             return redirectHandler;
         }
-        case MSMiddlewareTypeRetry:
-        {
-            MSRetryHandler *retryHandler;
-            if(middlewareOptions)
-            {
-                retryHandler = [[MSRetryHandler alloc] initWithOptions:(MSRetryHandlerOptions *)middlewareOptions];
-            }else{
-                retryHandler = [[MSRetryHandler alloc] init];
-            }
-            return retryHandler;
-        }
         case MSMiddlewareTypeAuthentication:
         {
-            MSAuthenticationHandler *authenticationHandler;
-            if(middlewareOptions)
-            {
-                authenticationHandler = [[MSAuthenticationHandler alloc] initWithOptions:(MSAuthenticationHandlerOptions *)middlewareOptions];
-            }else{
-                authenticationHandler = [[MSAuthenticationHandler alloc] init];
-            }
+            MSAuthenticationHandler *authenticationHandler = [[MSAuthenticationHandler alloc] init];
             return authenticationHandler;
         }
+        case MSMiddlewareTypeRetry:
+        {
+            MSRetryHandler *retryHandler = [[MSRetryHandler alloc] init];
+            return retryHandler;
+        }
         default:
             break;
     }
diff --git a/MSGraphClientSDK/MSGraphClientSDK/Middleware/Implementations/Authentication/MSAuthenticationHandler.h b/MSGraphClientSDK/MSGraphClientSDK/Middleware/Implementations/Authentication/MSAuthenticationHandler.h
@@ -6,12 +6,20 @@
 #import "MSAuthenticationProvider.h"
 #import "MSGraphMiddleware.h"
 
-@class MSAuthenticationHandlerOptions;
+/*
+ This class provides the mechanism to communicate with authentication provider. It is implmented as a middleware so it will be called during the execution of network calls.
+ */
 
 @interface MSAuthenticationHandler : NSObject<MSGraphMiddleware>
 
-@property (nonatomic, strong, readonly) MSAuthenticationHandlerOptions *authHandlerOptions;
+//Authentication provider which will be used to get access token
+@property (nonatomic, strong) id<MSAuthenticationProvider> authenticationProvider;
 
-- (instancetype)initWithOptions:(MSAuthenticationHandlerOptions *)authHandlerOptions;
+/*
+ This method creates and returns an instance of MSAuthenticationHandler
+ @param authProvider Authentication Provider instance
+ @return An instance of MSAuthenticationHandler
+ */
+- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider;
 
 @end
diff --git a/MSGraphClientSDK/MSGraphClientSDK/Middleware/Implementations/Authentication/MSAuthenticationHandler.m b/MSGraphClientSDK/MSGraphClientSDK/Middleware/Implementations/Authentication/MSAuthenticationHandler.m
@@ -21,24 +21,28 @@ @interface MSAuthenticationHandler()
 
 @implementation MSAuthenticationHandler
 
-- (instancetype)initWithOptions:(MSAuthenticationHandlerOptions *)authHandlerOptions
+- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider
 {
     self = [super init];
     if(self)
     {
-        _authHandlerOptions = authHandlerOptions;
+        _authenticationProvider = authProvider;
     }
     return self;
 }
 
+- (void)setAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider
+{
+    _authenticationProvider = authProvider;
+}
+
 - (void)execute:(MSURLSessionTask *)task withCompletionHandler:(HTTPRequestCompletionHandler)completionHandler
 {
     MSAuthenticationHandlerOptions *authHandlerOptions = [task getMiddlewareOptionWithType:MSMiddlewareOptionsTypeAuth];
-    if(!authHandlerOptions)
-    {
-        authHandlerOptions = _authHandlerOptions;
-    }
-    [authHandlerOptions.authenticationProvider getAccessTokenWithCompletion:^(NSString *accessToken, NSError *error) {
+
+    id<MSAuthenticationProvider> authProvider = authHandlerOptions.authenticationProvider?authHandlerOptions.authenticationProvider:_authenticationProvider;
+
+    [authProvider getAccessTokenForProviderOptions:authHandlerOptions.authenticationProviderOptions andCompletion:^(NSString *accessToken, NSError *error) {
         if(!error)
         {
             NSMutableURLRequest *urlRequest = [task request];
diff --git a/MSGraphClientSDK/MSGraphClientSDK/Middleware/Options/MSAuthenticationHandlerOptions.h b/MSGraphClientSDK/MSGraphClientSDK/Middleware/Options/MSAuthenticationHandlerOptions.h
@@ -5,7 +5,7 @@
 #import <Foundation/Foundation.h>
 #import "MSMiddlewareOptions.h"
 #import "MSAuthenticationProvider.h"
-
+#import "MSAuthenticationProviderOptions.h"
 /*
  This class provides options to control the behaviour of Authentication Handler.
  */
@@ -15,13 +15,16 @@
 /*
   Authentication Provider instance which will be used to authenticate the ongoing requests.
  */
-@property (nonatomic, readonly) id<MSAuthenticationProvider> authenticationProvider;
+@property (nonatomic, strong, readonly) id<MSAuthenticationProvider> authenticationProvider;
+
+@property (nonatomic, strong, readonly) id<MSAuthenticationProviderOptions> authenticationProviderOptions;
 
 /*
  This method initializes an instance of MSAuthenticationHandlerOptions with the provided parameter.
  @param authProvider The authentication provider instance which will be used to authenticate the ongoing requests.
+ @param authProviderOptions The authentication provider options which will be used to control the behaviour of authentication provider being used to authenticate the ongoing requests.
  @return The MSAuthenticationHandlerOptions instance with the provided value.
  */
-- (instancetype)initWithAuthenticationProvider:(nonnull id<MSAuthenticationProvider>)authProvider;
+- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider andAuthProviderOptions:(id<MSAuthenticationProviderOptions>)authProviderOptions;
 
 @end
diff --git a/MSGraphClientSDK/MSGraphClientSDK/Middleware/Options/MSAuthenticationHandlerOptions.m b/MSGraphClientSDK/MSGraphClientSDK/Middleware/Options/MSAuthenticationHandlerOptions.m
@@ -9,13 +9,13 @@ @implementation MSAuthenticationHandlerOptions
 
 @synthesize middlewareOptionsType;
 
-- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider
+- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider andAuthProviderOptions:(id<MSAuthenticationProviderOptions>)authProviderOptions
 {
     self = [super init];
     if(self)
     {
-        NSAssert(authProvider, @"Authentication Provider is requried to authenticate the requests.");
         _authenticationProvider = authProvider;
+        _authenticationProviderOptions = authProviderOptions;
         middlewareOptionsType = MSMiddlewareOptionsTypeAuth;
     }
     return self;
diff --git a/MSGraphClientSDK/MSGraphClientSDKTests/HTTPClient/MSMiddlewareFactoryTests.m b/MSGraphClientSDK/MSGraphClientSDKTests/HTTPClient/MSMiddlewareFactoryTests.m
@@ -23,15 +23,11 @@ - (void)tearDown {
 }
 
 - (void)testCreateMiddlewareMethod {
-    id<MSGraphMiddleware>authHandler = [MSMiddlewareFactory createMiddleware:MSMiddlewareTypeAuthentication withOptions:nil];
-    id<MSGraphMiddleware>httpMiddleware = [MSMiddlewareFactory createMiddleware:MSMiddlewareTypeHTTP withOptions:nil];
-    id<MSGraphMiddleware>retryMiddleware = [MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRetry withOptions:nil];
-    id<MSGraphMiddleware>redirectMiddleware = [MSMiddlewareFactory createMiddleware:MSMiddlewareTypeRedirect withOptions:nil];
-    id<MSGraphMiddleware>randomMiddleware = [MSMiddlewareFactory createMiddleware:4 withOptions:nil];
+    id<MSGraphMiddleware>authHandler = [MSMiddlewareFactory createMiddleware:MSMiddlewareTypeAuthentication];
+    id<MSGraphMiddleware>httpMiddleware = [MSMiddlewareFactory createMiddleware:MSMiddlewareTypeHTTP];
+    id<MSGraphMiddleware>randomMiddleware = [MSMiddlewareFactory createMiddleware:4];
     XCTAssertTrue([authHandler isKindOfClass:[MSAuthenticationHandler class]]);
     XCTAssertTrue([httpMiddleware isKindOfClass:[MSURLSessionManager class]]);
-    XCTAssertTrue([retryMiddleware isKindOfClass:[MSRetryHandler class]]);
-    XCTAssertTrue([redirectMiddleware isKindOfClass:[MSRedirectHandler class]]);
     XCTAssertNil(randomMiddleware);
 }
 
diff --git a/MSGraphClientSDK/MSGraphClientSDKTests/MSGraphWorkloadsTests.m b/MSGraphClientSDK/MSGraphClientSDKTests/MSGraphWorkloadsTests.m
@@ -30,20 +30,19 @@ @implementation MSGraphWorkloadsTests
 
 - (void)setUp {
     [super setUp];
-    OCMStub([self.mockAuthProvider getAccessTokenWithCompletion:[OCMArg any]])
+    OCMStub([self.mockAuthProvider getAccessTokenForProviderOptions:[OCMArg any] andCompletion:[OCMArg any]])
     .andDo(^(NSInvocation *invocation){
         void (^completionHandler)(NSString *accessToken, NSError *error);
-        [invocation getArgument:&completionHandler atIndex:2];
+        [invocation getArgument:&completionHandler atIndex:3];
         completionHandler(@"abcdefg",nil);
     });
      _OKresponse = [[NSHTTPURLResponse alloc] initWithURL:[NSURL URLWithString:MSGraphBaseURL] statusCode:MSExpectedResponseCodesOK HTTPVersion:@"foo" headerFields:nil];
 
     MSURLSessionManager *sessionManager = [[MSURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
     MSRedirectHandler *redirectHandler = [[MSRedirectHandler alloc] init];
     MSRetryHandler *retryHandler = [[MSRetryHandler alloc] init];
-    MSAuthenticationHandlerOptions *options = [[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:self.mockAuthProvider];
 
-    MSAuthenticationHandler *authHandler = [[MSAuthenticationHandler alloc] initWithOptions:options];
+    MSAuthenticationHandler *authHandler = [[MSAuthenticationHandler alloc] initWithAuthenticationProvider:self.mockAuthProvider];
     [authHandler setNext:redirectHandler];
     [redirectHandler setNext:retryHandler];
     [retryHandler setNext:sessionManager];
diff --git a/MSGraphClientSDK/MSGraphClientSDKTests/Middleware/Implementations/MSAuthenticationHandlerTests.m b/MSGraphClientSDK/MSGraphClientSDKTests/Middleware/Implementations/MSAuthenticationHandlerTests.m
@@ -5,7 +5,6 @@
 
 #import <XCTest/XCTest.h>
 #import "MSGraphClientSDKTests.h"
-#import "MSAuthenticationHandlerOptions.h"
 
 @interface MSAuthenticationHandler()
 @property (nonatomic, strong) id<MSGraphMiddleware> nextMiddleware;
@@ -24,8 +23,7 @@ @implementation MSAuthenticationHandlerTests
 
 - (void)setUp {
     [super setUp];
-    MSAuthenticationHandlerOptions *options = [[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:self.mockAuthProvider];
-    self.authenticationHandler = [[MSAuthenticationHandler alloc] initWithOptions:options];
+    self.authenticationHandler = [[MSAuthenticationHandler alloc] initWithAuthenticationProvider:self.mockAuthProvider];
 
     [self.authenticationHandler setNextMiddleware:self.mockHttpProvider];
 
@@ -38,6 +36,18 @@ - (void)tearDown {
     [super tearDown];
 }
 
+- (void)testInit {
+    MSAuthenticationHandler *handler = [[MSAuthenticationHandler alloc] initWithAuthenticationProvider:self.mockAuthProvider];
+    XCTAssertNotNil(handler);
+    XCTAssertEqual(handler.authenticationProvider, self.mockAuthProvider);
+}
+
+- (void)testSetAuthenticationProvider {
+    MSAuthenticationHandler *handler = [[MSAuthenticationHandler alloc] init];
+    [handler setAuthenticationProvider:self.mockAuthProvider];
+    XCTAssertEqual(handler.authenticationProvider, self.mockAuthProvider);
+}
+
 - (void)testExecuteWithSuccessInGettingToken {
     HTTPRequestCompletionHandler requestCompletion = ^(id data, NSURLResponse * _Nullable response, NSError * _Nullable error){
         [self completionBlockCodeInvoked];
@@ -47,10 +57,10 @@ - (void)testExecuteWithSuccessInGettingToken {
         XCTAssertNotNil(data);
     };
     //Mocking auth to provide a test token
-    OCMStub([self.mockAuthProvider getAccessTokenWithCompletion:[OCMArg any]])
+    OCMStub([self.mockAuthProvider getAccessTokenForProviderOptions:[OCMArg any] andCompletion:[OCMArg any]])
     .andDo(^(NSInvocation *invocation){
         void (^completionHandler)(NSString *accessToken, NSError *error);
-        [invocation getArgument:&completionHandler atIndex:2];
+        [invocation getArgument:&completionHandler atIndex:3];
         completionHandler(TestToken,nil);
     });
 
@@ -79,10 +89,10 @@ - (void)testExecuteWithErrorInGettingToken {
         XCTAssertNil(data);
     };
     //Mocking auth to provide an error
-    OCMStub([self.mockAuthProvider getAccessTokenWithCompletion:[OCMArg any]])
+    OCMStub([self.mockAuthProvider getAccessTokenForProviderOptions:[OCMArg any] andCompletion:[OCMArg any]])
     .andDo(^(NSInvocation *invocation){
         void (^completionHandler)(NSString *accessToken, NSError *error);
-        [invocation getArgument:&completionHandler atIndex:2];
+        [invocation getArgument:&completionHandler atIndex:3];
         completionHandler(nil,[NSError errorWithDomain:@"TestDomain" code:0 userInfo:nil]);
     });
 
diff --git a/MSGraphClientSDK/MSGraphClientSDKTests/Middleware/Options/MSAuthenticationHandlerOptionsTests.m b/MSGraphClientSDK/MSGraphClientSDKTests/Middleware/Options/MSAuthenticationHandlerOptionsTests.m
@@ -8,7 +8,6 @@
 
 #import <XCTest/XCTest.h>
 #import "MSGraphClientSDKTests.h"
-
 @interface MSAuthenticationHandlerOptionsTests : MSGraphClientSDKTests
 
 @end
@@ -25,15 +24,13 @@ - (void)tearDown {
     [super tearDown];
 }
 
-- (void)testInitWithNilAuthProvider {
-    XCTAssertThrows([[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:nil]);
-}
-
 - (void)testSuccfullInit {
-    MSAuthenticationHandlerOptions *authHandlerOptions = [[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:self.mockAuthProvider];
+    id<MSAuthenticationProviderOptions> providerOptions = OCMProtocolMock(@protocol(MSAuthenticationProviderOptions));
+    MSAuthenticationHandlerOptions *authHandlerOptions = [[MSAuthenticationHandlerOptions alloc] initWithAuthenticationProvider:self.mockAuthProvider andAuthProviderOptions:providerOptions];
 
     XCTAssertEqual(authHandlerOptions.authenticationProvider, self.mockAuthProvider);
     XCTAssertEqual(authHandlerOptions.middlewareOptionsType, MSMiddlewareOptionsTypeAuth);
+    XCTAssertEqual(authHandlerOptions.authenticationProviderOptions, providerOptions);
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -21,24 +21,28 @@ @interface MSAuthenticationHandler()`
`21`	`21`
`22`	`22`	`@implementation MSAuthenticationHandler`
`23`	`23`
`24`		`-- (instancetype)initWithOptions:(MSAuthenticationHandlerOptions *)authHandlerOptions`
	`24`	`+- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider`
`25`	`25`	`{`
`26`	`26`	`self = [super init];`
`27`	`27`	`if(self)`
`28`	`28`	`{`
`29`		`- _authHandlerOptions = authHandlerOptions;`
	`29`	`+ _authenticationProvider = authProvider;`
`30`	`30`	`}`
`31`	`31`	`return self;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+- (void)setAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider`
	`35`	`+{`
	`36`	`+ _authenticationProvider = authProvider;`
	`37`	`+}`
	`38`	`+`
`34`	`39`	`- (void)execute:(MSURLSessionTask *)task withCompletionHandler:(HTTPRequestCompletionHandler)completionHandler`
`35`	`40`	`{`
`36`	`41`	`MSAuthenticationHandlerOptions *authHandlerOptions = [task getMiddlewareOptionWithType:MSMiddlewareOptionsTypeAuth];`
`37`		`- if(!authHandlerOptions)`
`38`		`- {`
`39`		`- authHandlerOptions = _authHandlerOptions;`
`40`		`- }`
`41`		`- [authHandlerOptions.authenticationProvider getAccessTokenWithCompletion:^(NSString accessToken, NSError error) {`
	`42`	`+`
	`43`	`+ id<MSAuthenticationProvider> authProvider = authHandlerOptions.authenticationProvider?authHandlerOptions.authenticationProvider:_authenticationProvider;`
	`44`	`+`
	`45`	`+ [authProvider getAccessTokenForProviderOptions:authHandlerOptions.authenticationProviderOptions andCompletion:^(NSString accessToken, NSError error) {`
`42`	`46`	`if(!error)`
`43`	`47`	`{`
`44`	`48`	`NSMutableURLRequest *urlRequest = [task request];`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@ @implementation MSAuthenticationHandlerOptions`
`9`	`9`
`10`	`10`	`@synthesize middlewareOptionsType;`
`11`	`11`
`12`		`-- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider`
	`12`	`+- (instancetype)initWithAuthenticationProvider:(id<MSAuthenticationProvider>)authProvider andAuthProviderOptions:(id<MSAuthenticationProviderOptions>)authProviderOptions`
`13`	`13`	`{`
`14`	`14`	`self = [super init];`
`15`	`15`	`if(self)`
`16`	`16`	`{`
`17`		`- NSAssert(authProvider, @"Authentication Provider is requried to authenticate the requests.");`
`18`	`17`	`_authenticationProvider = authProvider;`
	`18`	`+ _authenticationProviderOptions = authProviderOptions;`
`19`	`19`	`middlewareOptionsType = MSMiddlewareOptionsTypeAuth;`
`20`	`20`	`}`
`21`	`21`	`return self;`