aboutsummaryrefslogtreecommitdiff
path: root/zenserver/upstream/jupiter.cpp
diff options
context:
space:
mode:
authorPer Larsson <[email protected]>2022-02-01 13:54:59 +0100
committerPer Larsson <[email protected]>2022-02-01 13:54:59 +0100
commitf8e0ac440e5ee2b08b91e77be1d2212f26af61df (patch)
tree4700f0abed9f7e47e65ee0b11f4a3041cb05a97d /zenserver/upstream/jupiter.cpp
parentRefactored cloud cache access token provider. (diff)
downloadzen-f8e0ac440e5ee2b08b91e77be1d2212f26af61df.tar.xz
zen-f8e0ac440e5ee2b08b91e77be1d2212f26af61df.zip
Moved cloud cache token provider out from options.
Diffstat (limited to 'zenserver/upstream/jupiter.cpp')
-rw-r--r--zenserver/upstream/jupiter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index f141856c1..b377ac629 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -854,15 +854,16 @@ CloudCacheTokenProvider::MakeFromOAuthClientCredentials(const OAuthClientCredent
return std::make_unique<OAuthClientCredentialsTokenProvider>(Params);
}
-CloudCacheClient::CloudCacheClient(CloudCacheClientOptions&& Options)
+CloudCacheClient::CloudCacheClient(const CloudCacheClientOptions& Options, std::unique_ptr<CloudCacheTokenProvider> TokenProvider)
: m_Log(zen::logging::Get("jupiter"))
, m_ServiceUrl(Options.ServiceUrl)
, m_DdcNamespace(Options.DdcNamespace)
, m_BlobStoreNamespace(Options.BlobStoreNamespace)
, m_ConnectTimeout(Options.ConnectTimeout)
, m_Timeout(Options.Timeout)
-, m_TokenProvider(std::move(Options.TokenProvider))
+, m_TokenProvider(std::move(TokenProvider))
{
+ ZEN_ASSERT(m_TokenProvider.get() != nullptr);
}
CloudCacheClient::~CloudCacheClient()