agora-appbuilder-core 4.0.0-beta.87 → 4.0.0-beta.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.0-beta.87",
+  "version": "4.0.0-beta.89",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/android/app/src/main/java/com/helloworld/MainApplication.java

@@ -9,6 +9,7 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
+import com.facebook.react.modules.network.OkHttpClientProvider;
 
 public class MainApplication extends Application implements ReactApplication {
 
@@ -59,5 +60,7 @@ public class MainApplication extends Application implements ReactApplication {
       DefaultNewArchitectureEntryPoint.load();
     }
     ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    SSLPinningFactory sslPinningFactory = new SSLPinningFactory(getApplicationContext());
+    OkHttpClientProvider.setOkHttpClientFactory(sslPinningFactory);
   }  
 }

package/template/android/app/src/main/java/com/helloworld/SSLPinningFactory.java

@@ -0,0 +1,30 @@
+package com.helloworld; 
+
+import com.facebook.react.modules.network.OkHttpClientFactory;
+import com.facebook.react.modules.network.OkHttpClientProvider;
+import okhttp3.CertificatePinner;
+import okhttp3.OkHttpClient;
+import android.content.Context;
+
+public class SSLPinningFactory implements OkHttpClientFactory {
+   private Context context;
+
+   public SSLPinningFactory(Context context) {
+       this.context = context;
+   }
+
+   public OkHttpClient createNewNetworkModuleClient() {
+     
+      String hostname = context.getString(R.string.hostname); 
+      String main_public_key = context.getString(R.string.main_public_key);
+      String backup_public_key = context.getString(R.string.backup_public_key);
+
+      CertificatePinner certificatePinner = new CertificatePinner.Builder()
+        .add(hostname, "sha256/"+ main_public_key)
+        .add(hostname, "sha256/"+ backup_public_key)
+        .build();
+
+      OkHttpClient.Builder clientBuilder = OkHttpClientProvider.createClientBuilder();
+      return clientBuilder.certificatePinner(certificatePinner).build();
+  }
+}

package/template/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">Hello App Display Name</string>
+    <string name="hostname">managedservices-preprod.rteappbuilder.com</string>
+    <string name="main_public_key">pCL9CdYsDVWtkF3DktsMyfmuSGsnKNzAraubM/2JawQ=</string>
+    <string name="backup_public_key">18tkPyr2nckv4fgo0dhAkaUtJ2hu2831xlO2SKhq8dg=</string>
 </resources>

package/template/ios/HelloWorld/AppDelegate.mm

@@ -2,11 +2,33 @@
 
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTLinkingManager.h>
+#import <TrustKit/TrustKit.h>
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    NSString *hostName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"HostName"];
+    NSString *mainPublicKey = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MainPublicKey"];
+    NSString *backupPublicKey = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"BackupPublicKey"];
+  // Initialize TrustKit for SSL pinning
+     NSDictionary *trustKitConfig =
+     @{
+         kTSKSwizzleNetworkDelegates: @YES,
+         kTSKPinnedDomains: @{
+            hostName : @{
+                 kTSKIncludeSubdomains: @YES,
+                 kTSKEnforcePinning: @YES,
+                 kTSKDisableDefaultReportUri: @YES,
+                 kTSKPublicKeyHashes : @[
+                     mainPublicKey,   
+                     backupPublicKey,    
+                 ],
+             },
+         }
+     };
+     [TrustKit initSharedInstanceWithConfiguration:trustKitConfig];
+  
   self.moduleName = @"HelloWorld";
   // You can add your custom initial props in the dictionary below.
   // They will be passed down to the ViewController used by React Native.

package/template/ios/HelloWorld/Info.plist

@@ -83,5 +83,12 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	
+	<key>HostName</key>
+	<string>managedservices-preprod.rteappbuilder.com</string>
+	<key>MainPublicKey</key>
+	<string>pCL9CdYsDVWtkF3DktsMyfmuSGsnKNzAraubM/2JawQ=</string>
+	<key>BackupPublicKey</key>
+	<string>18tkPyr2nckv4fgo0dhAkaUtJ2hu2831xlO2SKhq8dg=</string>
 </dict>
-</plist>
+</plist>

package/template/ios/Podfile

@@ -27,6 +27,7 @@ end
 
 target 'HelloWorld' do
   config = use_native_modules!
+  pod 'TrustKit'
 
   # Flags change depending on the env values.
   flags = get_default_flags()

package/template/ios/Podfile.lock

@@ -535,6 +535,7 @@ PODS:
   - RNVectorIcons (9.2.0):
     - React-Core
   - SocketRocket (0.6.1)
+  - TrustKit (3.0.4)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -598,6 +599,7 @@ DEPENDENCIES:
   - RNShare (from `../node_modules/react-native-share`)
   - RNSVG (from `../node_modules/react-native-svg`)
   - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
+  - TrustKit
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -611,6 +613,7 @@ SPEC REPOS:
     - IQKeyboardManagerSwift
     - libevent
     - SocketRocket
+    - TrustKit
 
 EXTERNAL SOURCES:
   agora-react-native-rtm:
@@ -798,8 +801,9 @@ SPEC CHECKSUMS:
   RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
   RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
+  TrustKit: 403e8d2cfbff2abfc37cd41acc558dab8ec78e59
   Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981
 
-PODFILE CHECKSUM: be04179eb7bb6b413f3e785e287b050128ebfee6
+PODFILE CHECKSUM: 1a042be2d7f2bdbb4f21393f3709284412a6e2df
 
 COCOAPODS: 1.15.2

package/template/src/subComponents/ChatBubble.tsx

@@ -123,7 +123,7 @@ const ChatBubble = (props: ChatBubbleProps) => {
       <View
         style={[
           isLocal ? style.chatBubbleLocalView : style.chatBubbleRemoteView,
-          isURL(message) ? {maxWidth: '88%'} : {},
+          //isURL(message) ? {maxWidth: '88%'} : {},
         ]}>
         <View
           style={