diff options
| author | Dan Engelbrecht <[email protected]> | 2023-06-12 21:43:35 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-12 21:43:35 +0200 |
| commit | c76abd0f9f73ffb49b1e1d0f27822352eef43e53 (patch) | |
| tree | c0a1a108ab3328ff480dd8034c1c06936d600d9d | |
| parent | drive-by const (diff) | |
| download | zen-c76abd0f9f73ffb49b1e1d0f27822352eef43e53.tar.xz zen-c76abd0f9f73ffb49b1e1d0f27822352eef43e53.zip | |
fix jupiter access token for oplog upload (#330)
* make sure to prefix auth token correctly when provided with a raw token
* changelog
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zenserver/projectstore/jupiterremoteprojectstore.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 88a36f06a..858ae5fd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Feature: Session Id and Request Id are now logged in log for cache put/get operations - Bugfix: Prevent destructors in ProjectStore::Project, ScopedActivityBase and FileMapping from throwing exceptions to avoid abort termination - Bugfix: Zen CLI command help now include descriptions for positional arguments +- Bugfix: Correctly prefix auth token when using a bare token in project oplog import/export - Improvement: Throw exception with information on failed memory allocation instead of calling ZEN_ASSERT - Improvement: Added support for streaming decompression - Improvement: Added zenserver.exe and zen.exe/zen.pdb to Sentry debug information upload to populate unwind information diff --git a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp index 933ad6459..a60079ddc 100644 --- a/src/zenserver/projectstore/jupiterremoteprojectstore.cpp +++ b/src/zenserver/projectstore/jupiterremoteprojectstore.cpp @@ -217,7 +217,7 @@ CreateJupiterRemoteStore(const JupiterRemoteStoreOptions& Options) std::unique_ptr<CloudCacheTokenProvider> TokenProvider; if (!Options.AccessToken.empty()) { - TokenProvider = CloudCacheTokenProvider::CreateFromCallback([AccessToken = Options.AccessToken]() { + TokenProvider = CloudCacheTokenProvider::CreateFromCallback([AccessToken = "Bearer " + Options.AccessToken]() { return CloudCacheAccessToken{.Value = AccessToken, .ExpireTime = GcClock::TimePoint::max()}; }); } |