Skip to content

Commit af879ce

Browse files
committed
A few minor changes
1 parent 2d82c83 commit af879ce

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

ios/OAuthManager/OAuthManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#import <Foundation/Foundation.h>
99

10-
#import "RCTBridgeModule.h"
10+
#import <React/RCTBridgeModule.h>
1111
#import "RCTLinkingManager.h"
1212

1313
@class OAuthClient;

ios/OAuthManager/OAuthManager.m

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ + (BOOL)handleOpenUrl:(UIApplication *)application openURL:(NSURL *)url
114114
return [DCTAuth handleURL:url];
115115
}
116116

117-
[manager clearPending];
117+
// [manager clearPending];
118118

119119
return [RCTLinkingManager application:application openURL:url
120120
sourceApplication:sourceApplication annotation:annotation];
@@ -134,11 +134,14 @@ - (BOOL) _configureProvider:(NSString *)providerName andConfig:(NSDictionary *)c
134134
NSMutableArray *arr = [_callbackUrls mutableCopy];
135135
NSString *callbackUrlStr = [config valueForKey:@"callback_url"];
136136
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+
}
140144

141-
NSLog(@"Saved callback url: %@ in %@", saveCallbackUrl, _callbackUrls);
142145

143146
// Convert objects of url type
144147
for (NSString *name in [config allKeys]) {
@@ -513,16 +516,26 @@ - (NSDictionary *) credentialForAccount:(NSString *)providerName
513516
if ([version isEqualToString:@"1.0"]) {
514517
DCTOAuth1Credential *credentials = [account credential];
515518

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+
}
519529
}
530+
520531
} else if ([version isEqualToString:@"2.0"]) {
521532
DCTOAuth2Credential *credentials = [account credential];
522533

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+
}
526539
}
527540
}
528541

0 commit comments

Comments
 (0)