Skip to content
Merged
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class DefaultClient implements Client {
public static final String API_SECRET_PROP_NAME = "io.getstream.chat.apiSecret";
public static final String API_TIMEOUT_PROP_NAME = "io.getstream.chat.timeout";
public static final String API_URL_PROP_NAME = "io.getstream.chat.url";
public static final String X_STREAM_EXT_PROP_NAME = "io.getstream.chat.xStreamExt";

private static final String API_DEFAULT_URL = "https://chat.stream-io-api.com";
private static volatile DefaultClient defaultInstance;
Expand Down Expand Up @@ -121,6 +122,12 @@ private OkHttpClient buildOkHttpClient() {
.header("X-Stream-Client", "stream-java-client-" + sdkVersion)
.header("Stream-Auth-Type", "jwt");

// Add x-stream-ext header if configured
String xStreamExt = getXStreamExt(extendedProperties);
if (xStreamExt != null && !xStreamExt.isEmpty()) {
builder.header("X-Stream-Ext", xStreamExt);
}

if (userToken != null) {
// User token present - use user auth
builder.header("Authorization", userToken.value());
Expand Down Expand Up @@ -231,6 +238,13 @@ private static Properties extendProperties(Properties properties) {
canformedProperties.put(API_URL_PROP_NAME, envApiUrl);
}

var envXStreamExt =
env.getOrDefault(
"STREAM_CHAT_X_STREAM_EXT", System.getProperty("STREAM_CHAT_X_STREAM_EXT"));
if (envXStreamExt != null) {
canformedProperties.put(X_STREAM_EXT_PROP_NAME, envXStreamExt);
}

canformedProperties.putAll(System.getProperties());
canformedProperties.putAll(properties);
return canformedProperties;
Expand All @@ -246,6 +260,11 @@ private static String getStreamChatBaseUrl(@NotNull Properties properties) {
return url.toString();
}

private static String getXStreamExt(@NotNull Properties properties) {
var xStreamExt = properties.get(X_STREAM_EXT_PROP_NAME);
return xStreamExt != null ? xStreamExt.toString() : null;
}

private static final @NotNull String sdkVersion = getSdkVersion();

private static @NotNull String getSdkVersion() {
Expand Down