Skip to content

fix: AppleSignalInterface token refresh #1487

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
sparuvu merged 2 commits into from
Apr 6, 2026
Merged

fix: AppleSignalInterface token refresh #1487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b900ed
fix: AppleSignalInterface token refresh
Apr 1, 2026
e2d30d2
Merge branch 'master' into Fix_AppleSignalInterface_TokenRefresh
sparuvu Apr 6, 2026
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
27 changes: 14 additions & 13 deletions ...rc/main/java/org/datatransferproject/datatransfer/apple/signals/AppleSignalInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,32 @@
package org.datatransferproject.datatransfer.apple.signals;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.io.Serializable;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.datatransferproject.api.launcher.Monitor;
import org.datatransferproject.datatransfer.apple.AppleBaseInterface;
import org.datatransferproject.datatransfer.apple.AppleInterfaceFactory;
import org.datatransferproject.datatransfer.apple.constants.AuditKeys;
import org.datatransferproject.datatransfer.apple.constants.Headers;
import org.datatransferproject.spi.transfer.provider.SignalRequest;
import org.datatransferproject.spi.transfer.types.CopyException;
import org.datatransferproject.spi.transfer.types.CopyExceptionWithFailureReason;
import org.datatransferproject.spi.transfer.types.PermissionDeniedException;
import org.datatransferproject.spi.transfer.types.UnconfirmedUserException;
import org.datatransferproject.transfer.JobMetadata;
import org.datatransferproject.types.transfer.auth.AppCredentials;
import org.datatransferproject.types.transfer.auth.TokensAndUrlAuthData;
import org.datatransferproject.types.transfer.retry.RetryStrategyLibrary;
import org.jetbrains.annotations.NotNull;

/**
* An Interface to send the Transfer Signals to Apple.
*/
public class AppleSignalInterface implements AppleBaseInterface {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final String MEDIA_TYPE_JSON = "application/json";
private static final String MEDIA_TYPE_FORM = "application/x-www-form-urlencoded";

protected String baseUrl;
protected AppCredentials appCredentials;
Expand Down Expand Up @@ -89,8 +84,12 @@ public String sendPostRequest(@NotNull String url, @NotNull final byte[] request
con.setRequestMethod("POST");
con.setRequestProperty(Headers.AUTHORIZATION.getValue(), authData.getAccessToken());
con.setRequestProperty(Headers.CORRELATION_ID.getValue(), correlationId);
con.setRequestProperty(Headers.CONTENT_TYPE.getValue(), "application/json");
con.setRequestProperty(Headers.ACCEPT.getValue(), "application/json");
con.setRequestProperty(Headers.ACCEPT.getValue(), MEDIA_TYPE_JSON);
if (url.equals(authData.getTokenServerEncodedUrl())) {
con.setRequestProperty(Headers.CONTENT_TYPE.getValue(), MEDIA_TYPE_FORM);
} else {
con.setRequestProperty(Headers.CONTENT_TYPE.getValue(), MEDIA_TYPE_JSON);
}

IOUtils.write(requestData, con.getOutputStream());
responseString = IOUtils.toString(con.getInputStream(), StandardCharsets.ISO_8859_1);
Expand All @@ -106,15 +105,17 @@ public String sendPostRequest(@NotNull String url, @NotNull final byte[] request
AuditKeys.error,
e.getMessage(),
AuditKeys.errorCode,
con.getResponseCode(),
(con != null ? con.getResponseCode() : -1),
e);
convertAndThrowException(e, con);
} finally {
con.disconnect();
if (con != null) {
con.disconnect();
}
}
return responseString;
}
return null;

return responseString;
}

public byte[] sendSignal(@NotNull final SignalRequest signalRequest)
Expand Down
Loading