Merge pull request #1 from HarshaR1642/ios

Added iOS changes
HarshaR1642 · Oct 4, 2024 · f39e566 · f39e566
2 parents c8beedb + c1fc167
commit f39e566
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 57 deletions.
diff --git a/android/src/main/java/com/bridge/api/ActivityManagerAPI.kt b/android/src/main/java/com/bridge/api/ActivityManagerAPI.kt
@@ -37,7 +37,7 @@ class ActivityManagerAPI {
     val resultCode = when (result) {
       "ok" -> Activity.RESULT_OK
       "cancel" -> Activity.RESULT_CANCELED
-      else -> Activity.RESULT_OK
+      else -> -2
     }
 
     val intent = Intent()

diff --git a/ios/Bridge.mm b/ios/Bridge.mm
@@ -4,6 +4,18 @@ @interface RCT_EXTERN_MODULE(Bridge, NSObject)
 
 RCT_EXTERN_METHOD(isPackageInstalled:(NSString *)packageName withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(returnAuthCode:(NSString *)code
+                state:(NSString *)state
+                redirectUri:(NSString *)redirectUri
+                resolver:(RCTPromiseResolveBlock)resolve
+                rejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(returnError:(NSString *)redirectUri
+                error:(NSString *)error
+                errorDescription:(NSString *)errorDescription
+                resolver:(RCTPromiseResolveBlock)resolve
+                rejecter:(RCTPromiseRejectBlock)reject)
+
 + (BOOL)requiresMainQueueSetup
 {
   return NO;

diff --git a/ios/Bridge.swift b/ios/Bridge.swift
@@ -9,4 +9,40 @@ class Bridge: NSObject {
           resolve(false)
         }
     }
-}
+
+    @objc(returnAuthCode:state:redirectUri:resolver:rejecter:)
+    func returnAuthCode(code: String, state: String, redirectUri: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {        
+       if let redirectURL = URL(string: redirectUri) {
+           var components = URLComponents(url: redirectURL, resolvingAgainstBaseURL: false)
+
+           let paramAuthCode = URLQueryItem(name: "code", value: code)
+           let paramState = URLQueryItem(name: "state", value: state)
+           components?.queryItems = [paramAuthCode, paramState]
+
+           if let resultURL = components?.url {
+               UIApplication.shared.open(resultURL, options: [UIApplication.OpenExternalURLOptionsKey.universalLinksOnly: true], completionHandler: nil)
+           }
+       } else {
+           let error = NSError(domain: "googleHome", code: 0, userInfo: [NSLocalizedDescriptionKey: "redirectUri is invalid"])
+           reject("0", "redirectUri is nil", error)
+       }
+    }
+
+    @objc(returnError:error:errorDescription:resolver:rejecter:)
+    func returnError(redirectUri: String, error: String, errorDescription: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        if let redirectURL = URL(string: redirectUri) {
+            var components = URLComponents(url: redirectURL, resolvingAgainstBaseURL: false)
+
+            let paramError = URLQueryItem(name: "error", value: error)
+            let paramDescription = URLQueryItem(name: "error_description", value: errorDescription)
+            components?.queryItems = [paramError, paramDescription]
+
+            if let resultURL = components?.url {
+                UIApplication.shared.open(resultURL, options: [UIApplication.OpenExternalURLOptionsKey.universalLinksOnly: true], completionHandler: nil)
+            }
+        } else {
+            let error = NSError(domain: "googleHome", code: 0, userInfo: [NSLocalizedDescriptionKey: "redirectUri is invalid"])
+            reject("0", "redirectUri is nil", error)
+        }
+    }
+}
diff --git a/lib/commonjs/ActivityManager.js b/lib/commonjs/ActivityManager.js
diff --git a/lib/commonjs/ActivityManager.js.map b/lib/commonjs/ActivityManager.js.map
diff --git a/lib/commonjs/package.json b/lib/commonjs/package.json
diff --git a/lib/commonjs/types/ActivityManager.d.js b/lib/commonjs/types/ActivityManager.d.js
diff --git a/lib/commonjs/types/ActivityManager.d.js.map b/lib/commonjs/types/ActivityManager.d.js.map
diff --git a/lib/commonjs/types/PackageManager.d.js b/lib/commonjs/types/PackageManager.d.js
diff --git a/lib/commonjs/types/PackageManager.d.js.map b/lib/commonjs/types/PackageManager.d.js.map
diff --git a/lib/commonjs/types/index.d.js b/lib/commonjs/types/index.d.js
diff --git a/lib/commonjs/types/index.d.js.map b/lib/commonjs/types/index.d.js.map
diff --git a/lib/module/ActivityManager.js b/lib/module/ActivityManager.js
diff --git a/lib/module/ActivityManager.js.map b/lib/module/ActivityManager.js.map
diff --git a/lib/module/package.json b/lib/module/package.json
diff --git a/lib/module/types/ActivityManager.d.js b/lib/module/types/ActivityManager.d.js
diff --git a/lib/module/types/ActivityManager.d.js.map b/lib/module/types/ActivityManager.d.js.map
diff --git a/lib/module/types/PackageManager.d.js b/lib/module/types/PackageManager.d.js
diff --git a/lib/module/types/PackageManager.d.js.map b/lib/module/types/PackageManager.d.js.map
diff --git a/lib/module/types/index.d.js b/lib/module/types/index.d.js
diff --git a/lib/module/types/index.d.js.map b/lib/module/types/index.d.js.map
diff --git a/lib/typescript/commonjs/src/ActivityManager.d.ts b/lib/typescript/commonjs/src/ActivityManager.d.ts
@@ -3,5 +3,7 @@ type extrasType = {
     [key: string]: number | string | boolean;
 };
 declare function setResultAndFinish(result: resultType, extras: extrasType): void;
-export { setResultAndFinish };
+declare function returnAuthCode(code: string, state: string, redirectUri: string): void;
+declare function returnError(redirectUri: string, error: string, errorDescription?: string): void;
+export { setResultAndFinish, returnAuthCode, returnError };
 //# sourceMappingURL=ActivityManager.d.ts.map
diff --git a/lib/typescript/commonjs/src/ActivityManager.d.ts.map b/lib/typescript/commonjs/src/ActivityManager.d.ts.map
diff --git a/lib/typescript/module/src/ActivityManager.d.ts b/lib/typescript/module/src/ActivityManager.d.ts
@@ -3,5 +3,7 @@ type extrasType = {
     [key: string]: number | string | boolean;
 };
 declare function setResultAndFinish(result: resultType, extras: extrasType): void;
-export { setResultAndFinish };
+declare function returnAuthCode(code: string, state: string, redirectUri: string): void;
+declare function returnError(redirectUri: string, error: string, errorDescription?: string): void;
+export { setResultAndFinish, returnAuthCode, returnError };
 //# sourceMappingURL=ActivityManager.d.ts.map
diff --git a/lib/typescript/module/src/ActivityManager.d.ts.map b/lib/typescript/module/src/ActivityManager.d.ts.map
diff --git a/src/ActivityManager.tsx b/src/ActivityManager.tsx
@@ -25,4 +25,24 @@ function setResultAndFinish(result: resultType, extras: extrasType): void {
   }
 }
 
-export { setResultAndFinish };
+function returnAuthCode(
+  code: string,
+  state: string,
+  redirectUri: string
+): void {
+  if (Platform.OS === 'ios') {
+    Bridge.returnAuthCode(code, state, redirectUri);
+  }
+}
+
+function returnError(
+  redirectUri: string,
+  error: string,
+  errorDescription: string = ''
+): void {
+  if (Platform.OS === 'ios') {
+    Bridge.returnError(redirectUri, error, errorDescription);
+  }
+}
+
+export { setResultAndFinish, returnAuthCode, returnError };