AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Added redirect to registration.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-01-21 11:41:39 +03:00 • committed by Sergey Yershov
parent e14b633dc9
commit f411a6b7f8
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
View file

@ -12,7 +12,12 @@ NSString * const kVerifierKey = @"oauth_verifier";
BOOL checkURLHasVerifierKey(NSString * urlString)
{
return !NSEqualRanges([urlString rangeOfString:kVerifierKey], {NSNotFound, 0});
return [urlString containsString:kVerifierKey];
}
BOOL checkURLNeedsReload(NSString * urlString)
{
return [urlString hasSuffix:@"/"] || [urlString containsString:@"/welcome"];
}
NSString * getVerifier(NSString * urlString)
@ -157,12 +162,18 @@ NSString * getVerifier(NSString * urlString)
{
[self stopSpinner];
NSString * urlString = webView.request.URL.absoluteString;
if (!checkURLHasVerifierKey(urlString))
return;
webView.hidden = YES;
NSString * verifier = getVerifier(urlString);
NSAssert(verifier, @"Verifier value is nil");
[self checkAuthorization:verifier];
if (checkURLNeedsReload(urlString))
{
[self loadAuthorizationPage];
}
else if (checkURLHasVerifierKey(urlString))
{
webView.hidden = YES;
NSString * verifier = getVerifier(urlString);
NSAssert(verifier, @"Verifier value is nil");
[self checkAuthorization:verifier];
}
}
- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error