Skip to content
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

Allows setting WinGet proxy setting as SFS Client Proxy #5032

Closed
wants to merge 10 commits into from
Closed

Allows setting WinGet proxy setting as SFS Client Proxy #5032

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7927e6
Adds SFS Client Proxy support
nidietr-MSFT Dec 2, 2024
e5fed4c
Adds SFS Client Proxy support
nidietr-MSFT Dec 2, 2024
5426ef4
Fixed GetProxyUri() to return a reference
nidietr-MSFT Dec 6, 2024
5d5dd30
Squashed 'src/SfsClient/sfs-client/' changes from be733af9..0e27525d
nidietr-MSFT Dec 10, 2024
4c2d9f3
Merge commit '5d5dd308a0b367b327039694689ac6618b0b309f' into SfsClien…
nidietr-MSFT Dec 10, 2024
3d1402c
Update readme.md & SfsClient project files for SfsClient 1.1.0
nidietr-MSFT Dec 10, 2024
7f6eb75
Logging before effectively setting the proxy.
nidietr-MSFT Dec 10, 2024
cae2465
Logging before effectively passing the proxy to SfsClient
nidietr-MSFT Dec 10, 2024
cce2b30
Merge branch 'SfsClient-Update1.1.0-ForProxySupport' into WinGetDownl…
nidietr-MSFT Dec 10, 2024
4f05508
Review comments: a) alphabetic order for includes, b) access the std:…
nidietr-MSFT Dec 10, 2024
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
8 changes: 8 additions & 0 deletions src/AppInstallerCommonCore/MSStoreDownload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "winget/Rest.h"
#include "winget/HttpClientHelper.h"
#include "winget/UserSettings.h"
#include "winget/NetworkSettings.h"
nidietr-MSFT marked this conversation as resolved.
Show resolved Hide resolved
#ifndef WINGET_DISABLE_FOR_FUZZING
#include <sfsclient/SFSClient.h>
#endif
Expand Down Expand Up @@ -910,6 +911,13 @@ namespace AppInstaller::MSStore
{
SFS::RequestParams sfsClientRequest;
sfsClientRequest.productRequests = { {std::string{ wuCategoryId }, {}} };
if (AppInstaller::Settings::Network().GetProxyUri())
nidietr-MSFT marked this conversation as resolved.
Show resolved Hide resolved
{
std::string proxyUri = AppInstaller::Settings::Network().GetProxyUri().value();
nidietr-MSFT marked this conversation as resolved.
Show resolved Hide resolved

sfsClientRequest.proxy = proxyUri;
AICLI_LOG(Core, Info, << "Passing proxy to SFS client " << proxyUri);
nidietr-MSFT marked this conversation as resolved.
Show resolved Hide resolved
}

auto requestResult = GetSfsClientInstance()->GetLatestAppDownloadInfo(sfsClientRequest, appContents);
if (!requestResult)
Expand Down
Loading