Skip to content

Commit b75f230

Browse files
committed
fix: patch from the modified bare sample that works
1 parent b6fba97 commit b75f230

File tree

2 files changed

+32
-7
lines changed

2 files changed

+32
-7
lines changed

ios/WebBrowser.m

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@ @interface RCT_EXTERN_MODULE(WebBrowser, NSObject)
1010
RCT_EXTERN_METHOD(dismissBrowser:(RCTPromiseResolveBlock)resolve
1111
withRejecter:(RCTPromiseRejectBlock)reject)
1212

13+
//RCT_EXTERN_METHOD(openAuthSessionAsync:(NSString*)authUrlStr
14+
// withRedirectUrl:(NSString*)redirectUrlStr
15+
// withResolver:(RCTPromiseResolveBlock)resolve
16+
// withRejecter:(RCTPromiseRejectBlock)reject)
17+
1318
RCT_EXTERN_METHOD(openAuthSessionAsync:(NSString*)authUrlStr
14-
withRedirectUrl:(NSString*)redirectUrlStr
15-
withResolver:(RCTPromiseResolveBlock)resolve
16-
withRejecter:(RCTPromiseRejectBlock)reject)
19+
withRedirectUrl:(NSString*)redirectUrlStr
20+
withResolver:(RCTPromiseResolveBlock)resolve
21+
withRejector:(RCTPromiseRejectBlock)reject)
22+
1723

1824
RCT_EXTERN_METHOD(dismissAuthSession:(RCTPromiseResolveBlock)resolve
1925
withRejecter:(RCTPromiseRejectBlock)reject)

ios/WebBrowser.swift

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,30 @@ class WebBrowser: NSObject {
3333
resolve(nil)
3434
}
3535

36+
// @objc(openAuthSessionAsync:withRedirectUrl:withResolver:withRejector:)
37+
// func openAuthSessionAsync(_ authUrlStr: String, _ redirectUrlStr: String, _ resolve: @escaping RCTPromiseResolveBlock, _ reject: @escaping RCTPromiseRejectBlock) {
38+
// guard
39+
// let authUrl = URL(string: authUrlStr),
40+
// let redirectUrl = URL(string: redirectUrlStr)
41+
// else {
42+
// reject(ReactNativeWebBrowserErrorCode, "Invalid Argument: authUrl or redirectUrl is invalid.", ReactNativeWebBrowserError.invalidArgument("authUrl or redirectUrl"))
43+
// return
44+
// }
45+
// let promise = Promise(resolver: resolve, rejector: reject)
46+
//
47+
// guard self.currentAuthSession?.isOpen != true else {
48+
// reject(ReactNativeWebBrowserErrorCode, "AuthSession is already opened.", ReactNativeWebBrowserError.alreadyOpen)
49+
// return
50+
// }
51+
// self.currentAuthSession = WebAuthSession(authUrl: authUrl, redirectUrl: redirectUrl)
52+
// self.currentAuthSession?.open(promise)
53+
// }
54+
3655
@objc(openAuthSessionAsync:withRedirectUrl:withResolver:withRejector:)
37-
func openAuthSessionAsync(_ authUrlStr: String, redirectUrlStr: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
56+
func openAuthSessionAsync(_ authUrlStr: NSString, redirectUrlStr: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
3857
guard
39-
let authUrl = URL(string: authUrlStr),
40-
let redirectUrl = URL(string: redirectUrlStr)
58+
let authUrl = URL(string: authUrlStr as String),
59+
let redirectUrl = URL(string: redirectUrlStr as String)
4160
else {
4261
reject(ReactNativeWebBrowserErrorCode, "Invalid Argument: authUrl or redirectUrl is invalid.", ReactNativeWebBrowserError.invalidArgument("authUrl or redirectUrl"))
4362
return
@@ -50,7 +69,7 @@ class WebBrowser: NSObject {
5069
}
5170
self.currentAuthSession = WebAuthSession(authUrl: authUrl, redirectUrl: redirectUrl)
5271
self.currentAuthSession?.open(promise)
53-
}
72+
}
5473

5574
@objc(dismissAuthSession:withRejector:)
5675
func dismissAuthSession(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {

0 commit comments

Comments
 (0)