From d40f7fbb764394b8f1a7353c5ef9406b395cc072 Mon Sep 17 00:00:00 2001
From: Chris Yang <tianhangchris.yang@verizonwireless.com>
Date: Fri, 6 Jul 2018 15:11:33 -0400
Subject: [PATCH] function to update request parameter before calling handle
 open page action

---
 .../ActionHandling/MVMCoreActionHandler.m     | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
index 86ea2d6..982ea39 100644
--- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
+++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
@@ -85,6 +85,11 @@ NSString * const KeyActionTypeOpen = @"openPage";
 
 #pragma mark - Actions
 
+- (void)updateRequestParametersBeforeHandleOpenPageAction:(MVMCoreRequestParameters *)requestParameters callBack:(void (^_Nonnull)(MVMCoreRequestParameters * _Nonnull requestParameters))callback {
+    //does not do anything by default, can be override
+    callback(requestParameters);
+}
+
 - (void)logAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
     if ([delegate respondsToSelector:@selector(logActionWithActionInformation:additionalData:)]) {
         [delegate logActionWithActionInformation:actionInformation additionalData:additionalData];
@@ -115,11 +120,14 @@ NSString * const KeyActionTypeOpen = @"openPage";
         
         MVMCoreLog(@"Continuing operation after freebee request");
         MVMCoreRequestParameters *requestParameters = [[MVMCoreRequestParameters alloc] initWithActionMap:actionInformation];
-        if ([delegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
-            [delegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:additionalData];
-        } else {
-            [MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegate:delegate];
-        }
+        
+        [self updateRequestParametersBeforeHandleOpenPageAction:requestParameters callBack:^(MVMCoreRequestParameters * _Nonnull requestParameters) {
+            if ([delegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
+                [delegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:additionalData];
+            } else {
+                [MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegate:delegate];
+            }
+        }];
     } else {
         
         // No page type to load, show error.
@@ -168,15 +176,18 @@ NSString * const KeyActionTypeOpen = @"openPage";
 
 - (void)previousSubmitAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
     // Perform the previous submission.
+    __weak typeof(self) weakSelf = self;
     if ([delegate respondsToSelector:@selector(prepareRequestForPreviousSubmission:additionalData:submit:)]) {
         [delegate prepareRequestForPreviousSubmission:actionInformation additionalData:additionalData submit:^(MVMCoreRequestParameters * _Nonnull requestParameters, NSDictionary * _Nullable dataForPage) {
             
-            // Give the delegate a chance to alter the request parameters
-            if ([delegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
-                [delegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:dataForPage];
-            } else {
-                [MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegate:delegate];
-            }
+            [weakSelf updateRequestParametersBeforeHandleOpenPageAction:requestParameters callBack:^(MVMCoreRequestParameters * _Nonnull requestParameters) {
+                // Give the delegate a chance to alter the request parameters
+                if ([delegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
+                    [delegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:dataForPage];
+                } else {
+                    [MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegate:delegate];
+                }
+            }];
         }];
     }
 }