Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving to v63.0 #3811

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Moving to v63.0 #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85825df
Moving to v63.0
wmathurin Jan 23, 2025
2765a54
Merge from upstream
wmathurin Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .../SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/SFPushNotificationManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,7 @@ - (BOOL)registerSalesforceNotificationsWithCompletionBlock:(SFUserAccount *)user
if (rsaPublicKey) {
bodyDict[@"RsaPublicKey"] = rsaPublicKey;
}
// TODO remove once MSDK default api version is 61 or greater
if ([[SFRestAPI sharedInstance].apiVersion compare:@"v61.0"] >= 0) {
bodyDict[@"CipherName"] = @"RSA_OAEP_SHA256";
}
bodyDict[@"CipherName"] = @"RSA_OAEP_SHA256";

[request setCustomRequestBodyDictionary:bodyDict contentType:@"application/json"];
__weak typeof(self) weakSelf = self;
Expand Down
4 changes: 2 additions & 2 deletions libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extern NSString* const kSFRestErrorDomain NS_SWIFT_NAME(SFRestErrorDomain);
extern NSInteger const kSFRestErrorCode NS_SWIFT_NAME(SFRestErrorCode);

/*
* Default API version (currently "v60.0")
* Default API version (currently "v63.0")
* You can override this by using setApiVersion:
*/
extern NSString* const kSFRestDefaultAPIVersion NS_SWIFT_NAME(SFRestDefaultAPIVersion);
Expand Down Expand Up @@ -75,7 +75,7 @@ NS_SWIFT_NAME(RestClient)

/**
* The REST API version used for all the calls.
* The default value is `kSFRestDefaultAPIVersion` (currently "v60.0")
* The default value is `kSFRestDefaultAPIVersion` (currently "v63.0")
*/
@property (nonatomic, strong) NSString *apiVersion;

Expand Down
2 changes: 1 addition & 1 deletion libs/SalesforceSDKCore/SalesforceSDKCore/Classes/RestAPI/SFRestAPI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#import "SFLoginViewController.h"
#import <SalesforceSDKCore/SalesforceSDKCore-Swift.h>

NSString* const kSFRestDefaultAPIVersion = @"v60.0";
NSString* const kSFRestDefaultAPIVersion = @"v63.0";
NSString* const kSFRestIfUnmodifiedSince = @"If-Unmodified-Since";
NSString* const kSFRestErrorDomain = @"com.salesforce.RestAPI.ErrorDomain";
NSString* const kSFDefaultContentType = @"application/json";
Expand Down
Loading