move auth code from zenserver into zenhttp (#265)

this code should be usable outside of zenserver, so this moves it out into zenhttp where it can be used from lower level components

11 files changed, 11 insertions, 13 deletions

diff --git a/src/zenserver/auth/authmgr.cpp b/src/zenhttp/auth/authmgr.cpp
index 4cd6b3362..d535d07a4 100644
--- a/src/zenserver/auth/authmgr.cpp
+++ b/src/zenhttp/auth/authmgr.cpp
@@ -1,7 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <auth/authmgr.h>
-#include <auth/oidc.h>
+#include "zenhttp/auth/authmgr.h"
 
 #include <zencore/compactbinary.h>
 #include <zencore/compactbinarybuilder.h>
@@ -9,6 +8,7 @@
 #include <zencore/crypto.h>
 #include <zencore/filesystem.h>
 #include <zencore/logging.h>
+#include <zenhttp/auth/oidc.h>
 
 #include <condition_variable>
 #include <memory>
diff --git a/src/zenserver/auth/authservice.cpp b/src/zenhttp/auth/authservice.cpp
index 1cc679540..6ed587770 100644
--- a/src/zenserver/auth/authservice.cpp
+++ b/src/zenhttp/auth/authservice.cpp
@@ -1,11 +1,10 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <auth/authservice.h>
-
-#include <auth/authmgr.h>
+#include "zenhttp/auth/authservice.h"
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/string.h>
+#include <zenhttp/auth/authmgr.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <json11.hpp>
diff --git a/src/zenserver/auth/oidc.cpp b/src/zenhttp/auth/oidc.cpp
index d2265c22f..318110c7d 100644
--- a/src/zenserver/auth/oidc.cpp
+++ b/src/zenhttp/auth/oidc.cpp
@@ -1,6 +1,6 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include <auth/oidc.h>
+#include "zenhttp/auth/oidc.h"
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
diff --git a/src/zenserver/auth/authmgr.h b/src/zenhttp/include/zenhttp/auth/authmgr.h
index 054588ab9..054588ab9 100644
--- a/src/zenserver/auth/authmgr.h
+++ b/src/zenhttp/include/zenhttp/auth/authmgr.h
diff --git a/src/zenserver/auth/authservice.h b/src/zenhttp/include/zenhttp/auth/authservice.h
index 64b86e21f..64b86e21f 100644
--- a/src/zenserver/auth/authservice.h
+++ b/src/zenhttp/include/zenhttp/auth/authservice.h
diff --git a/src/zenserver/auth/oidc.h b/src/zenhttp/include/zenhttp/auth/oidc.h
index f43ae3cd7..f43ae3cd7 100644
--- a/src/zenserver/auth/oidc.h
+++ b/src/zenhttp/include/zenhttp/auth/oidc.h
diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
index 66cf3c4f8..f0cd1ea58 100644
--- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp
@@ -5,8 +5,8 @@
 #include <zencore/compress.h>
 #include <zencore/fmtutils.h>
 
-#include <auth/authmgr.h>
 #include <upstream/jupiter.h>
+#include <zenhttp/auth/authmgr.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <cpr/cpr.h>
diff --git a/src/zenserver/upstream/hordecompute.cpp b/src/zenserver/upstream/hordecompute.cpp
index 64d9fff72..cf921eaad 100644
--- a/src/zenserver/upstream/hordecompute.cpp
+++ b/src/zenserver/upstream/hordecompute.cpp
@@ -19,7 +19,7 @@
 
 #	include <zenstore/cidstore.h>
 
-#	include <auth/authmgr.h>
+#	include <zenhttp/auth/authmgr.h>
 #	include <upstream/upstreamcache.h>
 
 #	include "cache/structuredcachestore.h"
diff --git a/src/zenserver/upstream/upstreamcache.cpp b/src/zenserver/upstream/upstreamcache.cpp
index e838b5fe2..245097796 100644
--- a/src/zenserver/upstream/upstreamcache.cpp
+++ b/src/zenserver/upstream/upstreamcache.cpp
@@ -15,11 +15,10 @@
 #include <zencore/timer.h>
 #include <zencore/trace.h>
 
+#include <zenhttp/auth/authmgr.h>
 #include <zenhttp/httpshared.h>
-
 #include <zenstore/cidstore.h>
 
-#include <auth/authmgr.h>
 #include "cache/structuredcache.h"
 #include "cache/structuredcachestore.h"
 #include "diag/logging.h"
diff --git a/src/zenserver/upstream/upstreamservice.cpp b/src/zenserver/upstream/upstreamservice.cpp
index 6db1357c5..3d4a0f823 100644
--- a/src/zenserver/upstream/upstreamservice.cpp
+++ b/src/zenserver/upstream/upstreamservice.cpp
@@ -1,8 +1,8 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 #include <upstream/upstreamservice.h>
 
-#include <auth/authmgr.h>
 #include <upstream/upstreamcache.h>
+#include <zenhttp/auth/authmgr.h>
 
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/string.h>
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 635fd04e0..3b81a3ada 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -99,8 +99,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
 //
 
 #include "admin/admin.h"
-#include "auth/authmgr.h"
-#include "auth/authservice.h"
 #include "cache/structuredcache.h"
 #include "cache/structuredcachestore.h"
 #include "cidstore.h"
@@ -113,6 +111,8 @@ ZEN_THIRD_PARTY_INCLUDES_END
 #include "projectstore/projectstore.h"
 #include "testing/httptest.h"
 #include "upstream/upstream.h"
+#include "zenhttp/auth/authmgr.h"
+#include "zenhttp/auth/authservice.h"
 #include "zenstore/gc.h"
 
 #define ZEN_APP_NAME "Zen store"