aboutsummaryrefslogtreecommitdiff
path: root/zenserver/zenserver.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-06 19:07:37 +0200
committerStefan Boberg <[email protected]>2021-09-06 19:07:37 +0200
commite14340b63a36d07fb256c98c59d9f150a5693ce9 (patch)
tree4cdbf6900bb822fd2e311079cad25ba2f54f778d /zenserver/zenserver.cpp
parentclang-format fixes (diff)
parentSupport for switching between storing derived data using the legacy DDC endpo... (diff)
downloadzen-e14340b63a36d07fb256c98c59d9f150a5693ce9.tar.xz
zen-e14340b63a36d07fb256c98c59d9f150a5693ce9.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenserver/zenserver.cpp')
-rw-r--r--zenserver/zenserver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index be122baca..e465734e0 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -166,7 +166,7 @@ public:
.OAuthProvider = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv,
.OAuthClientId = "0oao91lrhqPiAlaGD0x7"sv,
.OAuthSecret = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv,
- };
+ .UseLegacyDdc = false};
}
Options.ServiceUrl = ValueOrDefault(UpstreamConfig.JupiterConfig.Url, Options.ServiceUrl);
@@ -175,6 +175,7 @@ public:
Options.OAuthProvider = ValueOrDefault(UpstreamConfig.JupiterConfig.OAuthProvider, Options.OAuthProvider);
Options.OAuthClientId = ValueOrDefault(UpstreamConfig.JupiterConfig.OAuthClientId, Options.OAuthClientId);
Options.OAuthSecret = ValueOrDefault(UpstreamConfig.JupiterConfig.OAuthClientSecret, Options.OAuthSecret);
+ Options.UseLegacyDdc |= UpstreamConfig.JupiterConfig.UseLegacyDdc;
if (!Options.ServiceUrl.empty())
{