Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Handled + in URLs and added test
  • Loading branch information
sarajmunjal committed Aug 23, 2019
commit 71d51f30d40fccd67a5fd4a6a20220095126130e
2 changes: 1 addition & 1 deletion src/main/java/com/google/firebase/FirebaseOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public final class FirebaseOptions {
@Override
public GoogleCredentials get() {
try {
return GoogleCredentials.getApplicationDefault();
return GoogleCredentials.getApplicationDefault().createScoped(FIREBASE_SCOPES);
} catch (IOException e) {
throw new IllegalStateException(e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,12 @@ public static ParsedUrl parseUrl(String url) throws DatabaseException {

repoInfo.internalHost = repoInfo.host;
// use raw (encoded) path for backwards compatibility.
String originalPathString = uri.getRawPath();
Validation.validateRootPathString(originalPathString);
String pathString = uri.getRawPath();
pathString = pathString.replace("+", " ");
Validation.validateRootPathString(pathString);

ParsedUrl parsedUrl = new ParsedUrl();
parsedUrl.path = new Path(originalPathString);
parsedUrl.path = new Path(pathString);
parsedUrl.repoInfo = repoInfo;

return parsedUrl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ public void testParseValidUrl() {
assertTrue(url.repoInfo.isSecure());
assertEquals("random valid namespace", url.repoInfo.namespace);
assertEquals("/path%20with%20spaces", url.path.toString());

url = Utilities.parseUrl("http://test.firebaseio.com/+");
assertEquals("/ ", url.path.toString());
}

@Test
Expand Down