Moved cloud cache token provider out from options.

1 files changed, 10 insertions, 4 deletions

diff --git a/zenserver/upstream/upstreamapply.cpp b/zenserver/upstream/upstreamapply.cpp
index 220daab27..63c334265 100644
--- a/zenserver/upstream/upstreamapply.cpp
+++ b/zenserver/upstream/upstreamapply.cpp
@@ -48,13 +48,16 @@ namespace detail {
 	class HordeUpstreamApplyEndpoint final : public UpstreamApplyEndpoint
 	{
 	public:
-		HordeUpstreamApplyEndpoint(CloudCacheClientOptions&& Options, CasStore& CasStore, CidStore& CidStore)
+		HordeUpstreamApplyEndpoint(const CloudCacheClientOptions&				 Options,
+								   std::unique_ptr<zen::CloudCacheTokenProvider> TokenProvider,
+								   CasStore&									 CasStore,
+								   CidStore&									 CidStore)
 		: m_Log(logging::Get("upstream-apply"))
 		, m_CasStore(CasStore)
 		, m_CidStore(CidStore)
 		{
 			m_DisplayName = fmt::format("Horde - '{}'", Options.ServiceUrl);
-			m_Client	  = new CloudCacheClient(std::move(Options));
+			m_Client	  = new CloudCacheClient(Options, std::move(TokenProvider));
 			m_ChannelId	  = fmt::format("zen-{}", zen::GetSessionIdString());
 		}
 
@@ -1561,9 +1564,12 @@ MakeUpstreamApply(const UpstreamApplyOptions& Options, CasStore& CasStore, CidSt
 }
 
 std::unique_ptr<UpstreamApplyEndpoint>
-MakeHordeUpstreamEndpoint(CloudCacheClientOptions&& Options, CasStore& CasStore, CidStore& CidStore)
+MakeHordeUpstreamEndpoint(const CloudCacheClientOptions&		   Options,
+						  std::unique_ptr<CloudCacheTokenProvider> TokenProvider,
+						  CasStore&								   CasStore,
+						  CidStore&								   CidStore)
 {
-	return std::make_unique<detail::HordeUpstreamApplyEndpoint>(std::move(Options), CasStore, CidStore);
+	return std::make_unique<detail::HordeUpstreamApplyEndpoint>(Options, std::move(TokenProvider), CasStore, CidStore);
 }
 
 }  // namespace zen