adium/adium

Prompt the user to authenticate again when using the refresh_token gives an error. Also, show the error to the user.
GoogleOAuth2
2015-04-01, Thijs Alkemade
c4923ddd82bf
Parents 1ff2b33ca0c1
Children c71963566b9b4a7c414c0b2d
Prompt the user to authenticate again when using the refresh_token gives an error. Also, show the error to the user.
1 files changed, 11 insertions(+), 1 deletions(-)
  • +11 -1
    Plugins/Purple Service/AIPurpleGTalkAccount.m
    • --- a/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 20:30:40 2015 +0200
    +++ b/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 21:07:40 2015 +0200
    @@ -221,6 +221,17 @@
    AILogWithSignature(@"%@", responseDict);
    + if ([responseDict objectForKey:@"error"]) {
    + // Delete the refresh token, so we don't use it again.
    + [[AIKeychain defaultKeychain_error:NULL] deleteGenericPasswordForService:self.service.serviceID
    + account:self.UID
    + error:NULL];
    +
    + [self setLastDisconnectionError:[NSString stringWithFormat:AILocalizedString(@"Retrieving OAuth token failed: %@", nil), [responseDict objectForKey:@"error_description"]]];
    + [self serverReportedInvalidPassword];
    + return;
    + }
    +
    if (!self.UID.length) {
    NSString *jsonWebToken = [responseDict objectForKey:@"id_token"];
    @@ -291,7 +302,6 @@
    -(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
    [self setLastDisconnectionError:[NSString stringWithFormat:AILocalizedString(@"OAuth authentication failed: %@", nil), error.description]];
    - [self setValue:[NSNumber numberWithBool:YES] forProperty:@"isDisconnecting" notify:NotifyNow];
    }
    - (void)retrievePasswordThenConnect