aboutsummaryrefslogtreecommitdiff
path: root/src/zenserver/upstream
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2023-05-02 12:31:53 +0200
committerGitHub <[email protected]>2023-05-02 12:31:53 +0200
commite3086573d2244def22ecbe1e6b4b3da8b47e0f14 (patch)
tree627066debdddf7474783893f6b9b6631bb9a4833 /src/zenserver/upstream
parentmoved source directories into `/src` (#264) (diff)
downloadzen-e3086573d2244def22ecbe1e6b4b3da8b47e0f14.tar.xz
zen-e3086573d2244def22ecbe1e6b4b3da8b47e0f14.zip
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
Diffstat (limited to 'src/zenserver/upstream')
-rw-r--r--src/zenserver/upstream/hordecompute.cpp2
-rw-r--r--src/zenserver/upstream/upstreamcache.cpp3
-rw-r--r--src/zenserver/upstream/upstreamservice.cpp2
3 files changed, 3 insertions, 4 deletions
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>