Merge branch 'main' into lm/restrict-content-type

1 files changed, 12 insertions, 8 deletions

diff --git a/src/zenserver/storage/projectstore/httpprojectstore.h b/src/zenserver/storage/projectstore/httpprojectstore.h
index a1f649ed6..917337324 100644
--- a/src/zenserver/storage/projectstore/httpprojectstore.h
+++ b/src/zenserver/storage/projectstore/httpprojectstore.h
@@ -38,14 +38,16 @@ class TransferThreadWorkers;
 class HttpProjectService : public HttpService, public IHttpStatusProvider, public IHttpStatsProvider
 {
 public:
-	HttpProjectService(CidStore&		  Store,
-					   ProjectStore*	  InProjectStore,
-					   HttpStatusService& StatusService,
-					   HttpStatsService&  StatsService,
-					   AuthMgr&			  AuthMgr,
-					   OpenProcessCache&  InOpenProcessCache,
-					   JobQueue&		  InJobQueue,
-					   bool				  InRestrictContentTypes);
+	HttpProjectService(CidStore&					Store,
+					   ProjectStore*				InProjectStore,
+					   HttpStatusService&			StatusService,
+					   HttpStatsService&			StatsService,
+					   AuthMgr&						AuthMgr,
+					   OpenProcessCache&			InOpenProcessCache,
+					   JobQueue&					InJobQueue,
+					   bool							InRestrictContentTypes,
+					   const std::filesystem::path& InOidcTokenExePath,
+					   bool							AllowExternalOidcTokenExe);
 	~HttpProjectService();
 
 	virtual const char* BaseUri() const override;
@@ -112,6 +114,8 @@ private:
 	RwLock					   m_ThreadWorkersLock;
 	Ref<TransferThreadWorkers> m_ThreadWorkers;
 	bool					   m_RestrictContentTypes;
+	std::filesystem::path	   m_OidcTokenExePath;
+	bool					   m_AllowExternalOidcTokenExe;
 
 	Ref<TransferThreadWorkers> GetThreadWorkers(bool BoostWorkers, bool SingleThreaded);
 };