Fixing an actual SDK bug: scopes from dynamic config were NOT being used when constructing the approval URL

Author: wmathurin

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator+Internal.h

@@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Returns the scope query parameter string for OAuth requests.
  * @return A properly formatted scope parameter string, or empty string if no scopes provided.
  */
-- (NSString *)scopeQueryParamString;
+- (NSString *)scopeQueryParamString:(NSArray<NSString*>*)scopes;
 
 /**
  Migrates the refresh token for a user to a new app configuration.

libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m

@@ -821,7 +821,7 @@ - (NSString *)approvalURLForEndpoint:(NSString *)authorizeEndpoint
     }
 
     // OAuth scopes
-    NSString *scopeString = [self scopeQueryParamString];
+    NSString *scopeString = [self scopeQueryParamString:self.credentials.scopes];
     if (scopeString.length > 0) {
         [approvalUrlString appendString:scopeString];
     }
@@ -842,9 +842,9 @@ -(void) clearFrontDoorBridgeLoginOverride {
     self.frontdoorBridgeLoginOverride = nil;
 }
 
-- (NSString *)scopeQueryParamString {
-    if (self.scopes.count > 0) {
-        NSString *scopeStr = [SFScopeParser computeScopeParameterWithURLEncodingWithScopes:self.scopes];
+- (NSString *)scopeQueryParamString:(NSArray<NSString*>*)scopes {
+    if (scopes.count > 0) {
+        NSString *scopeStr = [SFScopeParser computeScopeParameterWithURLEncodingWithScopes:[NSSet setWithArray:scopes]];
         return [NSString stringWithFormat:@"&%@=%@", kSFOAuthScope, scopeStr];
     } else {
         return @"";

libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceOAuthUnitTests.m

@@ -464,10 +464,10 @@ - (void)testDefaultTokenEncryption {
 - (void)testScopeQueryParamStringEmptyScopes {
     // Given
     SFOAuthCoordinator *coordinator = [[SFOAuthCoordinator alloc] init];
-    coordinator.scopes = [NSSet set];
+    NSArray<NSString*> *scopes = [NSArray array];
 
     // When
-    NSString *result = [coordinator scopeQueryParamString];
+    NSString *result = [coordinator scopeQueryParamString:scopes];
 
     // Then
     XCTAssertEqualObjects(result, @"", @"Empty scopes should return empty string");
@@ -476,10 +476,10 @@ - (void)testScopeQueryParamStringEmptyScopes {
 - (void)testScopeQueryParamStringNilScopes {
     // Given
     SFOAuthCoordinator *coordinator = [[SFOAuthCoordinator alloc] init];
-    coordinator.scopes = nil;
+    NSArray<NSString*> *scopes = nil;
 
     // When
-    NSString *result = [coordinator scopeQueryParamString];
+    NSString *result = [coordinator scopeQueryParamString:scopes];
 
     // Then
     XCTAssertEqualObjects(result, @"", @"Nil scopes should return empty string");
@@ -488,10 +488,10 @@ - (void)testScopeQueryParamStringNilScopes {
 - (void)testScopeQueryParamStringSingleScope {
     // Given
     SFOAuthCoordinator *coordinator = [[SFOAuthCoordinator alloc] init];
-    coordinator.scopes = [NSSet setWithObject:@"web"];
+    NSArray<NSString*> *scopes = @[@"web"];
 
     // When
-    NSString *result = [coordinator scopeQueryParamString];
+    NSString *result = [coordinator scopeQueryParamString:scopes];
 
     // Then
     // Should include refresh_token and the provided scope, URL encoded
@@ -501,10 +501,10 @@ - (void)testScopeQueryParamStringSingleScope {
 - (void)testScopeQueryParamStringMultipleScopes {
     // Given
     SFOAuthCoordinator *coordinator = [[SFOAuthCoordinator alloc] init];
-    coordinator.scopes = [NSSet setWithObjects:@"web", @"api", @"id", nil];
+    NSArray<NSString*> *scopes = @[@"web", @"api", @"id"];
 
     // When
-    NSString *result = [coordinator scopeQueryParamString];
+    NSString *result = [coordinator scopeQueryParamString:scopes];
 
     // Then
     // Should include refresh_token and all provided scopes, sorted and URL encoded
@@ -514,10 +514,10 @@ - (void)testScopeQueryParamStringMultipleScopes {
 - (void)testScopeQueryParamStringWithRefreshTokenAlreadyPresent {
     // Given
     SFOAuthCoordinator *coordinator = [[SFOAuthCoordinator alloc] init];
-    coordinator.scopes = [NSSet setWithObjects:@"web", @"api", @"refresh_token", nil];
-    
+    NSArray<NSString*> *scopes = @[@"web", @"api", @"refresh_token"];
+
     // When
-    NSString *result = [coordinator scopeQueryParamString];
+    NSString *result = [coordinator scopeQueryParamString:scopes];
 
     // Then
     // Should still work correctly even if refresh_token is already present