aboutsummaryrefslogtreecommitdiff
path: root/zenserver/projectstore/projectstore.cpp
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2023-02-13 13:02:06 +0000
committerGitHub <[email protected]>2023-02-13 05:02:06 -0800
commit1639507f8d3831322d7da5cfa0c63cd374695ddf (patch)
tree3760a70cdf9fdf749fc38db55ae754e21b050f95 /zenserver/projectstore/projectstore.cpp
parentno sentry report on port conflict (#228) (diff)
downloadzen-1639507f8d3831322d7da5cfa0c63cd374695ddf.tar.xz
zen-1639507f8d3831322d7da5cfa0c63cd374695ddf.zip
Move knowledge of UE env variable from zenserver to zen command line tool (#227)
* move knowledge of UE env variable from zenserver to zen command line tool * move env-fetching code to GetEnvVariable
Diffstat (limited to 'zenserver/projectstore/projectstore.cpp')
-rw-r--r--zenserver/projectstore/projectstore.cpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/zenserver/projectstore/projectstore.cpp b/zenserver/projectstore/projectstore.cpp
index 82aac1605..57b24c63d 100644
--- a/zenserver/projectstore/projectstore.cpp
+++ b/zenserver/projectstore/projectstore.cpp
@@ -124,22 +124,11 @@ namespace {
std::string AccessToken = std::string(Cloud["access-token"sv].AsString());
if (AccessToken.empty())
{
-#if PLATFORM_WINDOWS
-
- CHAR EnvVariableBuffer[1023 + 1];
- DWORD RESULT = GetEnvironmentVariableA("UE-CloudDataCacheAccessToken", EnvVariableBuffer, sizeof(EnvVariableBuffer));
- if (RESULT > 0 && RESULT < sizeof(EnvVariableBuffer))
+ std::string_view AccessTokenEnvVariable = Cloud["access-token-env"].AsString();
+ if (!AccessTokenEnvVariable.empty())
{
- AccessToken = std::string(EnvVariableBuffer);
+ AccessToken = GetEnvVariable(AccessTokenEnvVariable);
}
-#endif
-#if ZEN_PLATFORM_LINUX || ZEN_PLATFORM_MAC
- char* EnvVariable = getenv("UE_CloudDataCacheAccessToken");
- if (EnvVariable)
- {
- AccessToken = std::string(EnvVariable);
- }
-#endif
}
std::string_view KeyParam = Cloud["key"sv].AsString();
if (KeyParam.empty())