@@ -114,7 +114,7 @@ + (BOOL)handleOpenUrl:(UIApplication *)application openURL:(NSURL *)url
114
114
return [DCTAuth handleURL: url];
115
115
}
116
116
117
- [manager clearPending ];
117
+ // [manager clearPending];
118
118
119
119
return [RCTLinkingManager application: application openURL: url
120
120
sourceApplication: sourceApplication annotation: annotation];
@@ -134,11 +134,14 @@ - (BOOL) _configureProvider:(NSString *)providerName andConfig:(NSDictionary *)c
134
134
NSMutableArray *arr = [_callbackUrls mutableCopy ];
135
135
NSString *callbackUrlStr = [config valueForKey: @" callback_url" ];
136
136
NSURL *callbackUrl = [NSURL URLWithString: callbackUrlStr];
137
- NSString *saveCallbackUrl = [self stringHost: callbackUrl];
138
- [arr addObject: saveCallbackUrl];
139
- _callbackUrls = [arr copy ];
137
+ NSString *saveCallbackUrl = [[self stringHost: callbackUrl] lowercaseString ];
138
+
139
+ if ([arr indexOfObject: saveCallbackUrl] == NSNotFound ) {
140
+ [arr addObject: saveCallbackUrl];
141
+ _callbackUrls = [arr copy ];
142
+ NSLog (@" Saved callback url: %@ in %@ " , saveCallbackUrl, _callbackUrls);
143
+ }
140
144
141
- NSLog (@" Saved callback url: %@ in %@ " , saveCallbackUrl, _callbackUrls);
142
145
143
146
// Convert objects of url type
144
147
for (NSString *name in [config allKeys ]) {
@@ -513,16 +516,26 @@ - (NSDictionary *) credentialForAccount:(NSString *)providerName
513
516
if ([version isEqualToString: @" 1.0" ]) {
514
517
DCTOAuth1Credential *credentials = [account credential ];
515
518
516
- if (credentials && credentials.oauthToken ) {
517
- NSString *token = credentials.oauthToken ;
518
- [dict setObject: token forKey: @" access_token" ];
519
+ if (credentials) {
520
+ if (credentials.oauthToken ) {
521
+ NSString *token = credentials.oauthToken ;
522
+ [dict setObject: token forKey: @" access_token" ];
523
+ }
524
+
525
+ if (credentials.oauthTokenSecret ) {
526
+ NSString *secret = credentials.oauthTokenSecret ;
527
+ [dict setObject: secret forKey: @" access_token_secret" ];
528
+ }
519
529
}
530
+
520
531
} else if ([version isEqualToString: @" 2.0" ]) {
521
532
DCTOAuth2Credential *credentials = [account credential ];
522
533
523
- if (credentials && credentials.accessToken ) {
524
- NSString *token = credentials.accessToken ;
525
- [dict setObject: token forKey: @" access_token" ];
534
+ if (credentials) {
535
+ if (credentials.accessToken ) {
536
+ NSString *token = credentials.accessToken ;
537
+ [dict setObject: token forKey: @" access_token" ];
538
+ }
526
539
}
527
540
}
528
541
0 commit comments