Skip to content

Allowing no scopes to be provided #2777

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

Merged
wmathurin merged 4 commits into from
Oct 3, 2025
Merged

Allowing no scopes to be provided #2777

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60ee59a
Allowing no scopes to be provided
wmathurin Oct 1, 2025
9f0d652
Checking that refresh scope came back in token end point response
wmathurin Oct 2, 2025
e4793b3
Addressing feedback
wmathurin Oct 3, 2025
b1b7bc5
Allowing login without refresh token scope.
wmathurin Oct 3, 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
1 change: 1 addition & 0 deletions libs/SalesforceSDK/res/values/sf__strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<string name="sf__invalid_server_url">Please type in a valid URL</string>
<string name="sf__access_token_revoked">Your access token has been revoked by the administrator. You will now be logged out.</string>
<string name="sf__managed_app_error">Authentication only allowed from managed device.</string>
<string name="sf__missing_refresh_token_scope_error">Authentication error: missing refresh_token scope on connected app / external client app. Please contact your administrator.</string>
<string name="sf__jwt_authentication_error">JWT authentication error. Please try again.</string>

<!-- SSL errors -->
Expand Down
27 changes: 2 additions & 25 deletions libs/SalesforceSDK/src/com/salesforce/androidsdk/accounts/UserAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

import com.salesforce.androidsdk.app.Features;
import com.salesforce.androidsdk.app.SalesforceSDKManager;
import com.salesforce.androidsdk.auth.ScopeParser;
import com.salesforce.androidsdk.util.MapUtil;
import com.salesforce.androidsdk.util.SalesforceSDKLogger;

Expand Down Expand Up @@ -681,38 +682,14 @@ public String getScope() {
return scope;
}

/**
* Parses the space-delimited scope string into its individual components.
*
* @return Array of scope strings (empty if scope is null/empty).
*/
public String[] parseScopes() {
if (TextUtils.isEmpty(scope)) {
return new String[0];
}
final String trimmed = scope.trim();
if (trimmed.isEmpty()) {
return new String[0];
}
return trimmed.split("\\s+");
}

/**
* Checks whether the provided scope exists in this account's scope list.
*
* @param scopeToCheck Scope name to check.
* @return True if present, false otherwise.
*/
public boolean hasScope(String scopeToCheck) {
if (TextUtils.isEmpty(scopeToCheck)) {
return false;
}
for (final String s : parseScopes()) {
if (scopeToCheck.equals(s)) {
return true;
}
}
return false;
return new ScopeParser(scope).hasScope(scopeToCheck);

@brandonpage brandonpage Oct 2, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The syntax isn't as clean in Java, but I wonder if ScopeParser could just be a couple String[] extensions?

Edit: There are several functions in ScopeParser so I see its need to be a class.

}
/**
* Returns the beacon child consumer key.
Expand Down
Loading
Loading