Skip to content

Allow winget to install MS Store packages without account #2095

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
yao-msft merged 10 commits into from
Apr 26, 2022
Merged

Allow winget to install MS Store packages without account #2095

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d8813ee
Update MSStoreInstallerHandler.cpp
zachcwillson Apr 14, 2022
07e0e0a
Update MSStoreInstallerHandler.cpp
Apr 14, 2022
28e9dbf
Update MSStoreInstallerHandler.cpp
Apr 14, 2022
a5c81f0
Update MSStoreInstallerHandler.cpp
Apr 14, 2022
199fd6a
Update src/AppInstallerCLICore/Workflows/MSStoreInstallerHandler.cpp
zachcwillson Apr 15, 2022
b14ae91
Update src/AppInstallerCLICore/Workflows/MSStoreInstallerHandler.cpp
zachcwillson Apr 15, 2022
06e51b5
Update MSStoreInstallerHandler.cpp
Apr 15, 2022
4d265e9
Update MSStoreInstallerHandler.cpp
Apr 26, 2022
83e04f6
Use device
yao-msft Apr 26, 2022
eb1375e
Correct logging type
yao-msft Apr 26, 2022
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
30 changes: 15 additions & 15 deletions src/AppInstallerCLICore/Workflows/MSStoreInstallerHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,37 +70,37 @@ namespace AppInstaller::CLI::Workflow
return errorCode;
}

bool GetFreeUserEntitlement(Execution::Context& context, const std::wstring& productId)
bool GetFreeEntitlement(Execution::Context& context, const std::wstring& productId)
{
AppInstallManager installManager;

// Verifying/Acquiring product ownership
context.Reporter.Info() << Resource::String::MSStoreInstallTryGetEntitlement << std::endl;
GetEntitlementResult enr = installManager.GetFreeUserEntitlementAsync(productId, winrt::hstring(), winrt::hstring()).get();

if (enr.Status() == GetEntitlementStatus::Succeeded)
AICLI_LOG(CLI, Info, << "Get user entitlement.");
GetEntitlementResult result = installManager.GetFreeUserEntitlementAsync(productId, winrt::hstring(), winrt::hstring()).get();
if (result.Status() == GetEntitlementStatus::NoStoreAccount)
{
context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementSuccess << std::endl;
AICLI_LOG(CLI, Error, << "Get entitlement succeeded.");

AICLI_LOG(CLI, Info, << "Get device entitlement.");
result = installManager.GetFreeDeviceEntitlementAsync(productId, winrt::hstring(), winrt::hstring()).get();
}
else if (enr.Status() == GetEntitlementStatus::NoStoreAccount)

if (result.Status() == GetEntitlementStatus::Succeeded)
{
context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementNoStoreAccount << std::endl;
AICLI_LOG(CLI, Error, << "Get entitlement failed. No Store account.");
context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementSuccess << std::endl;
}
else if (enr.Status() == GetEntitlementStatus::NetworkError)
else if (result.Status() == GetEntitlementStatus::NetworkError)
{
context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementNetworkError << std::endl;
AICLI_LOG(CLI, Error, << "Get entitlement failed. Network error.");
}
else if (enr.Status() == GetEntitlementStatus::ServerError)
else if (result.Status() == GetEntitlementStatus::ServerError)
{
context.Reporter.Info() << Resource::String::MSStoreInstallGetEntitlementServerError << std::endl;
AICLI_LOG(CLI, Error, << "Get entitlement succeeded. Server error. ProductId: " << Utility::ConvertToUTF8(productId));
}

return enr.Status() == GetEntitlementStatus::Succeeded;
return result.Status() == GetEntitlementStatus::Succeeded;
}
}

Expand All @@ -111,7 +111,7 @@ namespace AppInstaller::CLI::Workflow
AppInstallManager installManager;

// Verifying/Acquiring product ownership
if (!GetFreeUserEntitlement(context, productId))
if (!GetFreeEntitlement(context, productId))
{
AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_MSSTORE_INSTALL_FAILED);
}
Expand Down Expand Up @@ -149,7 +149,7 @@ namespace AppInstaller::CLI::Workflow
AppInstallManager installManager;

// Verifying/Acquiring product ownership
if (!GetFreeUserEntitlement(context, productId))
if (!GetFreeEntitlement(context, productId))
{
AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_MSSTORE_INSTALL_FAILED);
}
Expand All @@ -160,7 +160,7 @@ namespace AppInstaller::CLI::Workflow
AppInstallItem installItem = installManager.SearchForUpdatesAsync(
productId, // ProductId
winrt::hstring() // SkuId
).get();
).get();

if (!installItem)
{
Expand Down