Skip to content

Commit 17b47ac

Browse files
committed
Update to fix credential error
1 parent 809458b commit 17b47ac

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ manager.configure({
2828
});
2929

3030
// ...
31-
manager.authorize('google', {scopes: 'profile email'})
31+
manager.authorize('google', {scopes: 'profile,email'})
3232
.then(resp => console.log('Your users ID'))
3333
.catch(err => console.log('There was an error'));
3434
```

android/src/main/java/io/fullstack/oauth/OAuthManagerProviders.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,15 @@ private static OAuth10aService twitterService(final HashMap cfg, final String ca
6060
.apiSecret(consumerSecret)
6161
.debug();
6262

63+
String scopes = (String) cfg.get("scopes");
64+
if (scopes != null) {
65+
builder.scopes(scopes);
66+
}
67+
6368
if (callbackUrl != null) {
6469
builder.callback(callbackUrl);
6570
}
71+
6672
return builder.build(TwitterApi.instance());
6773
}
6874

ios/OAuthManager/OAuthManager.m

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -499,20 +499,25 @@ - (NSDictionary *) credentialForAccount:(NSString *)providerName
499499
return nil;
500500
}
501501

502-
id credentials;
503502
NSString *version = [cfg valueForKey:@"auth_version"];
503+
NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
504+
504505
if ([version isEqualToString:@"1.0"]) {
505-
credentials = [account credential];
506+
DCTOAuth1Credential *credentials = [account credential];
507+
508+
if (credentials && credentials.oauthToken) {
509+
NSString *token = credentials.oauthToken;
510+
[dict setObject:token forKey:@"access_token"];
511+
}
506512
} else if ([version isEqualToString:@"2.0"]) {
507-
credentials = [account credential];
508-
} else {
509-
return nil;
513+
DCTOAuth2Credential *credentials = [account credential];
514+
515+
if (credentials && credentials.accessToken) {
516+
NSString *token = credentials.accessToken;
517+
[dict setObject:token forKey:@"access_token"];
518+
}
510519
}
511520

512-
NSDictionary *dict = @{
513-
@"access_token": [credentials accessToken]
514-
};
515-
516521
return dict;
517522
}
518523

0 commit comments

Comments
 (0)