From 92a58ea61e8f50e0c92179fdbcaced02dd2734cf Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Fri, 22 Jan 2021 22:19:08 -0500 Subject: [PATCH 1/4] Remove extra sessionToken. Devs can use default implementation on current --- .../Contents.swift | 1 - .../3 - User - Sign Up.xcplaygroundpage/Contents.swift | 1 - .../4 - User - Continued.xcplaygroundpage/Contents.swift | 1 - ParseSwift.playground/contents.xcplayground | 1 - Sources/ParseSwift/Internal/BaseParseUser.swift | 1 - Sources/ParseSwift/Objects/ParseUser.swift | 6 ------ Tests/ParseSwiftTests/ParseACLTests.swift | 3 +-- Tests/ParseSwiftTests/ParseAnonymousTests.swift | 3 +-- Tests/ParseSwiftTests/ParseAppleTests.swift | 3 +-- Tests/ParseSwiftTests/ParseAuthenticationTests.swift | 1 - Tests/ParseSwiftTests/ParseConfigTests.swift | 3 +-- Tests/ParseSwiftTests/ParseInstallationTests.swift | 3 +-- Tests/ParseSwiftTests/ParseRoleTests.swift | 1 - Tests/ParseSwiftTests/ParseSessionTests.swift | 1 - Tests/ParseSwiftTests/ParseUserTests.swift | 3 +-- 15 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift index a39e8fcb1..bd0dfdcf6 100644 --- a/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/12 - Roles and Relations.xcplaygroundpage/Contents.swift @@ -18,7 +18,6 @@ struct User: ParseUser { var username: String? var email: String? var password: String? - var sessionToken: String? var authData: [String: [String: String]?]? //: Your custom keys. diff --git a/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift index 7b38d1e15..367bb02d7 100644 --- a/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/3 - User - Sign Up.xcplaygroundpage/Contents.swift @@ -18,7 +18,6 @@ struct User: ParseUser { var username: String? var email: String? var password: String? - var sessionToken: String? var authData: [String: [String: String]?]? //: Your custom keys. diff --git a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift index bb7a4c143..049027588 100644 --- a/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift +++ b/ParseSwift.playground/Pages/4 - User - Continued.xcplaygroundpage/Contents.swift @@ -18,7 +18,6 @@ struct User: ParseUser { var username: String? var email: String? var password: String? - var sessionToken: String? var authData: [String: [String: String]?]? //: Your custom keys. diff --git a/ParseSwift.playground/contents.xcplayground b/ParseSwift.playground/contents.xcplayground index ab9557970..67dd1efef 100644 --- a/ParseSwift.playground/contents.xcplayground +++ b/ParseSwift.playground/contents.xcplayground @@ -14,6 +14,5 @@ - \ No newline at end of file diff --git a/Sources/ParseSwift/Internal/BaseParseUser.swift b/Sources/ParseSwift/Internal/BaseParseUser.swift index 2e3490f17..8d44f6f8d 100644 --- a/Sources/ParseSwift/Internal/BaseParseUser.swift +++ b/Sources/ParseSwift/Internal/BaseParseUser.swift @@ -9,7 +9,6 @@ import Foundation /// Used internally to form a concrete type representing `ParseUser`. internal struct BaseParseUser: ParseUser { - var sessionToken: String? var authData: [String: [String: String]?]? var username: String? var email: String? diff --git a/Sources/ParseSwift/Objects/ParseUser.swift b/Sources/ParseSwift/Objects/ParseUser.swift index a514dd217..8a47102d5 100644 --- a/Sources/ParseSwift/Objects/ParseUser.swift +++ b/Sources/ParseSwift/Objects/ParseUser.swift @@ -24,12 +24,6 @@ public protocol ParseUser: ParseObject { */ var password: String? { get set } - /** - The session token for the `ParseUser`. - This is set by the server upon successful authentication. - */ - var sessionToken: String? { get set } - /** The authentication data for the `ParseUser`. Used by `ParseAnonymous` or any authentication type that conforms to `ParseAuthentication`. diff --git a/Tests/ParseSwiftTests/ParseACLTests.swift b/Tests/ParseSwiftTests/ParseACLTests.swift index be7c2b9cf..29606c825 100644 --- a/Tests/ParseSwiftTests/ParseACLTests.swift +++ b/Tests/ParseSwiftTests/ParseACLTests.swift @@ -45,7 +45,6 @@ class ParseACLTests: XCTestCase { var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? // Your custom keys var customKey: String? @@ -55,7 +54,7 @@ class ParseACLTests: XCTestCase { var objectId: String? var createdAt: Date? - var sessionToken: String? + var sessionToken: String var updatedAt: Date? var ACL: ParseACL? diff --git a/Tests/ParseSwiftTests/ParseAnonymousTests.swift b/Tests/ParseSwiftTests/ParseAnonymousTests.swift index 5c291d2f2..3a3a6d3f0 100644 --- a/Tests/ParseSwiftTests/ParseAnonymousTests.swift +++ b/Tests/ParseSwiftTests/ParseAnonymousTests.swift @@ -25,14 +25,13 @@ class ParseAnonymousTests: XCTestCase { var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? } struct LoginSignupResponse: ParseUser { var objectId: String? var createdAt: Date? - var sessionToken: String? + var sessionToken: String var updatedAt: Date? var ACL: ParseACL? diff --git a/Tests/ParseSwiftTests/ParseAppleTests.swift b/Tests/ParseSwiftTests/ParseAppleTests.swift index 3284064f0..a068846c0 100644 --- a/Tests/ParseSwiftTests/ParseAppleTests.swift +++ b/Tests/ParseSwiftTests/ParseAppleTests.swift @@ -24,14 +24,13 @@ class ParseAppleTests: XCTestCase { var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? } struct LoginSignupResponse: ParseUser { var objectId: String? var createdAt: Date? - var sessionToken: String? + var sessionToken: String var updatedAt: Date? var ACL: ParseACL? diff --git a/Tests/ParseSwiftTests/ParseAuthenticationTests.swift b/Tests/ParseSwiftTests/ParseAuthenticationTests.swift index a10db50af..827eb358b 100644 --- a/Tests/ParseSwiftTests/ParseAuthenticationTests.swift +++ b/Tests/ParseSwiftTests/ParseAuthenticationTests.swift @@ -25,7 +25,6 @@ class ParseAuthenticationTests: XCTestCase { var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? } struct TestAuth: ParseAuthentication { diff --git a/Tests/ParseSwiftTests/ParseConfigTests.swift b/Tests/ParseSwiftTests/ParseConfigTests.swift index c69c61f44..d875bd00f 100644 --- a/Tests/ParseSwiftTests/ParseConfigTests.swift +++ b/Tests/ParseSwiftTests/ParseConfigTests.swift @@ -30,7 +30,6 @@ class ParseConfigTests: XCTestCase { // swiftlint:disable:this type_body_length var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? // Your custom keys var customKey: String? @@ -40,7 +39,7 @@ class ParseConfigTests: XCTestCase { // swiftlint:disable:this type_body_length var objectId: String? var createdAt: Date? - var sessionToken: String? + var sessionToken: String var updatedAt: Date? var ACL: ParseACL? diff --git a/Tests/ParseSwiftTests/ParseInstallationTests.swift b/Tests/ParseSwiftTests/ParseInstallationTests.swift index 8f9739e69..7c18b90bd 100644 --- a/Tests/ParseSwiftTests/ParseInstallationTests.swift +++ b/Tests/ParseSwiftTests/ParseInstallationTests.swift @@ -30,7 +30,6 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? // Your custom keys var customKey: String? @@ -40,7 +39,7 @@ class ParseInstallationTests: XCTestCase { // swiftlint:disable:this type_body_l var objectId: String? var createdAt: Date? - var sessionToken: String? + var sessionToken: String var updatedAt: Date? var ACL: ParseACL? diff --git a/Tests/ParseSwiftTests/ParseRoleTests.swift b/Tests/ParseSwiftTests/ParseRoleTests.swift index 414432892..d664b8ae7 100644 --- a/Tests/ParseSwiftTests/ParseRoleTests.swift +++ b/Tests/ParseSwiftTests/ParseRoleTests.swift @@ -42,7 +42,6 @@ class ParseRoleTests: XCTestCase { var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? // Your custom keys var customKey: String? diff --git a/Tests/ParseSwiftTests/ParseSessionTests.swift b/Tests/ParseSwiftTests/ParseSessionTests.swift index 8fbc17abe..d98913dd0 100644 --- a/Tests/ParseSwiftTests/ParseSessionTests.swift +++ b/Tests/ParseSwiftTests/ParseSessionTests.swift @@ -26,7 +26,6 @@ class ParseSessionTests: XCTestCase { var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? } struct Session: ParseSession { diff --git a/Tests/ParseSwiftTests/ParseUserTests.swift b/Tests/ParseSwiftTests/ParseUserTests.swift index 816526ab0..e7c690df0 100644 --- a/Tests/ParseSwiftTests/ParseUserTests.swift +++ b/Tests/ParseSwiftTests/ParseUserTests.swift @@ -25,7 +25,6 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length var email: String? var password: String? var authData: [String: [String: String]?]? - var sessionToken: String? // Your custom keys var customKey: String? @@ -35,7 +34,7 @@ class ParseUserTests: XCTestCase { // swiftlint:disable:this type_body_length var objectId: String? var createdAt: Date? - var sessionToken: String? + var sessionToken: String var updatedAt: Date? var ACL: ParseACL? From bfa221df28d57b8b24b6064959f6add1645ff75f Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Fri, 22 Jan 2021 22:22:54 -0500 Subject: [PATCH 2/4] podspec will need new version. --- ParseSwift.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ParseSwift.podspec b/ParseSwift.podspec index 1df2fb9ab..dd461b95d 100644 --- a/ParseSwift.podspec +++ b/ParseSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ParseSwift" - s.version = "1.0.0" + s.version = "1.0.1" s.summary = "Parse Pure Swift SDK" s.homepage = "https://github.com/parse-community/Parse-Swift" s.authors = { From abe84cef80eb4f9151483bdeb94bd91f6798dc6f Mon Sep 17 00:00:00 2001 From: Corey's iMac Date: Fri, 22 Jan 2021 22:26:38 -0500 Subject: [PATCH 3/4] fix playground --- ParseSwift.playground/contents.xcplayground | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ParseSwift.playground/contents.xcplayground b/ParseSwift.playground/contents.xcplayground index 67dd1efef..c855788d3 100644 --- a/ParseSwift.playground/contents.xcplayground +++ b/ParseSwift.playground/contents.xcplayground @@ -14,5 +14,6 @@ + - \ No newline at end of file + From 63bbdd0cb136955dc5ebf63d627365994ef9868f Mon Sep 17 00:00:00 2001 From: Corey Date: Fri, 22 Jan 2021 22:36:48 -0500 Subject: [PATCH 4/4] Update jazzy.sh --- Scripts/jazzy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/jazzy.sh b/Scripts/jazzy.sh index 6e7171a27..40e730032 100755 --- a/Scripts/jazzy.sh +++ b/Scripts/jazzy.sh @@ -5,7 +5,7 @@ bundle exec jazzy \ --author_url http://parseplatform.org \ --github_url https://github.com/parse-community/Parse-Swift \ --root-url http://parseplatform.org/Parse-Swift/api/ \ - --module-version ${ver} \ + --module-version 1.0.0 \ --theme fullwidth \ --skip-undocumented \ --output ./docs/api \