From fd39a675cd0910815783429749ef9786a349765b Mon Sep 17 00:00:00 2001 From: James Go Date: Wed, 27 Sep 2017 16:48:23 -0700 Subject: [PATCH] DE311841 : [Cordova] [iOS] Closing the login screen and invoking the protected API, call get successful falling back to client credentials --- .../_deprecated_/L7SBrowserURLProtocol.m | 50 ++++--------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/MASFoundation/Classes/_private_/_deprecated_/L7SBrowserURLProtocol.m b/MASFoundation/Classes/_private_/_deprecated_/L7SBrowserURLProtocol.m index 24f00524..5e0989d7 100644 --- a/MASFoundation/Classes/_private_/_deprecated_/L7SBrowserURLProtocol.m +++ b/MASFoundation/Classes/_private_/_deprecated_/L7SBrowserURLProtocol.m @@ -65,48 +65,18 @@ + (BOOL)requestIsCacheEquivalent:(NSURLRequest *)a toRequest:(NSURLRequest *)b { - (void)startLoading { NSMutableURLRequest *newRequest = [self.request mutableCopy]; - if ([MASApplication currentApplication].isAuthenticated) { - - if ([self.class isProtectedResource:self.request.URL]) - { - NSString *authorization = [MASUser authorizationBearerWithAccessToken]; - [newRequest setValue:authorization forHTTPHeaderField:@"Authorization"]; - [NSURLProtocol setProperty:@YES forKey:@"AuthorizationSet" inRequest:newRequest]; - } - else { - [NSURLProtocol setProperty:@NO forKey:@"AuthorizationSet" inRequest:newRequest]; - } - - self.connection = [NSURLConnection connectionWithRequest:newRequest delegate:self]; - } - else + + if ([MASApplication currentApplication].isAuthenticated && [self.class isProtectedResource:self.request.URL]) { - [self stopLoading]; - - [MAS setGrantFlow:MASGrantFlowClientCredentials]; - - [MAS start:^(BOOL completed, NSError *error) { - - if(error) - { - return; - } - else if (completed){ - - if ([self.class isProtectedResource:self.request.URL]) - { - NSString *authorization = [MASUser authorizationBearerWithAccessToken]; - [newRequest setValue:authorization forHTTPHeaderField:@"Authorization"]; - [NSURLProtocol setProperty:@YES forKey:@"AuthorizationSet" inRequest:newRequest]; - } - else { - [NSURLProtocol setProperty:@NO forKey:@"AuthorizationSet" inRequest:newRequest]; - } - - self.connection = [NSURLConnection connectionWithRequest:newRequest delegate:self]; - } - }]; + NSString *authorization = [MASUser authorizationBearerWithAccessToken]; + [newRequest setValue:authorization forHTTPHeaderField:@"Authorization"]; + [NSURLProtocol setProperty:@YES forKey:@"AuthorizationSet" inRequest:newRequest]; } + else { + [NSURLProtocol setProperty:@NO forKey:@"AuthorizationSet" inRequest:newRequest]; + } + + self.connection = [NSURLConnection connectionWithRequest:newRequest delegate:self]; }