Merge pull request #1 from fattmerchantorg/version-and-jwt-fix

Get package to work on iOS 11+ and fix logic around JWT optional
fattmerchantorg · Aug 12, 2021 · 80f0ca7 · 80f0ca7
2 parents a510b83 + da6be78
commit 80f0ca7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "SwiftyJSON",
+        "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git",
+        "state": {
+          "branch": null,
+          "revision": "2b6054efa051565954e1d2b9da831680026cd768",
+          "version": "4.3.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 
 let package = Package(
     name: "SaaSquatch",
-    platforms: [ .iOS(.v13) ],
+    platforms: [ .iOS(.v11) ],
     products: [
         .library(name: "SaaSquatch", targets: ["SaaSquatch"]),
         .library(name: "SaaSquatchWebView", targets: ["SaaSquatchWebView"])

diff --git a/Sources/SaaSquatch/WidgetUpsertInput.swift b/Sources/SaaSquatch/WidgetUpsertInput.swift
@@ -7,7 +7,7 @@ public struct WidgetUpsertInput {
     public let userInput: JSON
     public let accountId: String
     public let userId: String
-    public let userJwt: String
+    public let userJwt: String?
     public let widgetType: WidgetType?
     public let engagementMedium: String?
 
@@ -137,7 +137,9 @@ public struct WidgetUpsertInput {
             }
 
             guard let userJwt = userJwt else {
+              if (userInput == nil || userId == nil || accountId == nil) {
                 throw BuilderError.incompleteBuilder(builder: "WidgetUpsertInput", reason: "must call setUserJwt or setUserInputWithUserJwt")
+              }
             }
 
             return WidgetUpsertInput(userInput: userInput, accountId: accountId, userId: userId, userJwt: userJwt, widgetType: widgetType, engagementMedium: engagementMedium)