From 7967f0f1cbe55fe76e2ded1aa5fbd51a9b38d2c4 Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:06:12 -0600
Subject: [PATCH 1/7] fix: restore Electron binary with MSBuild Unzip instead
 of PowerShell

RestoreElectronBinary shelled out to Windows PowerShell 5.1, which fails
when the build inherits a PowerShell 7 PSModulePath (Expand-Archive
MethodCountCouldNotFindBest). The old target deleted dist first, leaving
it empty and the Electron window never opening. Locate the cached zip
with an item glob and extract it with the built-in Unzip task instead.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 4-Nine/Nine.csproj | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/4-Nine/Nine.csproj b/4-Nine/Nine.csproj
index 462930f..5fe0a42 100644
--- a/4-Nine/Nine.csproj
+++ b/4-Nine/Nine.csproj
@@ -101,9 +101,12 @@
     Electron binary. This target auto-restores the binary from the npm cache after every build.
 
     Linux/macOS: npm's allow-scripts policy and extract-zip failures prevent automatic download,
-    so the cache (~/.cache/electron) is used directly via unzip.
+    so the cache (~/.cache/electron) is used directly.
 
-    Windows: PowerShell Expand-Archive extracts from %LOCALAPPDATA%\electron\Cache.
+    Windows: the cache is %LOCALAPPDATA%\electron\Cache.
+
+    The zip is located with an item glob and extracted with MSBuild's Unzip task on every OS,
+    so the result does not depend on which shell or PowerShell version launched the build.
 
     First-time setup (no cache): the build emits a warning with exact steps to seed the cache.
   -->
@@ -128,33 +131,30 @@
       <_ElectronZipName>electron-v$(ElectronVersion)-$(_ElectronPlatformArch).zip</_ElectronZipName>
     </PropertyGroup>
 
-    <!-- Locate zip in cache (Linux) — strip trailing newline with tr -->
-    <Exec Command="find &quot;$(_ElectronCacheDir)&quot; -name &quot;$(_ElectronZipName)&quot; -print -quit 2>/dev/null | tr -d '\n'"
-          ConsoleToMSBuild="true"
-          EchoOff="true"
-          Condition="!Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Linux'))">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_ElectronZipPath" />
-    </Exec>
-
-    <!-- Locate zip in cache (Windows) -->
-    <Exec Command="powershell -NoProfile -Command &quot;(Get-ChildItem -Path '$(_ElectronCacheDir)' -Filter '$(_ElectronZipName)' -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1).FullName&quot;"
-          ConsoleToMSBuild="true"
-          EchoOff="true"
-          Condition="!Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Windows'))">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_ElectronZipPath" />
-    </Exec>
+    <!-- Locate zip in cache with an item glob (no shell involved, so PowerShell module-path issues cannot break it) -->
+    <ItemGroup Condition="!Exists('$(_ElectronBinaryPath)')">
+      <_ElectronZipCandidate Include="$(_ElectronCacheDir)/**/$(_ElectronZipName)" />
+    </ItemGroup>
+
+    <!-- Keep only the first match; the cache can hold the same zip in several folders -->
+    <PropertyGroup Condition="!Exists('$(_ElectronBinaryPath)')">
+      <_ElectronZipPath>@(_ElectronZipCandidate)</_ElectronZipPath>
+      <_ElectronZipPath Condition="$(_ElectronZipPath.Contains(';'))">$(_ElectronZipPath.Substring(0, $(_ElectronZipPath.IndexOf(';'))))</_ElectronZipPath>
+    </PropertyGroup>
 
     <Message Text="[ElectronRestore] Binary missing — restoring from cache: $(_ElectronZipPath)"
              Importance="high"
              Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != ''" />
 
-    <!-- Extract (Linux) -->
-    <Exec Command="rm -rf &quot;$(_ElectronDistPath)&quot; &amp;&amp; unzip -q &quot;$(_ElectronZipPath)&quot; -d &quot;$(_ElectronDistPath)&quot; &amp;&amp; chmod -R a+x &quot;$(_ElectronDistPath)&quot;"
-          Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != '' And $([MSBuild]::IsOSPlatform('Linux'))" />
+    <!-- Extract with the built-in MSBuild task; overwrites any partial dist without deleting it first -->
+    <Unzip SourceFiles="$(_ElectronZipPath)"
+           DestinationFolder="$(_ElectronDistPath)"
+           OverwriteReadOnlyFiles="true"
+           Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != ''" />
 
-    <!-- Extract (Windows) -->
-    <Exec Command="powershell -NoProfile -Command &quot;if (Test-Path '$(_ElectronDistPath)') { Remove-Item -Path '$(_ElectronDistPath)' -Recurse -Force }; Expand-Archive -Path '$(_ElectronZipPath)' -DestinationPath '$(_ElectronDistPath)' -Force&quot;"
-          Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != '' And $([MSBuild]::IsOSPlatform('Windows'))" />
+    <!-- Linux: make sure the extracted binaries are executable -->
+    <Exec Command="chmod -R a+x &quot;$(_ElectronDistPath)&quot;"
+          Condition="'$(_ElectronZipPath)' != '' And Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Linux'))" />
 
     <!--
       No cache found — first-time setup. Instruct the developer to run npm install once

From 2ee3c8c01c1db8a086c695a05fddcf8c3c4e7e5b Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:11:58 -0600
Subject: [PATCH 2/7] fix: keep original Linux Electron restore steps, use
 Unzip on Windows only

Linux restore was working, so restore its find/unzip/chmod steps exactly.
The MSBuild glob + Unzip path now applies only to Windows.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 4-Nine/Nine.csproj | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/4-Nine/Nine.csproj b/4-Nine/Nine.csproj
index 5fe0a42..3559627 100644
--- a/4-Nine/Nine.csproj
+++ b/4-Nine/Nine.csproj
@@ -101,12 +101,11 @@
     Electron binary. This target auto-restores the binary from the npm cache after every build.
 
     Linux/macOS: npm's allow-scripts policy and extract-zip failures prevent automatic download,
-    so the cache (~/.cache/electron) is used directly.
+    so the cache (~/.cache/electron) is used directly via unzip.
 
-    Windows: the cache is %LOCALAPPDATA%\electron\Cache.
-
-    The zip is located with an item glob and extracted with MSBuild's Unzip task on every OS,
-    so the result does not depend on which shell or PowerShell version launched the build.
+    Windows: the zip is located with an item glob in %LOCALAPPDATA%\electron\Cache and extracted
+    with MSBuild's Unzip task. PowerShell is avoided because a Windows PowerShell 5.1 child
+    process can inherit a PowerShell 7 PSModulePath and fail in Expand-Archive.
 
     First-time setup (no cache): the build emits a warning with exact steps to seed the cache.
   -->
@@ -131,13 +130,21 @@
       <_ElectronZipName>electron-v$(ElectronVersion)-$(_ElectronPlatformArch).zip</_ElectronZipName>
     </PropertyGroup>
 
-    <!-- Locate zip in cache with an item glob (no shell involved, so PowerShell module-path issues cannot break it) -->
-    <ItemGroup Condition="!Exists('$(_ElectronBinaryPath)')">
-      <_ElectronZipCandidate Include="$(_ElectronCacheDir)/**/$(_ElectronZipName)" />
+    <!-- Locate zip in cache (Linux) — strip trailing newline with tr -->
+    <Exec Command="find &quot;$(_ElectronCacheDir)&quot; -name &quot;$(_ElectronZipName)&quot; -print -quit 2>/dev/null | tr -d '\n'"
+          ConsoleToMSBuild="true"
+          EchoOff="true"
+          Condition="!Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Linux'))">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_ElectronZipPath" />
+    </Exec>
+
+    <!-- Locate zip in cache (Windows) with an item glob; no shell involved -->
+    <ItemGroup Condition="!Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Windows'))">
+      <_ElectronZipCandidate Include="$(_ElectronCacheDir)\**\$(_ElectronZipName)" />
     </ItemGroup>
 
     <!-- Keep only the first match; the cache can hold the same zip in several folders -->
-    <PropertyGroup Condition="!Exists('$(_ElectronBinaryPath)')">
+    <PropertyGroup Condition="!Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Windows'))">
       <_ElectronZipPath>@(_ElectronZipCandidate)</_ElectronZipPath>
       <_ElectronZipPath Condition="$(_ElectronZipPath.Contains(';'))">$(_ElectronZipPath.Substring(0, $(_ElectronZipPath.IndexOf(';'))))</_ElectronZipPath>
     </PropertyGroup>
@@ -146,15 +153,15 @@
              Importance="high"
              Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != ''" />
 
-    <!-- Extract with the built-in MSBuild task; overwrites any partial dist without deleting it first -->
+    <!-- Extract (Linux) -->
+    <Exec Command="rm -rf &quot;$(_ElectronDistPath)&quot; &amp;&amp; unzip -q &quot;$(_ElectronZipPath)&quot; -d &quot;$(_ElectronDistPath)&quot; &amp;&amp; chmod -R a+x &quot;$(_ElectronDistPath)&quot;"
+          Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != '' And $([MSBuild]::IsOSPlatform('Linux'))" />
+
+    <!-- Extract (Windows) — overwrites any partial dist without deleting it first -->
     <Unzip SourceFiles="$(_ElectronZipPath)"
            DestinationFolder="$(_ElectronDistPath)"
            OverwriteReadOnlyFiles="true"
-           Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != ''" />
-
-    <!-- Linux: make sure the extracted binaries are executable -->
-    <Exec Command="chmod -R a+x &quot;$(_ElectronDistPath)&quot;"
-          Condition="'$(_ElectronZipPath)' != '' And Exists('$(_ElectronBinaryPath)') And $([MSBuild]::IsOSPlatform('Linux'))" />
+           Condition="!Exists('$(_ElectronBinaryPath)') And '$(_ElectronZipPath)' != '' And $([MSBuild]::IsOSPlatform('Windows'))" />
 
     <!--
       No cache found — first-time setup. Instruct the developer to run npm install once

From 9be28e9a003da3ffb222da2e63cb38f0ed1ce367 Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:22:11 -0600
Subject: [PATCH 3/7] fix: pin AngleSharp 1.5.0 in Shared.UI tests to resolve
 NU1902 (GHSA-pgww-w46g-26qg)

bunit 2.7.2 pulls in AngleSharp 1.4.0 transitively; 1.5.0 is the first
patched version. A direct reference overrides the transitive one.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 6-Tests/Nine.Shared.UI.Tests/Nine.Shared.UI.Tests.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/6-Tests/Nine.Shared.UI.Tests/Nine.Shared.UI.Tests.csproj b/6-Tests/Nine.Shared.UI.Tests/Nine.Shared.UI.Tests.csproj
index 0b0cfb2..6aa5bc2 100644
--- a/6-Tests/Nine.Shared.UI.Tests/Nine.Shared.UI.Tests.csproj
+++ b/6-Tests/Nine.Shared.UI.Tests/Nine.Shared.UI.Tests.csproj
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="1.5.0" />
     <PackageReference Include="bunit" Version="2.7.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
     <PackageReference Include="FluentAssertions" Version="8.8.0" />

From db453caeaf0478c4675170da0161dfb89a146cc0 Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:22:49 -0600
Subject: [PATCH 4/7] see revisions.md for list of changes.

---
 4-Nine/Nine.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/4-Nine/Nine.csproj b/4-Nine/Nine.csproj
index 3559627..6ad3b38 100644
--- a/4-Nine/Nine.csproj
+++ b/4-Nine/Nine.csproj
@@ -74,6 +74,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.1" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.21" />
     <PackageReference Include="QuestPDF" Version="2025.12.1" />
   </ItemGroup>
 

From 2b89adf954800330771fea3f2a059df19c9f6483 Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:45:35 -0600
Subject: [PATCH 5/7] fix: show clear error when no active organization in user
 View page

LoadUserData dereferenced currentOrgId with ! and let a null active org
surface as 'Nullable object must have a value'. Check HasValue and set a
specific message, and render errorMessage in the !canViewUser branch so it
is not hidden behind the generic Access Denied text.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Features/Administration/Users/View.razor   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/4-Nine/Features/Administration/Users/View.razor b/4-Nine/Features/Administration/Users/View.razor
index 01ee81b..a3664ce 100644
--- a/4-Nine/Features/Administration/Users/View.razor
+++ b/4-Nine/Features/Administration/Users/View.razor
@@ -42,8 +42,16 @@ else if (viewedUser == null)
 else if (!canViewUser)
 {
     <div class="alert alert-danger">
-        <h4>Access Denied</h4>
-        <p>You don't have permission to view this user's account.</p>
+        @if (!string.IsNullOrEmpty(errorMessage))
+        {
+            <h4>Unable to Load User</h4>
+            <p>@errorMessage</p>
+        }
+        else
+        {
+            <h4>Access Denied</h4>
+            <p>You don't have permission to view this user's account.</p>
+        }
         <a href="/admin/users" class="btn btn-primary">Back to User Management</a>
     </div>
 }
@@ -327,6 +335,12 @@ else
 
             // Check permissions
             var currentOrgId = await UserContext.GetActiveOrganizationIdAsync();
+            if (!currentOrgId.HasValue)
+            {
+                errorMessage = "Unable to determine current organization context.";
+                return;
+            }
+
             var currentUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(currentUser.Id, currentOrgId.Value);
             isCurrentUserAdmin = currentUserRole == ApplicationConstants.OrganizationRoles.Owner || 
                                 currentUserRole == ApplicationConstants.OrganizationRoles.Administrator;

From 04b939a9fa3da603b240281ac217005d41a519bb Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:50:19 -0600
Subject: [PATCH 6/7] fix: user View page showed wrong role due to shadowed
 field

The local currentUserRole in LoadUserData shadowed the field, so the role
input always rendered the field default. Rename the local to actingUserRole
and default a viewed user with no role to the least-privileged User role.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 4-Nine/Features/Administration/Users/View.razor | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/4-Nine/Features/Administration/Users/View.razor b/4-Nine/Features/Administration/Users/View.razor
index a3664ce..8fa4ab1 100644
--- a/4-Nine/Features/Administration/Users/View.razor
+++ b/4-Nine/Features/Administration/Users/View.razor
@@ -341,9 +341,9 @@ else
                 return;
             }
 
-            var currentUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(currentUser.Id, currentOrgId.Value);
-            isCurrentUserAdmin = currentUserRole == ApplicationConstants.OrganizationRoles.Owner || 
-                                currentUserRole == ApplicationConstants.OrganizationRoles.Administrator;
+            var actingUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(currentUser.Id, currentOrgId.Value);
+            isCurrentUserAdmin = actingUserRole == ApplicationConstants.OrganizationRoles.Owner || 
+                                actingUserRole == ApplicationConstants.OrganizationRoles.Administrator;
             isViewingOwnAccount = currentUser.Id == viewedUser.Id;
             
             // Users can view their own account, admins can view any account in the same org
@@ -356,7 +356,7 @@ else
             // Load user's organization role
             var viewedUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(viewedUser.Id, currentOrgId.Value);
             userRoles = viewedUserRole != null ? new List<string> { viewedUserRole } : new List<string>();
-            currentUserRole = viewedUserRole ?? "No Role";
+            currentUserRole = viewedUserRole ?? ApplicationConstants.OrganizationRoles.User;
             selectedRole = currentUserRole;
             isLockedOut = await UserManager.IsLockedOutAsync(viewedUser);
 

From 52a3e3751318b0f6403c2ee9f798e5bcc08357cf Mon Sep 17 00:00:00 2001
From: Solid One <xskcdf.1001@gmail.com>
Date: Thu, 12 Nov 2026 06:52:16 -0600
Subject: [PATCH 7/7] fix: show 'No role found' for users without an
 organization role

Display text is separate from the dropdown selection: the read-only input
shows 'No role found' and the admin dropdown stays on 'Select a role...'
instead of implying a User role the account does not have.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 4-Nine/Features/Administration/Users/View.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/4-Nine/Features/Administration/Users/View.razor b/4-Nine/Features/Administration/Users/View.razor
index 8fa4ab1..29f1fce 100644
--- a/4-Nine/Features/Administration/Users/View.razor
+++ b/4-Nine/Features/Administration/Users/View.razor
@@ -356,8 +356,8 @@ else
             // Load user's organization role
             var viewedUserRole = await OrganizationService.GetUserRoleForOrganizationAsync(viewedUser.Id, currentOrgId.Value);
             userRoles = viewedUserRole != null ? new List<string> { viewedUserRole } : new List<string>();
-            currentUserRole = viewedUserRole ?? ApplicationConstants.OrganizationRoles.User;
-            selectedRole = currentUserRole;
+            currentUserRole = viewedUserRole ?? "No role found";
+            selectedRole = viewedUserRole ?? string.Empty;
             isLockedOut = await UserManager.IsLockedOutAsync(viewedUser);
 
             // Load available roles for admins