Merge pull request #635 from Badgerati/develop

v2.0.1
Badgerati · Nov 29, 2020 · 7e3fea8 · 7e3fea8
2 parents 999b2ab + b4193f1
commit 7e3fea8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## v2.0.1
+
+```plain
+### Bugs
+* #631: Parse username during Windows AD authentication
+* #632: Fixes null reference exception during server restart
+```
+
 ## v2.0.0
 
 ```plain

diff --git a/src/Private/Authentication.ps1 b/src/Private/Authentication.ps1
@@ -537,6 +537,9 @@ function Get-PodeAuthWindowsADMethod
     return {
         param($username, $password, $options)
 
+        # parse username to remove domains
+        $username = (($username -split '@')[0] -split '\\')[-1]
+
         # validate and retrieve the AD user
         $noGroups = $options.NoGroups
         $openLdap = $options.OpenLDAP

diff --git a/src/Private/Server.ps1 b/src/Private/Server.ps1
@@ -140,7 +140,7 @@ function Restart-PodeInternalServer
             $PodeContext.Server.Handlers[$_].Clear()
         }
 
-        $PodeContext.Views.Clear()
+        $PodeContext.Server.Views.Clear()
         $PodeContext.Timers.Clear()
         $PodeContext.Schedules.Clear()
         $PodeContext.Server.Logging.Types.Clear()

diff --git a/tests/unit/Server.Tests.ps1 b/tests/unit/Server.Tests.ps1
@@ -144,6 +144,7 @@ Describe 'Restart-PodeInternalServer' {
                     Snapins = @{ Exported = @() }
                     Functions = @{ Exported = @() }
                 }
+                Views = @{ 'key' = 'value' };
             };
             Metrics = @{
                 Server = @{
@@ -152,7 +153,6 @@ Describe 'Restart-PodeInternalServer' {
             }
             Timers = @{ 'key' = 'value' }
             Schedules = @{ 'key' = 'value' };
-            Views = @{ 'key' = 'value' };
         }
 
         Restart-PodeInternalServer | Out-Null