Skip to content

Allows setting WinGet proxy setting as SFS Client Proxy #5054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnMcPMS merged 1 commit into from
Dec 11, 2024
Merged

Allows setting WinGet proxy setting as SFS Client Proxy #5054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/AppInstallerCommonCore/MSStoreDownload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
#include <AppinstallerLogging.h>
#include "AppInstallerMsixInfo.h"
#include "AppInstallerRuntime.h"
#include "winget/Locale.h"
#include "winget/HttpClientHelper.h"
#include "winget/JsonUtil.h"
#include "winget/Locale.h"
#include "winget/MSStoreDownload.h"
#include "winget/NetworkSettings.h"
#include "winget/Rest.h"
#include "winget/HttpClientHelper.h"
#include "winget/UserSettings.h"
#ifndef WINGET_DISABLE_FOR_FUZZING
#include <sfsclient/SFSClient.h>
Expand Down Expand Up @@ -910,6 +911,12 @@ namespace AppInstaller::MSStore
{
SFS::RequestParams sfsClientRequest;
sfsClientRequest.productRequests = { {std::string{ wuCategoryId }, {}} };
const auto& proxyUri = AppInstaller::Settings::Network().GetProxyUri();
if (proxyUri)
{
AICLI_LOG(Core, Info, << "Passing proxy to SFS client " << *proxyUri);
sfsClientRequest.proxy = *proxyUri;
}

auto requestResult = GetSfsClientInstance()->GetLatestAppDownloadInfo(sfsClientRequest, appContents);
if (!requestResult)
Expand Down
4 changes: 2 additions & 2 deletions src/AppInstallerCommonCore/Public/winget/NetworkSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace AppInstaller::Settings
{
static NetworkSettings& Instance();

const std::optional<std::string> GetProxyUri() const { return m_proxyUri; }
const std::optional<std::string>& GetProxyUri() const { return m_proxyUri; }
// Sets the proxy URI; may do nothing depending on admin settings and group policy
void SetProxyUri(const std::optional<std::string>& proxyUri);

Expand All @@ -30,4 +30,4 @@ namespace AppInstaller::Settings
};

NetworkSettings& Network();
}
}
Loading