Merge branch 'master' into dependabot/bundler/rexml-3.4.2

Author: mtrezza

.github/workflows/ci.yml

@@ -8,8 +8,7 @@ on:
     branches:
       - "**"
 env:
-  CI_XCODE_15: /Applications/Xcode_15.4.0.app/Contents/Developer
-  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
 jobs:
   test-xcode:
     env:
@@ -19,89 +18,42 @@ jobs:
       matrix:
         include:
           # Xcode
-          - name: Xcode 15
-            script: build:starters
-            iosVersion: '18.1'
-            iosDeviceModel: iPhone 16
-            watchOsVersion: '11.1'
-            watchDeviceModel: Apple Watch Series 10 (46mm)
-            tvOsVersion: '18.1'
-            tvDeviceModel: Apple TV
-            macosVersion: 14
-            developerDir: CI_XCODE_15
           - name: Xcode 16
             script: build:starters
-            iosVersion: '18.1'
+            iosVersion: '18.5'
             iosDeviceModel: iPhone 16
-            watchOsVersion: '11.1'
+            watchOsVersion: '11.5'
             watchDeviceModel: Apple Watch Series 10 (46mm)
-            tvOsVersion: '18.1'
+            tvOsVersion: '18.5'
             tvDeviceModel: Apple TV
-            macosVersion: 14
-            developerDir: CI_XCODE_16
-          # Core Module
-          - name: Core Module, iOS 17
-            script: test:ios
-            iosVersion: '17.5'
-            iosDeviceModel: iPhone 15
             macosVersion: 15
             developerDir: CI_XCODE_16
+          # Core Module
           - name: Core Module, iOS 18
             script: test:ios
-            iosVersion: '18.1'
+            iosVersion: '18.5'
             iosDeviceModel: iPhone 16
             macosVersion: 15
             developerDir: CI_XCODE_16
-          - name: Core Module, macOS 14
-            script: test:macos
-            macosVersion: 14
-            developerDir: CI_XCODE_16
-          - name: Core Module, macOS 15
-            script: test:macos
-            macosVersion: 15
-            developerDir: CI_XCODE_16
-          # LiveQuery Module
-          - name: LiveQuery Module, iOS 17
-            script: test:parse_live_query:ios
-            iosVersion: '17.5'
-            iosDeviceModel: iPhone 15
-            macosVersion: 15
-            developerDir: CI_XCODE_16
           - name: LiveQuery Module, iOS 18
             script: test:parse_live_query:ios
-            iosVersion: '18.1'
+            iosVersion: '18.5'
             iosDeviceModel: iPhone 16
             macosVersion: 15
             developerDir: CI_XCODE_16
-          - name: LiveQuery Module, macOS 14
-            script: test:parse_live_query:osx
-            macosVersion: 14
-            developerDir: CI_XCODE_15
           - name: LiveQuery Module, macOS 15
             script: test:parse_live_query:osx
             macosVersion: 15
             developerDir: CI_XCODE_16
-          - name: LiveQuery Module, watchOS 10
-            script: test:parse_live_query:watchos
-            watchOsVersion: '10.5'
-            watchDeviceModel: Apple Watch Series 9 (45mm)
-            macosVersion: 15
-            developerDir: CI_XCODE_15
           - name: LiveQuery Module, watchOS 11
             script: test:parse_live_query:watchos
-            watchOsVersion: '11.1'
+            watchOsVersion: '11.5'
             watchDeviceModel: Apple Watch Series 10 (46mm)
             macosVersion: 15
             developerDir: CI_XCODE_16
-          - name: LiveQuery Module, tvOS 17
-            script: test:parse_live_query:tvos
-            tvOsVersion: '17.5'
-            tvDeviceModel: Apple TV
-            macosVersion: 15
-            developerDir: CI_XCODE_16
           - name: LiveQuery Module, tvOS 18
             script: test:parse_live_query:tvos
-            tvOsVersion: '18.1'
+            tvOsVersion: '18.5'
             tvDeviceModel: Apple TV
             macosVersion: 15
             developerDir: CI_XCODE_16
@@ -184,7 +136,7 @@ jobs:
           plugin: xcode
           file: ${{ env.COVERAGE_PATH }}
   docs:
-    runs-on: macos-14
+    runs-on: macos-15
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4

.github/workflows/release-automated.yml

@@ -3,18 +3,18 @@ on:
   push:
     branches: [ master, release, alpha, beta ]
 env:
-  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
 
 jobs:
   release:
     runs-on: macos-15
     outputs:
       current_tag: ${{ steps.tag.outputs.current_tag }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: npm
@@ -25,7 +25,7 @@ jobs:
           bundler-cache: true
       - name: Cache Gems
         id: cache-gems
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}

.github/workflows/release-manual-docs.yml

@@ -6,7 +6,7 @@ on:
         default: ''
         description: 'Version tag:' 
 env:
-  CI_XCODE_16: /Applications/Xcode_16.1.0.app/Contents/Developer
+  CI_XCODE_16: /Applications/Xcode_16.4.0.app/Contents/Developer
 
 jobs:
   publish-docs:

CHANGELOG.md

@@ -1,3 +1,22 @@
+## [6.0.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/6.0.0...6.0.1) (2025-11-17)
+
+
+### Bug Fixes
+
+* Invalid query request parameter `excludedKeys` sent to server for excluding fields in query results ([#1864](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1864)) ([e14c4c5](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/e14c4c56c50c1561400e4aaf2f6272df495a17ca))
+
+# [6.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/5.1.1...6.0.0) (2025-11-17)
+
+
+### Features
+
+* Remove support for Xcode 15  ([#1865](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1865)) ([b22393c](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/b22393ce823aa470f8ead10f66f02b41132ef706))
+
+
+### BREAKING CHANGES
+
+* Removes support for Xcode 15 (iOS 17, macOS 14, watchOS 10, tvOS 17). ([b22393c](b22393c))
+
 ## [5.1.1](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/5.1.0...5.1.1) (2025-01-31)
 
 

Parse/Parse/Internal/Commands/PFRESTQueryCommand.m

@@ -144,7 +144,7 @@ + (nullable NSDictionary *)findCommandParametersWithOrder:(NSString *)order
     if (excludedKeys.count > 0) {
         NSArray *sortDescriptors = @[ [NSSortDescriptor sortDescriptorWithKey:@"self" ascending:YES selector:@selector(compare:)] ];
         NSArray *keysArray = [excludedKeys sortedArrayUsingDescriptors:sortDescriptors];
-        parameters[@"excludedKeys"] = [keysArray componentsJoinedByString:@","];
+        parameters[@"excludeKeys"] = [keysArray componentsJoinedByString:@","];
     }
     if (limit >= 0) {
         parameters[@"limit"] = [NSString stringWithFormat:@"%d", (int)limit];

Parse/Parse/Internal/Commands/PFRESTUserCommand.h

@@ -23,6 +23,15 @@ NS_ASSUME_NONNULL_BEGIN
                                     password:(NSString *)password
                             revocableSession:(BOOL)revocableSessionEnabled
                                        error:(NSError **)error;
+/**
+ Creates a login command with a JSON body, allowing additional parameters such as authData.
+
+ This posts to the login route and is required for features like MFA where additional
+ authentication data must be supplied alongside username/password.
+ */
++ (instancetype)logInUserCommandWithParameters:(NSDictionary *)parameters
+                              revocableSession:(BOOL)revocableSessionEnabled
+                                         error:(NSError **)error;
 + (instancetype)serviceLoginUserCommandWithAuthenticationType:(NSString *)authenticationType
                                            authenticationData:(NSDictionary *)authenticationData
                                              revocableSession:(BOOL)revocableSessionEnabled

Parse/Parse/Internal/Commands/PFRESTUserCommand.m

@@ -65,6 +65,18 @@ + (instancetype)logInUserCommandWithUsername:(NSString *)username
                                 error:error];
 }
 
++ (instancetype)logInUserCommandWithParameters:(NSDictionary *)parameters
+                              revocableSession:(BOOL)revocableSessionEnabled
+                                         error:(NSError **)error {
+    // Use POST /login for body parameters like authData
+    return [self _commandWithHTTPPath:@"login"
+                           httpMethod:PFHTTPRequestMethodPOST
+                           parameters:parameters
+                         sessionToken:nil
+                     revocableSession:revocableSessionEnabled
+                                error:error];
+}
+
 + (instancetype)serviceLoginUserCommandWithAuthenticationType:(NSString *)authenticationType
                                            authenticationData:(NSDictionary *)authenticationData
                                              revocableSession:(BOOL)revocableSessionEnabled

Parse/Parse/Internal/User/Controller/PFUserController.h

@@ -38,6 +38,14 @@ NS_ASSUME_NONNULL_BEGIN
 - (BFTask *)logInCurrentUserAsyncWithUsername:(NSString *)username
                                      password:(NSString *)password
                              revocableSession:(BOOL)revocableSession;
+/**
+ Logs in the current user using username/password and additional parameters such as authData.
+ The parameters dictionary can include keys like @"authData": @{ "mfa": @{ ... } } to support MFA flows.
+ */
+- (BFTask *)logInCurrentUserAsyncWithUsername:(NSString *)username
+                                     password:(NSString *)password
+                                parameters:(nullable NSDictionary *)parameters
+                             revocableSession:(BOOL)revocableSession;
 
 //TODO: (nlutsenko) Move this method into PFUserAuthenticationController after PFUser is decoupled further.
 - (BFTask *)logInCurrentUserAsyncWithAuthType:(NSString *)authType

Parse/Parse/Internal/User/Controller/PFUserController.m

@@ -66,7 +66,20 @@ - (BFTask *)logInCurrentUserAsyncWithSessionToken:(NSString *)sessionToken {
                                                                  message:@"Invalid Session Token."]];
         }
 
-        PFUser *user = [PFUser _objectFromDictionary:dictionary
+        // Sanitize response: do not persist transient MFA authData provider
+        NSMutableDictionary *sanitized = [dictionary mutableCopy];
+        id authData = sanitized[@"authData"];
+        if ([authData isKindOfClass:[NSDictionary class]] && authData[@"mfa"]) {
+            NSMutableDictionary *mutableAuth = [authData mutableCopy];
+            [mutableAuth removeObjectForKey:@"mfa"]; // transient provider, do not persist
+            if (mutableAuth.count > 0) {
+                sanitized[@"authData"] = mutableAuth;
+            } else {
+                [sanitized removeObjectForKey:@"authData"];
+            }
+        }
+
+        PFUser *user = [PFUser _objectFromDictionary:sanitized
                                     defaultClassName:[PFUser parseClassName]
                                         completeData:YES];
         // Serialize the object to disk so we can later access it via currentUser
@@ -113,6 +126,46 @@ - (BFTask *)logInCurrentUserAsyncWithUsername:(NSString *)username
     }];
 }
 
+- (BFTask *)logInCurrentUserAsyncWithUsername:(NSString *)username
+                                     password:(NSString *)password
+                                    parameters:(NSDictionary *)parameters
+                             revocableSession:(BOOL)revocableSession {
+    @weakify(self);
+    return [[BFTask taskFromExecutor:[BFExecutor defaultPriorityBackgroundExecutor] withBlock:^id{
+        NSError *error = nil;
+        NSMutableDictionary *merged = [@{ @"username": username ?: @"",
+                                          @"password": password ?: @"" } mutableCopy];
+        if (parameters.count > 0) {
+            // Prevent authData from being persisted later by only sending it with the request body
+            // and not mutating the PFUser object here. The server response will drive authData merge.
+            [merged addEntriesFromDictionary:parameters];
+        }
+        PFRESTCommand *command = [PFRESTUserCommand logInUserCommandWithParameters:merged
+                                                                 revocableSession:revocableSession
+                                                                            error:&error];
+        PFPreconditionReturnFailedTask(command, error);
+        return [self.commonDataSource.commandRunner runCommandAsync:command
+                                                        withOptions:PFCommandRunningOptionRetryIfFailed];
+    }] continueWithSuccessBlock:^id(BFTask *task) {
+        @strongify(self);
+        PFCommandResult *result = task.result;
+        NSDictionary *dictionary = result.result;
+
+        if ([dictionary isKindOfClass:[NSNull class]] || !dictionary) {
+            return [BFTask taskWithError:[PFErrorUtilities errorWithCode:kPFErrorObjectNotFound
+                                                                 message:@"Invalid login credentials."]];
+        }
+
+        PFUser *user = [PFUser _objectFromDictionary:dictionary
+                                    defaultClassName:[PFUser parseClassName]
+                                        completeData:YES];
+        PFCurrentUserController *controller = self.coreDataSource.currentUserController;
+        return [[controller saveCurrentObjectAsync:user] continueWithBlock:^id(BFTask *task) {
+            return user;
+        }];
+    }];
+}
+
 - (BFTask *)logInCurrentUserAsyncWithAuthType:(NSString *)authType
                                      authData:(NSDictionary *)authData
                              revocableSession:(BOOL)revocableSession {

Parse/Parse/Resources/Parse-OSX.Info.plist

@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.1</string>
+	<string>6.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.1.1</string>
+	<string>6.0.1</string>
 </dict>
 </plist>