Skip to content

- fixes a bug where uploading a profile photo would result in an invalid cast exception #454

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
baywet merged 2 commits into from
Sep 9, 2020
Merged

- fixes a bug where uploading a profile photo would result in an invalid cast exception #454

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
f1d7545
- fixes a bug where uploading a profile photo would result in an inva…
baywet Sep 9, 2020
4086d10
Merge branch 'dev' into bugfix/profile-photo-cast
baywet Sep 9, 2020
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
9 changes: 7 additions & 2 deletions src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,13 @@ public MediaType contentType() {
} else {
logger.logDebug("Response binary");
isBinaryStreamInput = true;
//no inspection unchecked
return (Result) handleBinaryStream(in);
if (resultClass == InputStream.class) {
return (Result) handleBinaryStream(in);
} else if(response.body() != null && response.body().contentLength() > 0) { // some services reply in text/plain with a JSON representation...
return handleJsonResponse(in, CoreHttpProvider.getResponseHeadersAsMapOfStringList(response), resultClass);
} else {
return (Result) null;
}
}
} finally {
if (!isBinaryStreamInput) {
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/com/microsoft/graph/functional/UserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import static org.junit.Assert.assertNotNull;

import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;

Expand All @@ -12,6 +14,7 @@
import com.microsoft.graph.models.extensions.Drive;
import com.microsoft.graph.models.extensions.DriveItem;
import com.microsoft.graph.models.extensions.IGraphServiceClient;
import com.microsoft.graph.models.extensions.ProfilePhoto;
import com.microsoft.graph.models.extensions.User;
import com.microsoft.graph.requests.extensions.IContactCollectionPage;
import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesPage;
Expand Down Expand Up @@ -122,6 +125,13 @@ public void usersKeyPhotoValueTest() {
}
}

@Test
public void updateUserPhotoValueTest() throws Exception {
final File photo = new File("src/test/resources/hamilton.jpg");
final InputStream fileStream = new FileInputStream(photo);
graphServiceClient.me().photo().content().buildRequest().put(OutlookTests.getByteArray(fileStream));
}

@Test
public void getOrganization() {
//GET organization
Expand Down