Merge branch 'main' into dependabot/npm_and_yarn/example/e2e/follow-redirects-and-appium-base-driver-1.15.6

Author: bscanlan

README.md

@@ -853,7 +853,7 @@ Fetch a list of all Collections.
 ___
 ### `Intercom.fetchHelpCenterCollection(collectionId)`
 
-Get a list of sections/articles for a collection.
+Get a list of subcollections/articles for a collection.
 
 ### Options
 
@@ -1022,11 +1022,6 @@ type HelpCenterArticle = {
   title: string;
 };
 
-type HelpCenterSection = {
-  name: string;
-  articles: HelpCenterArticle;
-};
-
 type HelpCenterCollectionItem = {
   id: string;
   title: string;
@@ -1038,7 +1033,7 @@ type HelpCenterCollectionContent = {
   name: string;
   summary: string;
   articles: HelpCenterArticle[];
-  sections: HelpCenterSection[];
+  collections: HelpCenterCollectionItem[];
 };
 
 type HelpCenterArticleSearchResult = {

android/build.gradle

@@ -69,5 +69,5 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
   implementation "com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '20.2.+')}"
-  implementation 'io.intercom.android:intercom-sdk:15.10.+'
+  implementation 'io.intercom.android:intercom-sdk:15.11.+'
 }

android/src/main/java/com/intercom/reactnative/IntercomHelpCenterHelpers.java

@@ -14,7 +14,6 @@
 import io.intercom.android.sdk.helpcenter.collections.HelpCenterCollection;
 import io.intercom.android.sdk.helpcenter.sections.HelpCenterArticle;
 import io.intercom.android.sdk.helpcenter.sections.HelpCenterCollectionContent;
-import io.intercom.android.sdk.helpcenter.sections.HelpCenterSection;
 
 public class IntercomHelpCenterHelpers {
 
@@ -59,38 +58,13 @@ public static WritableMap parseHelpCenterCollectionsContentToReadableMap(HelpCen
     WritableArray articles = parseArticlesToReadableArray(helpCenterCollectionContent.getHelpCenterArticles());
     helpCenterCollection.putArray("articles", articles);
 
-    WritableArray sections = parseHelpCenterSectionsToReadableArray(helpCenterCollectionContent.getHelpCenterSections());
-    helpCenterCollection.putArray("sections", sections);
+    WritableArray collections = parseHelpCenterCollectionsToReadableArray(helpCenterCollectionContent.getSubCollections());
+    helpCenterCollection.putArray("collections", collections);
 
 
     return helpCenterCollection;
   }
 
-  public static WritableMap parseHelpCenterSectionToReadableMap(HelpCenterSection helpCenterSection) {
-    WritableMap section = Arguments.createMap();
-    section.putString("title", helpCenterSection.getTitle());
-
-
-    WritableArray articles = parseArticlesToReadableArray(helpCenterSection.getHelpCenterArticles());
-    section.putArray("articles", articles);
-
-
-    return section;
-  }
-
-  public static WritableArray parseHelpCenterSectionsToReadableArray(List<HelpCenterSection> helpCenterSectionList) {
-    WritableArray sections = Arguments.createArray();
-
-    HelpCenterSection[] sectionsArray = new HelpCenterSection[helpCenterSectionList.size()];
-    sectionsArray = helpCenterSectionList.toArray(sectionsArray);
-    ;
-
-    for (HelpCenterSection section : sectionsArray) {
-      sections.pushMap(parseHelpCenterSectionToReadableMap(section));
-    }
-    return sections;
-  }
-
   public static WritableArray parseHelpCenterCollectionsToReadableArray(List<HelpCenterCollection> helpCenterCollections) {
     HelpCenterCollection[] collectionsArray = new HelpCenterCollection[helpCenterCollections.size()];
     collectionsArray = helpCenterCollections.toArray(collectionsArray);

android/src/main/java/com/intercom/reactnative/IntercomHelpers.java

@@ -6,6 +6,8 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -16,6 +18,7 @@
 import io.intercom.android.sdk.Company;
 import io.intercom.android.sdk.Intercom;
 import io.intercom.android.sdk.UserAttributes;
+import io.intercom.android.sdk.identity.Registration;
 
 public class IntercomHelpers {
 
@@ -241,4 +244,15 @@ public static String getValueAsStringForKey(ReadableMap map, String key) {
     }
     return value;
   }
+
+  public static WritableMap deconstructRegistration(Registration registration) {
+    WritableMap registrationMap = Arguments.createMap();
+    if (registration.getEmail() != null) {
+      registrationMap.putString("email", registration.getEmail());
+    }
+    if (registration.getUserId() != null) {
+      registrationMap.putString("userId", registration.getUserId());
+    }
+    return registrationMap;
+  }
 }

android/src/main/java/com/intercom/reactnative/IntercomModule.java

@@ -196,6 +196,17 @@ public void onFailure(@NonNull IntercomError intercomError) {
       });
   }
 
+  @ReactMethod
+  public void isUserLoggedIn(Promise promise) {
+    promise.resolve(Intercom.client().isUserLoggedIn());
+  }
+
+  @ReactMethod
+  public void fetchLoggedInUserAttributes(Promise promise) {
+    Registration registration = Intercom.client().fetchLoggedInUserAttributes();
+    promise.resolve(IntercomHelpers.deconstructRegistration(registration));
+  }
+
   @ReactMethod
   public void logout(Promise promise) {
     try {