diff options
| author | Per Larsson <[email protected]> | 2022-02-01 13:54:59 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-02-01 13:54:59 +0100 |
| commit | f8e0ac440e5ee2b08b91e77be1d2212f26af61df (patch) | |
| tree | 4700f0abed9f7e47e65ee0b11f4a3041cb05a97d /zenserver/zenserver.cpp | |
| parent | Refactored cloud cache access token provider. (diff) | |
| download | zen-f8e0ac440e5ee2b08b91e77be1d2212f26af61df.tar.xz zen-f8e0ac440e5ee2b08b91e77be1d2212f26af61df.zip | |
Moved cloud cache token provider out from options.
Diffstat (limited to 'zenserver/zenserver.cpp')
| -rw-r--r-- | zenserver/zenserver.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index a67e9f7e8..2c9610866 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -742,20 +742,23 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions) // Jupiter upstream { - zen::CloudCacheClientOptions Options; + zen::CloudCacheClientOptions Options; + std::unique_ptr<CloudCacheTokenProvider> TokenProvider; + std::string EndpointName; + std::string Url; if (UpstreamConfig.JupiterConfig.UseProductionSettings || UpstreamConfig.JupiterConfig.UseDevelopmentSettings) { - std::string EndpointName = "Jupiter-Dev"sv; - std::string Url = "https://jupiter.devtools-dev.epicgames.com" sv; + EndpointName = "Jupiter-Dev"; + Url = "https://jupiter.devtools-dev.epicgames.com"; if (UpstreamConfig.JupiterConfig.UseProductionSettings) { - EndpointName = "Jupiter-Prod"sv; - Url = "https://jupiter.devtools.epicgames.com" sv; + EndpointName = "Jupiter-Prod"; + Url = "https://jupiter.devtools.epicgames.com"; } - auto TokenProvider = CloudCacheTokenProvider::MakeFromOAuthClientCredentials( + TokenProvider = CloudCacheTokenProvider::MakeFromOAuthClientCredentials( {.Url = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv, .ClientId = "0oao91lrhqPiAlaGD0x7"sv, .ClientSecret = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv}); @@ -767,14 +770,13 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions) .BlobStoreNamespace = "ue.ddc"sv, .ConnectTimeout = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds), .Timeout = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds), - .TokenProvider = std::move(TokenProvider), .UseLegacyDdc = false}; } else { - const auto EndpointName = UpstreamConfig.JupiterConfig.Name.empty() ? "Jupiter"sv : UpstreamConfig.JupiterConfig.Name; + EndpointName = UpstreamConfig.JupiterConfig.Name.empty() ? "Jupiter"sv : UpstreamConfig.JupiterConfig.Name; - auto TokenProvider = CloudCacheTokenProvider::MakeFromOAuthClientCredentials( + TokenProvider = CloudCacheTokenProvider::MakeFromOAuthClientCredentials( {.Url = "https://epicgames.okta.com/oauth2/auso645ojjWVdRI3d0x7/v1/token"sv, .ClientId = "0oao91lrhqPiAlaGD0x7"sv, .ClientSecret = "-GBWjjenhCgOwhxL5yBKNJECVIoDPH0MK4RDuN7d"sv}); @@ -786,13 +788,13 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions) .BlobStoreNamespace = UpstreamConfig.JupiterConfig.Namespace, .ConnectTimeout = std::chrono::milliseconds(UpstreamConfig.ConnectTimeoutMilliseconds), .Timeout = std::chrono::milliseconds(UpstreamConfig.TimeoutMilliseconds), - .TokenProvider = std::move(TokenProvider), .UseLegacyDdc = false}; } if (!Options.ServiceUrl.empty()) { - std::unique_ptr<zen::UpstreamEndpoint> JupiterEndpoint = zen::MakeJupiterUpstreamEndpoint(std::move(Options), *m_AuthMgr); + std::unique_ptr<zen::UpstreamEndpoint> JupiterEndpoint = + zen::MakeJupiterUpstreamEndpoint(Options, std::move(TokenProvider), *m_AuthMgr); m_UpstreamCache->RegisterEndpoint(std::move(JupiterEndpoint)); } } |