From d276f37e87b13389ea47f955ad8172f17ae6cbe3 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Wed, 9 Jun 2021 13:32:48 +0100
Subject: [PATCH] Support non-admin installation on Windows. Fixes #6524

---
 docs/en_US/release_notes_5_4.rst |  4 +++-
 pkg/win32/installer.iss.in       | 15 ++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs/en_US/release_notes_5_4.rst b/docs/en_US/release_notes_5_4.rst
index 4ae6b3187..e0af5690f 100644
--- a/docs/en_US/release_notes_5_4.rst
+++ b/docs/en_US/release_notes_5_4.rst
@@ -15,7 +15,9 @@ New features
 | `Issue #4064 <https://redmine.postgresql.org/issues/4064>`_ -  Added window maximize/restore functionality for properties dialog.
 | `Issue #5370 <https://redmine.postgresql.org/issues/5370>`_ -  Added support to set the binary path for the different database server versions.
 | `Issue #6231 <https://redmine.postgresql.org/issues/6231>`_ -  Added OS, Browser, Configuration details in the About dialog.
-| `Issue #6395 <https://redmine.postgresql.org/issues/6395>`_ -  Added support to rotate the pgadmin log file on the basis of Size and Age.
+| `Issue #6395 <https://redmine.postgresql.org/issues/6395>`_ -  Added support for rotating the pgAdmin log file on the basis of size and age.
+| `Issue #6524 <https://redmine.postgresql.org/issues/6524>`_ -  Support non-admin installation on Windows.
+
 
 Housekeeping
 ************
diff --git a/pkg/win32/installer.iss.in b/pkg/win32/installer.iss.in
index 4ecdfb51c..ff9ea5ff7 100644
--- a/pkg/win32/installer.iss.in
+++ b/pkg/win32/installer.iss.in
@@ -19,7 +19,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={commonpf}\{#MyAppName}\{#MyAppVersion}
+DefaultDirName={autopf}\{#MyAppName}\{#MyAppVersion}
 DefaultGroupName={#MyAppName}
 DisableWelcomePage=no
 DisableProgramGroupPage=auto
@@ -28,9 +28,10 @@ OutputBaseFilename=pgadmin4-setup
 SetupIconFile=Resources\pgAdmin4.ico
 Compression=lzma
 SolidCompression=yes
-PrivilegesRequired=admin
+PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=dialog
 ChangesEnvironment=yes
-;UninstallFilesDir={app}\{#MyAppVersion}
+UninstallDisplayIcon={app}\runtime\{#MyAppExeName}
 ArchitecturesInstallIn64BitMode={#MyAppArchitecturesMode}
 AllowNoIcons=yes
 WizardImageFile=sidebar.bmp
@@ -57,10 +58,10 @@ Source: "..\..\win-build\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdi
 Filename: "{app}\installer\{#MyAppVCDist}"; StatusMsg: "VC runtime redistributable package"; Parameters: "/passive /verysilent /norestart"; Check: InstallVC;
 
 [Registry]
-Root: HKLM; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
-Root: HKLM; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; ValueType: string; ValueName: "Version"; ValueData: "{#MyAppFullVersion}"
+Root: HKA; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; Flags: uninsdeletekeyifempty
+Root: HKA; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}"
+Root: HKA; Subkey: "Software\{#MyAppName}\{#MyAppVersion}"; ValueType: string; ValueName: "Version"; ValueData: "{#MyAppFullVersion}"
 
 [Code]
 var