Merge pull request #250 from skyflowapi/public-release/1.21.0

SK-1147 Public release/1.21.0

Author: skyflow-bharti

.swiftpm/xcode/xcshareddata/xcschemes/Skyflow.xcscheme

@@ -204,6 +204,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "skyflow-iOS-composableTests"
+               BuildableName = "skyflow-iOS-composableTests"
+               BlueprintName = "skyflow-iOS-composableTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Package.swift

@@ -37,9 +37,10 @@ let package = Package(
                         dependencies: ["Skyflow"]),
         .testTarget(name: "skyflow-iOS-elementTests",
                     dependencies: ["Skyflow"]),
-            .testTarget(name: "skyflow-iOS-utilTests",
+        .testTarget(name: "skyflow-iOS-utilTests",
                         dependencies: ["Skyflow"]),
-                .testTarget(name: "skyflow-iOS-scenarioTests",
-                            dependencies: ["Skyflow"])
+        .testTarget(name: "skyflow-iOS-scenarioTests",
+                            dependencies: ["Skyflow"]),
+        .testTarget(name: "skyflow-iOS-composableTests", dependencies: ["Skyflow"])
     ]
 )

Skyflow.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |spec|
 
   spec.name         = "Skyflow"
 
-  spec.version      = "1.20.0"
+  spec.version      = "1.21.0"
 
   spec.summary      = "skyflow-iOS"
 
@@ -20,7 +20,7 @@ Pod::Spec.new do |spec|
 
   spec.ios.deployment_target = "9.0"
 
-  spec.source       = { :git => "https://github.com/skyflowapi/skyflow-iOS.git", :tag => "1.20.0" }
+  spec.source       = { :git => "https://github.com/skyflowapi/skyflow-iOS.git", :tag => "1.21.0" }
 
   spec.source_files  = "Sources/Skyflow/**/*.{swift}"
 

Sources/Skyflow/Version.swift

@@ -11,4 +11,4 @@
 
 import Foundation
 
-var SDK_VERSION = "1.20.0"
+var SDK_VERSION = "1.21.0"

Sources/Skyflow/collect/CollectContainer.swift

@@ -13,12 +13,12 @@ public extension Container {
      func create(input: CollectElementInput, options: CollectElementOptions? = CollectElementOptions()) -> TextField where T: CollectContainer {
         var tempContextOptions = self.skyflow.contextOptions
         tempContextOptions.interface = .COLLECT_CONTAINER
-        let skyflowElement = TextField(input: input, options: options!, contextOptions: tempContextOptions)
+         let skyflowElement = TextField(input: input, options: options!, contextOptions: tempContextOptions, elements: elements)
         elements.append(skyflowElement)
         let uuid = NSUUID().uuidString
         self.skyflow.elementLookup[uuid] = skyflowElement
         skyflowElement.uuid = uuid
-        Log.info(message: .CREATED_ELEMENT, values: [input.label == "" ? "collect" : input.label], contextOptions: tempContextOptions)
+         Log.info(message: .CREATED_ELEMENT, values: [input.label == "" ? "collect" : input.label], contextOptions: tempContextOptions)
         return skyflowElement
     }
 
@@ -105,10 +105,10 @@ public extension Container {
 
     private func checkElement(element: TextField) -> ErrorCodes? {
         if element.collectInput.table.isEmpty {
-            return .EMPTY_TABLE_NAME_IN_COLLECT(value: element.collectInput.type.name)
+            return .EMPTY_TABLE_NAME_IN_COLLECT(value: element.collectInput.type?.name ?? element.fieldType.name)
         }
         if element.collectInput.column.isEmpty {
-            return .EMPTY_COLUMN_NAME_IN_COLLECT(value: element.collectInput.type.name)
+            return .EMPTY_COLUMN_NAME_IN_COLLECT(value: element.collectInput.type?.name ?? element.fieldType.name)
         }
         if !element.isMounted() {
             return .UNMOUNTED_COLLECT_ELEMENT(value: element.collectInput.column)

Sources/Skyflow/composable/AutoshiftAllowed.swift

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2022 Skyflow
+*/
+//
+//  Created by Bharti Sagar on 19/07/23.
+//
+
+import Foundation
+
+let ALLOWED_FOCUS_AUTO_SHIFT_ELEMENT_TYPES: [ElementType] = [
+    .CARD_NUMBER,
+    .EXPIRATION_DATE,
+    .EXPIRATION_YEAR,
+    .EXPIRATION_MONTH
+]

Sources/Skyflow/composable/ComposableContainer.swift

@@ -95,7 +95,7 @@ public class Client {
         }
     }
 
-    public func container<T>(type: T.Type, options: ContainerOptions? = ContainerOptions()) -> Container<T>? {
+    public func container<T>(type: T.Type, options: ContainerOptions? = nil) -> Container<T>? {
         if options != nil {
             // Set options
         }
@@ -109,7 +109,9 @@ public class Client {
             Log.info(message: .REVEAL_CONTAINER_CREATED, contextOptions: self.contextOptions)
             return Container<T>(skyflow: self)
         }
-
+        if T.self == ComposableContainer.self {
+            return Container<T>(skyflow: self, options: options)
+        }
         return nil
     }
 

Sources/Skyflow/core/Client.swift

@@ -11,4 +11,5 @@ public enum EventName: String {
     case READY = "READY"
     case FOCUS = "FOCUS"
     case BLUR = "BLUR"
+    case SUBMIT = "SUBMIT"
 }

Sources/Skyflow/core/EventName.swift

@@ -14,6 +14,7 @@ import Foundation
 internal enum InterfaceName {
     case COLLECT_CONTAINER
     case REVEAL_CONTAINER
+    case COMPOSABLE_CONTAINER
     case CLIENT
     case INSERT
     case DETOKENIZE
@@ -29,6 +30,7 @@ internal enum InterfaceName {
         case .DETOKENIZE: return "client detokenize"
         case .GETBYID: return "client getById"
         case .EMPTY: return ""
+        case .COMPOSABLE_CONTAINER: return "composable container"
         }
     }
 }