mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed to read and set requestUrl in restart action.

Browse Source
This commit is contained in:
Sumanth Nadigadda 2022-09-28 10:15:57 +05:30
parent 3ecd769f1c
commit ec70621ea0
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCore/MVMCore/ActionHandling/ActionRestartHandler.swift
View File

@ -26,7 +26,7 @@ open class ActionRestartHandler: MVMCoreActionHandlerProtocol {
continuation.resume(throwing: MVMCoreError.errorObject(error)) continuation.resume(throwing: MVMCoreError.errorObject(error))
} else { } else {
// Restarts the app (forcing any passed in page types). // Restarts the app (forcing any passed in page types).
MVMCoreSessionObject.sharedGlobal()?.restartSession(withPageType: model.pageType, parameters: model.extraParameters.toJSON(), clearAllVariables: true) MVMCoreSessionObject.sharedGlobal()?.restartSession(withPageType: model.pageType, requestUrl: model.requestUrl, parameters: model.extraParameters?.toJSON(), clearAllVariables: true)
continuation.resume() continuation.resume()
} }
}) })

4
MVMCore/MVMCore/ActionHandling/ActionRestartModel.swift
View File

@ -14,6 +14,7 @@ public struct ActionRestartModel: ActionModelProtocol {
public static var identifier: String = "restart" public static var identifier: String = "restart"
public var actionType: String = ActionRestartModel.identifier public var actionType: String = ActionRestartModel.identifier
public var requestUrl: String?
public var extraParameters: JSONValueDictionary? public var extraParameters: JSONValueDictionary?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
@ -24,8 +25,9 @@ public struct ActionRestartModel: ActionModelProtocol {
// MARK: - Initializer // MARK: - Initializer
//-------------------------------------------------- //--------------------------------------------------
public init(_ pageType: String? = nil, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) { public init(_ pageType: String? = nil, _ requestUrl: String? = nil, _ extraParameters: JSONValueDictionary? = nil, _ analyticsData: JSONValueDictionary? = nil) {
self.pageType = pageType self.pageType = pageType
self.requestUrl = requestUrl
self.extraParameters = extraParameters self.extraParameters = extraParameters
self.analyticsData = analyticsData self.analyticsData = analyticsData
} }

2
MVMCore/MVMCore/Session/MVMCoreSessionObject.h
View File

@ -36,7 +36,7 @@
- (nullable NSDictionary *)getInitialParametersExcludingSections:(nullable NSSet<NSString *> *)excludeSections; - (nullable NSDictionary *)getInitialParametersExcludingSections:(nullable NSSet<NSString *> *)excludeSections;
/// Restarts the application session state. Can clear variables and pass a page type if needed. /// Restarts the application session state. Can clear variables and pass a page type if needed.
- (void)restartSessionWithPageType:(nullable NSString *)pageType parameters:(nullable NSDictionary *)parameters clearAllVariables:(BOOL)clearAllVariables; - (void)restartSessionWithPageType:(nullable NSString *)pageType requestUrl:(nullable NSString *)requestUrl parameters:(nullable NSDictionary *)parameters clearAllVariables:(BOOL)clearAllVariables;
/// Redirect, leaving the current app experience. /// Redirect, leaving the current app experience.
- (void)redirectWithInfo:(nullable NSDictionary *)dictionary; - (void)redirectWithInfo:(nullable NSDictionary *)dictionary;

2
MVMCore/MVMCore/Session/MVMCoreSessionObject.m
View File

@ -36,7 +36,7 @@
return nil; return nil;
} }
- (void)restartSessionWithPageType:(nullable NSString *)pageType parameters:(nullable NSDictionary *)parameters clearAllVariables:(BOOL)clearAllVariables { - (void)restartSessionWithPageType:(nullable NSString *)pageType requestUrl:(nullable NSString*)requestUrl parameters:(nullable NSDictionary *)parameters clearAllVariables:(BOOL)clearAllVariables {
// Clears the singletons of any session related data. // Clears the singletons of any session related data.
if (clearAllVariables) { if (clearAllVariables) {
[self clearSessionObject]; [self clearSessionObject];