From 08142cb94568c39a56a201fc363273ba345fed79 Mon Sep 17 00:00:00 2001
From: "Suresh, Kamlesh" <kamlesh.suresh@verizonwireless.com>
Date: Tue, 2 Mar 2021 15:28:10 -0500
Subject: [PATCH] fix openurl

---
 .../ActionHandling/MVMCoreActionHandler.m     | 25 ++++++++-----------
 .../MFHardCodedServerResponse.h               |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
index c7e3fc9..35fb29e 100644
--- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
+++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
@@ -93,7 +93,7 @@ NSString * const KeyActionTypeOpen = @"openPage";
     }
 }
 
-- (void)setClientParameter:(nullable NSDictionary *)clientParametersMap requestParameters:(nullable NSDictionary *)requestParameters isBackgroudRequest:(BOOL)isBackgroudRequest completionHandler:(nonnull void (^)(NSDictionary * _Nullable jsonDictionary))completionHandler {
+- (void)setClientParameter:(nullable NSDictionary *)clientParametersMap requestParameters:(nullable NSDictionary *)requestParameters isBackgroudRequest:(BOOL)isBackgroudRequest completionHandler:(nonnull void (^)(NSDictionary * _Nullable extraParameters))completionHandler {
     
     //NSDictionary *clientParametersMap = [actionInformation dict:KeyClientParameters];
     if (!clientParametersMap) {
@@ -121,11 +121,6 @@ NSString * const KeyActionTypeOpen = @"openPage";
                                                               completionHandler:^(NSDictionary<NSString *,id> * _Nullable clientParameters) {
                                                                   [MVMCoreLoggingHandler logDebugMessageWithDelegate:@"Finshed fetching client parameters"];
                                                                   if (clientParameters) {
-                                                                     // NSMutableDictionary *actionWithClientParameters = [actionInformation mutableCopy];
-                                                                     // NSMutableDictionary *extraParameters = [clientParameters mutableCopy];
-                                                                     // [extraParameters addEntriesFromDictionary:[actionWithClientParameters dictionaryForKey:KeyExtraParameters]];
-                                                                     // actionWithClientParameters[KeyExtraParameters] = extraParameters;
-                                                                      
                                                                       stopLoadingOverlay();
                                                                       completionHandler(clientParameters);
                                                                   } else {
@@ -184,9 +179,6 @@ NSString * const KeyActionTypeOpen = @"openPage";
         }];
     };
 
-    //
-    //[self setClientParameter:actionInformation completionHandler:performAction];
-
     performAction(actionInformation);
 }
 
@@ -346,26 +338,31 @@ NSString * const KeyActionTypeOpen = @"openPage";
 - (void)linkAwayAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
 
     __weak typeof(self) weakSelf = self;
-    void (^performAction)(NSDictionary*) = ^(NSDictionary* actionMap) {
+    void (^performAction)(NSDictionary*) = ^(NSDictionary* extraParamters) {
+
+        NSMutableDictionary *actionWithClientParameters = [actionInformation mutableCopy];
+        NSMutableDictionary *extraParametersT = [extraParamters mutableCopy];
+        [extraParametersT addEntriesFromDictionary:[actionWithClientParameters dictionaryForKey:KeyExtraParameters]];
+        actionWithClientParameters[KeyExtraParameters] = extraParametersT;
+
         // Gets the app url
         NSURL *appURL = nil;
-        NSString *appURLString = [actionMap string:KeyLinkAwayAppURL];
+        NSString *appURLString = [actionWithClientParameters string:KeyLinkAwayAppURL];
         if (appURLString.length > 0) {
             appURL = [NSURL URLWithString:appURLString];
         }
 
         // Gets the browser url
         NSURL *otherURL = nil;
-        NSString *otherURLString = [actionMap string:KeyLinkAwayURL];
+        NSString *otherURLString = [actionWithClientParameters string:KeyLinkAwayURL];
         if (otherURLString.length > 0) {
             otherURL = [NSURL URLWithString:otherURLString];
         }
 
         // Provide the URL and App URL to be modified if needed by a subclass or delegate.
-        [weakSelf prepareLinkAwayWithURL:otherURL appURL:appURL actionInformation:actionMap additionalData:additionalData delegateObject:delegateObject];
+        [weakSelf prepareLinkAwayWithURL:otherURL appURL:appURL actionInformation:actionWithClientParameters additionalData:additionalData delegateObject:delegateObject];
     };
 
-   // [self setClientParameter:actionInformation completionHandler:performAction];
     [self setClientParameter:[actionInformation dict:KeyClientParameters]
            requestParameters:nil
           isBackgroudRequest:false
diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
index eb9fba9..efa33b6 100644
--- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
+++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "MVMCoreRequestParameters.h"
 
-#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG
+#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG
 
 #if ENABLE_HARD_CODED_RESPONSE