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/upstream/upstreamcache.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/upstream/upstreamcache.cpp')
| -rw-r--r-- | zenserver/upstream/upstreamcache.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp index f432d322c..232ed3031 100644 --- a/zenserver/upstream/upstreamcache.cpp +++ b/zenserver/upstream/upstreamcache.cpp @@ -85,7 +85,9 @@ namespace detail { class JupiterUpstreamEndpoint final : public UpstreamEndpoint { public: - JupiterUpstreamEndpoint(CloudCacheClientOptions&& Options, AuthMgr& Mgr) + JupiterUpstreamEndpoint(const CloudCacheClientOptions& Options, + std::unique_ptr<CloudCacheTokenProvider> TokenProvider, + AuthMgr& Mgr) : m_AuthMgr(Mgr) , m_Log(zen::logging::Get("upstream")) , m_UseLegacyDdc(Options.UseLegacyDdc) @@ -93,7 +95,7 @@ namespace detail { ZEN_ASSERT(!Options.Name.empty()); m_Info.Name = Options.Name; m_Info.Url = Options.ServiceUrl; - m_Client = new CloudCacheClient(std::move(Options)); + m_Client = new CloudCacheClient(Options, std::move(TokenProvider)); } virtual ~JupiterUpstreamEndpoint() = default; @@ -1490,9 +1492,9 @@ MakeUpstreamCache(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore } std::unique_ptr<UpstreamEndpoint> -MakeJupiterUpstreamEndpoint(CloudCacheClientOptions&& Options, AuthMgr& Mgr) +MakeJupiterUpstreamEndpoint(const CloudCacheClientOptions& Options, std::unique_ptr<CloudCacheTokenProvider> TokenProvider, AuthMgr& Mgr) { - return std::make_unique<detail::JupiterUpstreamEndpoint>(std::move(Options), Mgr); + return std::make_unique<detail::JupiterUpstreamEndpoint>(Options, std::move(TokenProvider), Mgr); } std::unique_ptr<UpstreamEndpoint> |