Added upstream auth config and removed the possibility to add endpoints via REST.

1 files changed, 12 insertions, 3 deletions

diff --git a/zenserver/upstream/upstreamcache.h b/zenserver/upstream/upstreamcache.h
index c82af28c6..48601c879 100644
--- a/zenserver/upstream/upstreamcache.h
+++ b/zenserver/upstream/upstreamcache.h
@@ -123,6 +123,15 @@ ToString(UpstreamEndpointState State)
 	}
 }
 
+struct UpstreamAuthConfig
+{
+	std::string_view   OAuthUrl;
+	std::string_view   OAuthClientId;
+	std::string_view   OAuthClientSecret;
+	std::string_view   OpenIdProvider;
+	std::string_view   AccessToken;
+};
+
 struct UpstreamEndpointStatus
 {
 	std::string			  Reason;
@@ -205,9 +214,9 @@ public:
 
 std::unique_ptr<UpstreamCache> MakeUpstreamCache(const UpstreamCacheOptions& Options, ZenCacheStore& CacheStore, CidStore& CidStore);
 
-std::unique_ptr<UpstreamEndpoint> MakeJupiterUpstreamEndpoint(const CloudCacheClientOptions&		   Options,
-															  std::unique_ptr<CloudCacheTokenProvider> TokenProvider,
-															  AuthMgr&								   Mgr);
+std::unique_ptr<UpstreamEndpoint> MakeJupiterUpstreamEndpoint(const CloudCacheClientOptions& Options,
+															  const UpstreamAuthConfig&		 AuthConfig,
+															  AuthMgr&						 Mgr);
 
 std::unique_ptr<UpstreamEndpoint> MakeZenUpstreamEndpoint(const ZenStructuredCacheClientOptions& Options);