Merge pull request #398 from Iterable/MOB-4695-Authhandler-support-for-success-and-failure-callbacks

Mob 4695 authhandler support for success and failure callbacks

Author: Ayyanchira

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

@@ -592,12 +592,13 @@ public String onAuthTokenRequested() {
     public void onTokenRegistrationSuccessful(String authToken) {
         IterableLogger.v(TAG, "authToken successfully set");
         //TODO: Pass successhandler to event listener
+        sendEvent(EventName.handleAuthSuccessCalled.name(), null);
     }
 
     @Override
     public void onTokenRegistrationFailed(Throwable object) {
         IterableLogger.v(TAG, "Failed to set authToken");
-        //TODO: Pass failureObject to event listener
+        sendEvent(EventName.handleAuthFailureCalled.name(), null);
     }
 
     @ReactMethod
@@ -643,5 +644,7 @@ enum EventName {
     handleCustomActionCalled,
     handleInAppCalled,
     handleAuthCalled,
-    receivedIterableInboxChanged
+    receivedIterableInboxChanged,
+    handleAuthSuccessCalled,
+    handleAuthFailureCalled
 }

ios/RNIterableAPI/ReactIterableAPI.swift

@@ -33,6 +33,8 @@ class ReactIterableAPI: RCTEventEmitter {
         case handleInAppCalled
         case handleAuthCalled
         case receivedIterableInboxChanged
+        case handleAuthSuccessCalled
+        case handleAuthFailureCalled
     }
 
     override func supportedEvents() -> [String]! {
@@ -662,12 +664,18 @@ extension ReactIterableAPI: IterableAuthDelegate {
                 DispatchQueue.main.async {
                     completion(self.passedAuthToken)
                 }
+                
+                self.sendEvent(withName: EventName.handleAuthSuccessCalled.rawValue,
+                               body: nil)
             } else {
                 ITBInfo("authTokenRetrieval timed out")
 
                 DispatchQueue.main.async {
                     completion(nil)
                 }
+                
+                self.sendEvent(withName: EventName.handleAuthFailureCalled.rawValue,
+                               body: nil)
             }
         }
     }

ts/Iterable.ts

@@ -15,7 +15,7 @@ import {
 
 import IterableInAppManager from './IterableInAppManager'
 import IterableInAppMessage from './IterableInAppMessage'
-import IterableConfig from './IterableConfig'
+import IterableConfig, { AuthResponse } from './IterableConfig'
 import { IterableLogger } from './IterableLogger'
 
 const RNIterableAPI = NativeModules.RNIterableAPI
@@ -30,6 +30,11 @@ enum IterableActionSource {
   inApp = 2
 }
 
+enum AuthResponseCallback {
+  SUCCESS,
+  FAILURE,
+}
+
 /**
 * Enum representing what level of logs will Android and iOS project be printing on their consoles respectively.
 */
@@ -118,7 +123,9 @@ enum EventName {
   handleCustomActionCalled = "handleCustomActionCalled",
   handleInAppCalled = "handleInAppCalled",
   handleAuthCalled = "handleAuthCalled",
-  receivedIterableInboxChanged = "receivedIterableInboxChanged"
+  receivedIterableInboxChanged = "receivedIterableInboxChanged",
+  handleAuthSuccessCalled = "handleAuthSuccessCalled",
+  handleAuthFailureCalled = "handleAuthFailureCalled"
 }
 
 class Iterable {
@@ -634,13 +641,52 @@ class Iterable {
     }
 
     if (Iterable.savedConfig.authHandler) {
+      var authResponseCallback: AuthResponseCallback
       RNEventEmitter.addListener(
         EventName.handleAuthCalled,
         () => {
           Iterable.savedConfig.authHandler!()
-            .then(authToken => {
-              RNIterableAPI.passAlongAuthToken(authToken)
-            })
+            .then(promiseResult => {
+            // Promise result can be either just String OR of type AuthResponse. 
+            // If type AuthReponse, authToken will be parsed looking for `authToken` within promised object. Two additional listeners will be registered for success and failure callbacks sent by native bridge layer.
+            // Else it will be looked for as a String.
+              if(typeof promiseResult === typeof (new AuthResponse())) {
+               
+                RNIterableAPI.passAlongAuthToken((promiseResult as AuthResponse).authToken)
+
+                setTimeout(() => {
+                  if(authResponseCallback === AuthResponseCallback.SUCCESS) {
+                    if((promiseResult as AuthResponse).successCallback){
+                      (promiseResult as AuthResponse).successCallback!()
+                    }
+                  } else if(authResponseCallback === AuthResponseCallback.FAILURE) {
+                    if((promiseResult as AuthResponse).failureCallback){
+                      (promiseResult as AuthResponse).failureCallback!()
+                    }
+                  } else {
+                    Iterable.logger.log('No callback received from native layer')
+                  }
+                }, 1000)
+              } else if (typeof promiseResult === typeof "") {
+                //If promise only returns string
+                RNIterableAPI.passAlongAuthToken((promiseResult as String))
+              } else {
+                Iterable.logger.log('Unexpected promise returned. Auth token expects promise of String or AuthResponse type.')
+              }
+            }).catch(e => Iterable.logger.log(e))
+        }
+      )
+
+      RNEventEmitter.addListener(
+        EventName.handleAuthSuccessCalled,
+        () => {
+          authResponseCallback = AuthResponseCallback.SUCCESS
+        }
+      )
+      RNEventEmitter.addListener(
+        EventName.handleAuthFailureCalled,
+        () => {
+          authResponseCallback = AuthResponseCallback.FAILURE
         }
       )
     }

ts/IterableConfig.ts

@@ -10,6 +10,9 @@ import { IterableInAppShowResponse } from './IterableInAppClasses'
 
 import IterableInAppMessage from './IterableInAppMessage'
 
+
+type AuthCallBack = (() => void)
+
 /**
 Iterable Configuration Object. Use this when initializing the API.
 */
@@ -57,8 +60,8 @@ class IterableConfig {
   /**
    * The handler with which your own calls to your backend containing the auth token happen
    */
-  authHandler?: () => Promise<string | undefined>
-
+  authHandler?:() => Promise<AuthResponse | String | undefined>
+  
   /**
    * Set the verbosity of Android and iOS project's log system. 
    * By default, you will be able to see info level logs printed in IDE when running the app. 
@@ -106,4 +109,10 @@ class IterableConfig {
   }
 }
 
+export class AuthResponse {
+  authToken?: string = ""
+  successCallback?: AuthCallBack
+  failureCallback?: AuthCallBack
+} 
+
 export default IterableConfig