Merge branch 'loren/embedded/MOB-12265-start-end-session' into loren/embedded/MOB-12264-android-sync-and-get-messages

Author: lposen

.eslintrc.js

@@ -48,4 +48,5 @@ module.exports = {
       },
     },
   ],
+  ignorePatterns: ['coverage/**/*', 'lib/**/*', 'docs/**/*'],
 };

.gitignore

@@ -85,6 +85,7 @@ ios/generated
 android/generated
 
 # Iterable
+.env.local
 .env
 .xcode.env.local
 coverage/

CHANGELOG.md

@@ -1,16 +1,50 @@
-## 2.1.0-beta.1
+## 2.2.0-alpha.1
 
-## Fixes
-- Add Temporary fix for circular paths, which break expo ([9c09743](https://github.com/Iterable/react-native-sdk/commit/9c09743))
+### Updates
+* [SDK-149] Added logout functionality
+
+### Fixes
+* [SDK-151] Fixed "cannot read property authtoken of undefined" error
+
+
+## 2.2.0-alpha.0
+
+### Updates
+- Updated Android SDK version to [3.6.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.6.2)
+- Updated iOS SDK version to [6.6.3](https://github.com/Iterable/swift-sdk/releases/tag/6.6.3)
+- Added JWT Capabilities:
+  - Added `Iterable.authhManager`, which manages the authentication flow
+  - Added `IterableRetryBackoff` and `IterableAuthFailureReason` enums
+  - Added `onJwtError` and `retryPolicy` for control over JWT flow
+- Moved all native calls to `IterableApi.ts`
+- Added JWT example to our example app
 
-## 2.1.0-beta.0
+### Fixes
+- Created a standalone `IterableLogger` to avoid circular dependencies
 
+## 2.1.0
 ### Updates
+* SDK is now compatible with both New Architecture and Legacy Architecture. Fix
+  for #691, #602, #563.
+
+### Fixes
+- Dependencies update
 - Update SDK so that it has full support for [React Native New Architecture](https://reactnative.dev/architecture/landing-page)
+- Add Temporary fix for circular paths, which break expo ([9c09743](https://github.com/Iterable/react-native-sdk/commit/9c09743))
 
 ### Chores
 - Update dependencies for React Navigation and related packages ([95053bb](https://github.com/Iterable/react-native-sdk/commit/95053bb))
 
+## 2.0.4
+
+### Updates
+- Added API documentation via Netlify([1087275](https://github.com/Iterable/react-native-sdk/commit/1087275))
+- Removed dependency on `react-native-vector-icons`, per issues
+  [#513](https://github.com/Iterable/react-native-sdk/issues/513),
+ [#683](https://github.com/Iterable/react-native-sdk/issues/683) and
+ [#675](https://github.com/Iterable/react-native-sdk/issues/675)
+ ([6ece6e0](https://github.com/Iterable/react-native-sdk/commit/6ece6e0))
+- Updated dependencies
 
 ## 2.0.3
 

Iterable-React-Native-SDK.podspec

@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
   s.private_header_files = "ios/**/*.h"
 
   # Load Iterables iOS SDK as a dependency
-  s.dependency "Iterable-iOS-SDK", "6.6.1"
+  s.dependency "Iterable-iOS-SDK", "6.6.3"
 
   # Basic Swift support
   s.pod_target_xcconfig = {

README.md

@@ -44,7 +44,6 @@ Iterable's React Native SDK relies on:
     _UI Components require additional peer dependencies_
     - [React Navigation 6+](https://github.com/react-navigation/react-navigation)
     - [React Native Safe Area Context 4+](https://github.com/th3rdwave/react-native-safe-area-context)
-    - [React Native Vector Icons 10+](https://github.com/oblador/react-native-vector-icons)
     - [React Native WebView 13+](https://github.com/react-native-webview/react-native-webview)
 
 - **iOS**
@@ -120,13 +119,13 @@ For quick reference, the following table lists the versions of the [Android SDK]
 
 | RN SDK Version                                                              | Android SDK Version                                                          | iOS SDK Version |
 | --------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | --------------- |
-| [2.1.0-beta.0](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.1.0-beta.0) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
+| [2.2.0](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.2.0) | [3.6.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.6.2) | [6.6.3](https://github.com/Iterable/swift-sdk/releases/tag/6.6.3)
+| [2.1.0](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.1.0) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
+| [2.0.4](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.4) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [2.0.3](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.3) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [2.0.2](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.2) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [2.0.1](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.1) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [2.0.0](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.0) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
-| [2.0.0-beta.1](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.0-beta.1) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
-| [2.0.0-beta](https://www.npmjs.com/package/@iterable/react-native-sdk/v/2.0.0-beta) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [1.3.21](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.20) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [1.3.20](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.20) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.4](https://github.com/Iterable/swift-sdk/releases/tag/6.5.4)
 | [1.3.19](https://www.npmjs.com/package/@iterable/react-native-sdk/v/1.3.19) | [3.5.2](https://github.com/Iterable/iterable-android-sdk/releases/tag/3.5.2) | [6.5.3](https://github.com/Iterable/swift-sdk/releases/tag/6.5.3)

android/build.gradle

@@ -105,7 +105,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  api "com.iterable:iterableapi:3.6.1"
+  api "com.iterable:iterableapi:3.6.2"
     // api project(":iterableapi") // links to local android SDK repo rather than by release
 }
 

android/src/main/java/com/iterable/reactnative/RNIterableAPIModuleImpl.java

@@ -28,10 +28,7 @@
 import com.iterable.iterableapi.IterableAuthHandler;
 import com.iterable.iterableapi.IterableConfig;
 import com.iterable.iterableapi.IterableCustomActionHandler;
-// import com.iterable.iterableapi.IterableEmbeddedManager;
 import com.iterable.iterableapi.IterableEmbeddedMessage;
-// import com.iterable.iterableapi.IterableEmbeddedSession;
-// import com.iterable.iterableapi.IterableEmbeddedUpdateHandler;
 import com.iterable.iterableapi.IterableHelper;
 import com.iterable.iterableapi.IterableInAppCloseAction;
 import com.iterable.iterableapi.IterableInAppHandler;
@@ -130,8 +127,8 @@ public void initialize2WithApiKey(String apiKey, ReadableMap configReadableMap,
         }
 
         if (configReadableMap.hasKey("enableEmbeddedMessaging")) {
-          configBuilder.setEnableEmbeddedMessaging(configReadableMap.getBoolean("enableEmbeddedMessaging"));
-      }
+            configBuilder.setEnableEmbeddedMessaging(configReadableMap.getBoolean("enableEmbeddedMessaging"));
+        }
 
         // NOTE: There does not seem to be a way to set the API endpoint
         // override in the Android SDK.  Check with @Ayyanchira and @evantk91 to
@@ -616,11 +613,6 @@ public void onTokenRegistrationSuccessful(String authToken) {
         sendEvent(EventName.handleAuthSuccessCalled.name(), null);
     }
 
-    public void onTokenRegistrationFailed(Throwable object) {
-        IterableLogger.v(TAG, "Failed to set authToken");
-        sendEvent(EventName.handleAuthFailureCalled.name(), null);
-    }
-
     public void addListener(String eventName) {
         // Keep: Required for RN built in Event Emitter Calls.
     }

example/.env.example

@@ -9,11 +9,19 @@
 #  4. Fill in the following fields:
 #     - Name: A descriptive name for the API key
 #     - Type: Mobile
-#     - JWT authentication: Leave **unchecked** (IMPORTANT)
+#     - JWT authentication: Whether or not you want to use JWT
 #  5. Click "Create API Key"
-#  6. Copy the generated API key
-#  7. Replace the placeholder text next to `ITBL_API_KEY=` with the copied API key
+#  6. Copy the generated API key and replace the placeholder text next to
+#     `ITBL_API_KEY=` with the copied API key
+#  7. If you chose to enable JWT authentication, copy the JWT secret and and
+#     replace the placeholder text next to `ITBL_JWT_SECRET=` with the copied
+#     JWT secret
 ITBL_API_KEY=replace_this_with_your_iterable_api_key
+# Your JWT Secret, created when making your API key (see above)
+ITBL_JWT_SECRET=replace_this_with_your_jwt_secret
+# Is your api token JWT Enabled?
+# Must be set to 'true' to enable JWT authentication
+ITBL_IS_JWT_ENABLED=true
 
 # Your Iterable user ID or email address
-ITBL_ID=replace_this_with_your_user_id_or_email
+ITBL_ID=replace_this_with_your_user_id_or_email

example/README.md

@@ -23,7 +23,8 @@ _example app directory_.  To do so, run the following:
 
 ```bash
 cd ios
-pod install
+bundle install
+bundle exec pod install
 ```
 
 Once this is done, `cd` back into the _example app directory_:
@@ -40,12 +41,18 @@ In it, you will find:
 
 ```shell
 ITBL_API_KEY=replace_this_with_your_iterable_api_key
+ITBL_JWT_SECRET=replace_this_with_your_jwt_secret
+ITBL_IS_JWT_ENABLED=true
 ITBL_ID=replace_this_with_your_user_id_or_email
 ```
 
-Replace `replace_this_with_your_iterable_api_key` with your _mobile_ Iterable API key,
-and replace `replace_this_with_your_user_id_or_email` with the email or user id
-that you use to log into Iterable.
+- Replace `replace_this_with_your_iterable_api_key` with your **_mobile_
+Iterable API key**
+- Replace `replace_this_with_your_jwt_secret` with your **JWT Secret** (if you
+have a JWT-enabled API key)
+- Set `ITBL_IS_JWT_ENABLED` to true if you have a JWT-enabled key, and false if you do not.
+- Replace `replace_this_with_your_user_id_or_email` with the **email or user
+id** that you use to log into Iterable.
 
 Follow the steps below if you do not have a mobile Iterable API key.
 
@@ -54,12 +61,12 @@ To add an API key, do the following:
  1. Sign into your Iterable account
  2. Go to [Integrations > API Keys](https://app.iterable.com/settings/apiKeys)
  3. Click "New API Key" in the top right corner
- 4. Fill in the followsing fields:
+ 4. Fill in the following fields:
     - Name: A descriptive name for the API key
     - Type: Mobile
-    - JWT authentication: Leave **unchecked** (IMPORTANT)
+    - JWT authentication: Check to enable JWT authentication. If enabled, will need to create a [JWT generator](https://support.iterable.com/hc/en-us/articles/360050801231-JWT-Enabled-API-Keys#sample-python-code-for-jwt-generation) to generate the JWT token.
  5. Click "Create API Key"
- 6. Copy the generated API key
+ 6. Copy the generated API key and JWT secret into your _.env_ file
 
 
 ## Step 3: Start the Metro Server

example/android/app/build.gradle

@@ -117,5 +117,3 @@ dependencies {
         implementation jscFlavor
     }
 }
-
-apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle")