refactor: switch to primaryKey (#7)

* Update Parse and Leaf

* Switch to primaryKey

* bump ParseSwift

Author: cbaker6

Package.resolved

@@ -11,10 +11,10 @@ let package = Package(
     ],
     dependencies: [
         // 💧 A server-side Swift web framework.
-        .package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "4.65.2")),
-        .package(url: "https://github.com/vapor/leaf.git", .upToNextMajor(from: "4.2.1")),
-        .package(url: "https://github.com/parse-community/Parse-Swift.git",
-                 .upToNextMajor(from: "4.14.1")),
+        .package(url: "https://github.com/vapor/vapor.git", .upToNextMajor(from: "4.66.1")),
+        .package(url: "https://github.com/vapor/leaf.git", .upToNextMajor(from: "4.2.2")),
+        .package(url: "https://github.com/netreconlab/Parse-Swift.git",
+                 .upToNextMajor(from: "4.15.1")),
     ],
     targets: [
         .target(

Package.swift

@@ -41,7 +41,7 @@ guard let parseServerUrl = URL(string: "http://localhost:1337/1") else {
 // Initialize the Parse-Swift SDK
 ParseSwift.initialize(applicationId: "applicationId", // Required: Change to your applicationId.
                       clientKey: "clientKey", // Required: Change to your clientKey.
-                      masterKey: "masterKey", // Required: Change to your masterKey.
+                      primaryKey: "primaryKey", // Required: Change to your primaryKey.
                       serverURL: parseServerUrl,
                       usingPostForQuery: true) { _, completionHandler in
     completionHandler(.performDefaultHandling, nil)
@@ -139,9 +139,9 @@ app.post("bar",
         return ParseHookResponse(error: .init(code: .missingObjectId,
                                               message: "Object not sent in request."))
     }
-    // To query using the masterKey pass the `useMasterKey option
+    // To query using the primaryKey pass the `usePrimaryKey` option
     // to ther query.
-    let scores = try await GameScore.query.findAll(options: [.useMasterKey])
+    let scores = try await GameScore.query.findAll(options: [.usePrimaryKey])
     req.logger.info("All scores: \(scores)")
     return ParseHookResponse(success: object)
 }

README.md

@@ -57,9 +57,9 @@
                         return ParseHookResponse(error: .init(code: .missingObjectId,
                                                               message: "Object not sent in request."))
                     }
-                    // To query using the masterKey pass the `useMasterKey option
+                    // To query using the primaryKey pass the `usePrimaryKey` option
                     // to ther query.
-                    let scores = try await GameScore.query.findAll(options: [.useMasterKey])
+                    let scores = try await GameScore.query.findAll(options: [.usePrimaryKey])
                     req.logger.info("All scores: \(scores)")
                     return ParseHookResponse(success: object)
                 }
@@ -179,9 +179,9 @@
                         return ParseHookResponse(error: .init(code: .missingObjectId,
                                                               message: "Object not sent in request."))
                     }
-                    // To query using the masterKey pass the `useMasterKey option
+                    // To query using the primaryKey pass the `usePrimaryKey` option
                     // to ther query.
-                    let scores = try await GameScore.query.findAll(options: [.useMasterKey])
+                    let scores = try await GameScore.query.findAll(options: [.usePrimaryKey])
                     req.logger.info("All scores: \(scores)")
                     return ParseHookResponse(success: object)
                 }

Sources/ParseServerSwift/Documentation.docc/Cloud Code.tutorial

@@ -38,7 +38,7 @@
                 // Initialize the Parse-Swift SDK
                 ParseSwift.initialize(applicationId: "applicationId", // Required: Change to your applicationId.
                                       clientKey: "clientKey", // Required: Change to your clientKey.
-                                      masterKey: "masterKey", // Required: Change to your masterKey.
+                                      primaryKey: "primaryKey", // Required: Change to your primaryKey.
                                       serverURL: parseServerUrl,
                                       usingPostForQuery: true) { _, completionHandler in
                     completionHandler(.performDefaultHandling, nil)

Sources/ParseServerSwift/Documentation.docc/Configuring Parse Server Swift.tutorial

@@ -1,6 +1,6 @@
 //
 //  User.swift
-//  
+//
 //
 //  Created by Corey E. Baker on 6/20/22.
 //
@@ -9,8 +9,8 @@ import Foundation
 import ParseSwift
 
 /**
- An example `ParseUser`. You will want to replace this
- with your version of `ParseUser`.
+ An example `ParseUser`. You will want to add custom
+ properties to reflect the `ParseUser` on your Parse Server.
  */
 struct User: ParseCloudUser {
 
@@ -25,4 +25,6 @@ struct User: ParseCloudUser {
     var ACL: ParseACL?
     var originalData: Data?
     var sessionToken: String?
+    // var _failed_login_count: Int?
+    // var _account_lockout_expires_at: Date?
 }

Sources/ParseServerSwift/Models/User.swift

@@ -35,7 +35,7 @@ public func configure(_ app: Application) throws {
     // Initialize the Parse-Swift SDK
     ParseSwift.initialize(applicationId: "applicationId", // Required: Change to your applicationId.
                           clientKey: "clientKey", // Required: Change to your clientKey.
-                          masterKey: "masterKey", // Required: Change to your masterKey.
+                          primaryKey: "primaryKey", // Required: Change to your primaryKey.
                           serverURL: parseServerUrl,
                           usingPostForQuery: true) { _, completionHandler in
         completionHandler(.performDefaultHandling, nil)

Sources/ParseServerSwift/configure.swift

@@ -54,9 +54,9 @@ func routes(_ app: Application) throws {
             return ParseHookResponse(error: .init(code: .missingObjectId,
                                                   message: "Object not sent in request."))
         }
-        // To query using the masterKey pass the `useMasterKey option
+        // To query using the primaryKey pass the `usePrimaryKey` option
         // to ther query.
-        let scores = try await GameScore.query.findAll(options: [.useMasterKey])
+        let scores = try await GameScore.query.findAll(options: [.usePrimaryKey])
         req.logger.info("All scores: \(scores)")
         return ParseHookResponse(success: object)
     }