ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-08 08:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

add validation logic

Browse Source
This commit is contained in:
Stephan Diederich 2013-08-11 21:38:02 +02:00
parent 039902da02
commit 2a3a8d62cb
1 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Classes/BITAuthenticator.m
View File

@ -99,17 +99,61 @@ static NSString* const kBITAuthenticatorLastAuthenticatedVersionKey = @"BITAuthe
} }
}]; }];
} else { } else {
NSError *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain NSString *validationEndpoint = @"validate";
code:BITAuthenticatorNetworkError __weak typeof (self) weakSelf = self;
userInfo:nil]; [self getPath:validationEndpoint
if(completion) { completion:^(BITHTTPOperation *operation, id response, NSError *error) {
completion(NO, error); typeof (self) strongSelf = weakSelf;
} else { if(nil == response) {
[self.delegate authenticator:self failedToValidateInstallationWithError:error]; NSDictionary *userInfo = nil;
} if(error) {
userInfo = @{NSUnderlyingErrorKey : error};
}
NSError *error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
code:BITAuthenticatorNetworkError
userInfo:userInfo];
[strongSelf validationFailedWithError:error];
} else {
NSError *validationParseError = nil;
BOOL isValidated = [strongSelf.class isValidationResponseValid:response error:&validationParseError];
if(isValidated) {
[strongSelf validationSucceeded];
} else {
[strongSelf validationFailedWithError:validationParseError];
}
}
}];
} }
} }
+ (BOOL) isValidationResponseValid:(id) response error:(NSError **) error {
NSParameterAssert(response);
NSError *jsonParseError = nil;
id jsonObject = [NSJSONSerialization JSONObjectWithData:response
options:0
error:&jsonParseError];
if(nil == jsonObject) {
if(error) {
*error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
code:BITAuthenticatorAPIServerReturnedInvalidRespone
userInfo:(jsonParseError ? @{NSUnderlyingErrorKey : jsonParseError} : nil)];
}
return NO;
}
if(![jsonObject isKindOfClass:[NSDictionary class]]) {
if(error) {
*error = [NSError errorWithDomain:kBITAuthenticatorErrorDomain
code:BITAuthenticatorAPIServerReturnedInvalidRespone
userInfo:nil];
}
return NO;
}
//TODO: add proper validation
return [jsonObject[@"isValid"] boolValue];
}
- (void)authenticateWithCompletion:(tAuthenticationCompletion)completion { - (void)authenticateWithCompletion:(tAuthenticationCompletion)completion {
if(_authenticationController) { if(_authenticationController) {
BITHockeyLog(@"Already authenticating. Ignoring request"); BITHockeyLog(@"Already authenticating. Ignoring request");