PR review comments fix Part 3:

- When running as admin, block attempt to repair user scope installed package.
Madhusudhan-MSFT · Feb 15, 2024 · 808ad02 · 808ad02
1 parent e2868e2
commit 808ad02
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/AppInstallerCLICore/Resources.h b/src/AppInstallerCLICore/Resources.h
@@ -340,6 +340,7 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(NestedInstallerNotSpecified);
         WINGET_DEFINE_RESOURCE_STRINGID(NestedInstallerNotSupported);
         WINGET_DEFINE_RESOURCE_STRINGID(NoApplicableInstallers);
+        WINGET_DEFINE_RESOURCE_STRINGID(NoAdminRepairForUserScopePackage);
         WINGET_DEFINE_RESOURCE_STRINGID(NoExperimentalFeaturesMessage);
         WINGET_DEFINE_RESOURCE_STRINGID(NoInstalledPackageFound);
         WINGET_DEFINE_RESOURCE_STRINGID(NoPackageFound);

diff --git a/src/AppInstallerCLICore/Workflows/ShellExecuteInstallerHandler.cpp b/src/AppInstallerCLICore/Workflows/ShellExecuteInstallerHandler.cpp
@@ -344,6 +344,20 @@ namespace AppInstaller::CLI::Workflow
 
         std::wstring commandUtf16 = Utility::ConvertToUTF16(context.Get<Execution::Data::RepairString>());
 
+        // When running as admin, block attempt to repair user scope installed package.
+        if (Runtime::IsRunningAsAdmin())
+        {
+           auto installedPackageVersion = context.Get<Execution::Data::InstalledPackageVersion>();
+           const std::string installedScopeString = installedPackageVersion->GetMetadata()[PackageVersionMetadata::InstalledScope];
+           auto scopeEnum =  ConvertToScopeEnum(installedScopeString);
+
+           if (scopeEnum == ScopeEnum::User)
+           {
+                context.Reporter.Warn() << Resource::String::NoAdminRepairForUserScopePackage << std::endl;
+                AICLI_TERMINATE_CONTEXT(E_ABORT);
+           }
+        }
+
         // Parse the command string as application and command line for CreateProcess
         wil::unique_cotaskmem_string app = nullptr;
         wil::unique_cotaskmem_string args = nullptr;

diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -2810,4 +2810,7 @@ Please specify one of them using the --source option to proceed.</value>
   <data name="RepairOperationNotSupported" xml:space="preserve">
     <value>The installer technology in use does not support repair.</value>
   </data>
+  <data name="NoAdminRepairForUserScopePackage" xml:space="preserve">
+    <value>The package installed for user scope cannot be repaired when running with administrator privileges.</value>
+  </data>
 </root>