Implemented WMTTemplates

WultraMobileTokenSDK.xcodeproj/project.pbxproj

@@ -73,6 +73,10 @@
 		EA6DDF1C29F807230011E234 /* OperationUIDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA6DDF1B29F807230011E234 /* OperationUIDataTests.swift */; };
 		EA74F7B32C2561BB004340B9 /* WMTResultTexts.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA74F7B22C2561BB004340B9 /* WMTResultTexts.swift */; };
 		EA7A6E582B0E639800C1D4F4 /* WMTOperationDetailRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7A6E572B0E639800C1D4F4 /* WMTOperationDetailRequest.swift */; };
+		EA7EA22D2C494478000ECA41 /* WMTTemplateVisualParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA951B4F2C412E43006C76B5 /* WMTTemplateVisualParser.swift */; };
+		EA7EA22E2C49447B000ECA41 /* WMTTemplateListVisual.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA392BB62C4941CE00B6ADB7 /* WMTTemplateListVisual.swift */; };
+		EA7EA2302C494546000ECA41 /* WMTTemplateDetailVisual.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7EA22F2C494546000ECA41 /* WMTTemplateDetailVisual.swift */; };
+		EA9795132C2C18450073E861 /* WMTTemplates.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA9795122C2C18450073E861 /* WMTTemplates.swift */; };
 		EA9CE2BE2AEAA9FD00FE4E35 /* WMTProximityCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA9CE2BD2AEAA9FD00FE4E35 /* WMTProximityCheck.swift */; };
 		EA9CE2C22AEBDB0D00FE4E35 /* WMTPACUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA9CE2C12AEBDB0D00FE4E35 /* WMTPACUtils.swift */; };
 		EAB7054A2AF1161500756AC2 /* PACParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB705492AF1161500756AC2 /* PACParserTests.swift */; };
@@ -153,6 +157,7 @@
 		DCE660D024CEBECA00870E53 /* IntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationTests.swift; sourceTree = "<group>"; };
 		DCE660D224CEF56400870E53 /* IntegrationProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationProxy.swift; sourceTree = "<group>"; };
 		EA294F3C29F6A07A00A0494E /* WMTOperationUIData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTOperationUIData.swift; sourceTree = "<group>"; };
+		EA392BB62C4941CE00B6ADB7 /* WMTTemplateListVisual.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTTemplateListVisual.swift; sourceTree = "<group>"; };
 		EA44366929F9294600DDEC1C /* WMTPostApprovaScreenReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTPostApprovaScreenReview.swift; sourceTree = "<group>"; };
 		EA44366B29F9297100DDEC1C /* WMTPostApprovaScreenRedirect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTPostApprovaScreenRedirect.swift; sourceTree = "<group>"; };
 		EA44366D29F9298100DDEC1C /* WMTPostApprovaScreenGeneric.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTPostApprovaScreenGeneric.swift; sourceTree = "<group>"; };
@@ -161,6 +166,9 @@
 		EA6DDF1B29F807230011E234 /* OperationUIDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperationUIDataTests.swift; sourceTree = "<group>"; };
 		EA74F7B22C2561BB004340B9 /* WMTResultTexts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTResultTexts.swift; sourceTree = "<group>"; };
 		EA7A6E572B0E639800C1D4F4 /* WMTOperationDetailRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTOperationDetailRequest.swift; sourceTree = "<group>"; };
+		EA7EA22F2C494546000ECA41 /* WMTTemplateDetailVisual.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTTemplateDetailVisual.swift; sourceTree = "<group>"; };
+		EA951B4F2C412E43006C76B5 /* WMTTemplateVisualParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTTemplateVisualParser.swift; sourceTree = "<group>"; };
+		EA9795122C2C18450073E861 /* WMTTemplates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WMTTemplates.swift; sourceTree = "<group>"; };
 		EA9CE2BD2AEAA9FD00FE4E35 /* WMTProximityCheck.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WMTProximityCheck.swift; sourceTree = "<group>"; };
 		EA9CE2C12AEBDB0D00FE4E35 /* WMTPACUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WMTPACUtils.swift; sourceTree = "<group>"; };
 		EAB705492AF1161500756AC2 /* PACParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PACParserTests.swift; sourceTree = "<group>"; };
@@ -226,6 +234,7 @@
 		DC3D0B352480F368000DC4D9 /* UserOperation */ = {
 			isa = PBXGroup;
 			children = (
+				EA951B512C412F84006C76B5 /* TemplateParser */,
 				EA6DDF0D29F8031F0011E234 /* Screens */,
 				DC059A3C244DD30900B24878 /* Attributes */,
 				DCC5CCAD2449F7AC004679AC /* WMTUserOperation.swift */,
@@ -235,6 +244,7 @@
 				EA294F3C29F6A07A00A0494E /* WMTOperationUIData.swift */,
 				EA9CE2BD2AEAA9FD00FE4E35 /* WMTProximityCheck.swift */,
 				EA74F7B22C2561BB004340B9 /* WMTResultTexts.swift */,
+				EA9795122C2C18450073E861 /* WMTTemplates.swift */,
 			);
 			path = UserOperation;
 			sourceTree = "<group>";
@@ -455,6 +465,16 @@
 			path = Screens;
 			sourceTree = "<group>";
 		};
+		EA951B512C412F84006C76B5 /* TemplateParser */ = {
+			isa = PBXGroup;
+			children = (
+				EA951B4F2C412E43006C76B5 /* WMTTemplateVisualParser.swift */,
+				EA392BB62C4941CE00B6ADB7 /* WMTTemplateListVisual.swift */,
+				EA7EA22F2C494546000ECA41 /* WMTTemplateDetailVisual.swift */,
+			);
+			path = TemplateParser;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -608,6 +628,7 @@
 				DC0268DF29965495000BB9FA /* WMTOperationListResponse.swift in Sources */,
 				DC8CB202244DCBE2009DDAA3 /* WMTOperations.swift in Sources */,
 				DC48803E292282FF00DB844B /* WMTInboxMessage.swift in Sources */,
+				EA7EA22E2C49447B000ECA41 /* WMTTemplateListVisual.swift in Sources */,
 				DCC5CCB52449F8E9004679AC /* WMTOperationAttributeAmount.swift in Sources */,
 				DCC5CCD6244DBB7F004679AC /* WMTPushRegistrationData.swift in Sources */,
 				DC3D0B392480F886000DC4D9 /* WMTLocalOperation.swift in Sources */,
@@ -621,6 +642,8 @@
 				DC81D1CD244F640600F80CD6 /* WMTPush.swift in Sources */,
 				DC6E52D6259C964600FC25BE /* WMTOperationExpirationWatcher.swift in Sources */,
 				DCC5CCDA244DBBE2004679AC /* WMTRejectionData.swift in Sources */,
+				EA9795132C2C18450073E861 /* WMTTemplates.swift in Sources */,
+				EA7EA22D2C494478000ECA41 /* WMTTemplateVisualParser.swift in Sources */,
 				DC48803F292282FF00DB844B /* WMTInboxMessageDetail.swift in Sources */,
 				EA6DDF0F29F8036B0011E234 /* WMTPreApprovalScreen.swift in Sources */,
 				DCAB7BC824580B4C0006989D /* WMTQROperationParser.swift in Sources */,
@@ -649,6 +672,7 @@
 				DCE5EAB026BD81150061861A /* WMTOperationHistoryEntry.swift in Sources */,
 				EACAF7B02A126B7D0021CA54 /* WMTJsonValue.swift in Sources */,
 				DCAB7BCA24580BAC0006989D /* WMTQROperation.swift in Sources */,
+				EA7EA2302C494546000ECA41 /* WMTTemplateDetailVisual.swift in Sources */,
 				DCC5CCBF2449F981004679AC /* WMTOperationAttributePartyInfo.swift in Sources */,
 				DC81D1CB244F451E00F80CD6 /* WMTPushImpl.swift in Sources */,
 				EA9CE2BE2AEAA9FD00FE4E35 /* WMTProximityCheck.swift in Sources */,

WultraMobileTokenSDK/Operations/Model/Responses/WMTOperationListResponse.swift

@@ -29,8 +29,13 @@ public class WMTOperationListResponse<T: WMTUserOperation>: WPNResponseArray<T>
     public required init(from decoder: Decoder) throws {
 
         let c = try decoder.container(keyedBy: Keys.self)
-        currentTimestamp = try? c.decode(Date.self, forKey: Keys.currentTimestamp)
 
+        do {
+            currentTimestamp = try c.decodeIfPresent(Date.self, forKey: .currentTimestamp)
+        } catch {
+            D.error("Failed to decode \(Keys.currentTimestamp) - \(error), setting to null")
+            currentTimestamp = nil
+        }
         try super.init(from: decoder)
     }
 

WultraMobileTokenSDK/Operations/Model/UserOperation/Attributes/WMTOperationAttributeImage.swift

@@ -42,7 +42,13 @@ public class WMTOperationAttributeImage: WMTOperationAttribute {
         let c = try decoder.container(keyedBy: Keys.self)
 
         self.thumbnailUrl = try c.decode(String.self, forKey: .thumbnailUrl)
-        self.originalUrl = try? c.decode(String.self, forKey: .originalUrl)
+
+        do {
+            originalUrl = try c.decodeIfPresent(String.self, forKey: .originalUrl)
+        } catch {
+            D.error("Failed to decode \(Keys.originalUrl) - \(error), setting to null")
+            originalUrl = nil
+        }
 
         try super.init(from: decoder)
     }

WultraMobileTokenSDK/Operations/Model/UserOperation/Screens/WMTPostApprovaScreenReview.swift

@@ -58,10 +58,25 @@ public class WMTReviewPostApprovalScreenPayload: WMTPostApprovalScreenPayload {
     // MARK: Internals
 
     public required init(from decoder: Decoder) throws {
-
         let c = try decoder.container(keyedBy: Keys.self)
-        attributes = (try? c.decode([WMTOperationAttributeDecodable].self, forKey: .attributes).map {
-            $0.attrObject }) ?? []
+
+        var operationAttributes: [WMTOperationAttribute] = []
+        do {
+            var container = try c.nestedUnkeyedContainer(forKey: .attributes)
+            // If decoding fails log it and continue decoding until the end of container
+            while container.isAtEnd == false {
+                do {
+                    let attribute = try WMTOperationAttributeDecodable(from: container.superDecoder())
+                    operationAttributes.append(attribute.attrObject)
+                } catch {
+                    D.error("Error decoding WMTOperationFormData attribute: \(error)")
+                }
+            }
+        } catch {
+            D.error("No attributes in WMTOperationFormData: \(error)")
+        }
+        attributes = operationAttributes
+
         super.init()
     }
 

WultraMobileTokenSDK/Operations/Model/UserOperation/Screens/WMTPreApprovalScreen.swift

@@ -56,8 +56,20 @@ public class WMTPreApprovalScreen: Codable {
         type = ScreenType(rawValue: t) ?? .unknown
         heading = try c.decode(String.self, forKey: .heading)
         message = try c.decode(String.self, forKey: .message)
-        items = try? c.decode([String].self, forKey: .items)
-        approvalType = try? c.decode(WMTPreApprovalScreenConfirmAction.self, forKey: .approvalType)
+
+        do {
+            items = try c.decodeIfPresent([String].self, forKey: .items)
+        } catch {
+            D.error("Failed to decode \(Keys.items) - \(error), setting to null")
+            items = nil
+        }
+
+        do {
+            approvalType = try c.decodeIfPresent(WMTPreApprovalScreenConfirmAction.self, forKey: .approvalType)
+        } catch {
+            D.error("Failed to decode \(Keys.approvalType) - \(error), setting to null")
+            approvalType = nil
+        }
     }
 
     public init(type: ScreenType, heading: String, message: String, items: [String]? = nil, approvalType: WMTPreApprovalScreenConfirmAction?) {