From 4ddd7c140cdf2103ff823e95e1c969ed58b45e93 Mon Sep 17 00:00:00 2001
From: John Klann <dba@jkdba.com>
Date: Mon, 25 Mar 2019 11:07:58 -0400
Subject: [PATCH 1/2] #160 - Configuration Commands

- Updated New, Update, Get KPDBConfig functions to support a new -Default parameter.
- Added pester tests for new functionality.
---
 PoShKeePass.psd1                              | Bin 9242 -> 9242 bytes
 Test/PSKeePassUsage.Tests.ps1                 |  62 +++++++++++++++++-
 .../Get-KeePassDatabaseConfiguration.ps1      |  16 ++++-
 .../New-KeePassDatabaseConfiguration.ps1      |  17 +++++
 .../Update-KeePassDatabaseConfiguration.ps1   |  17 +++++
 5 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/PoShKeePass.psd1 b/PoShKeePass.psd1
index a8c8d26835ee6abce4e3eda98bfe27e24f283f34..3da87309d2418641c05fd82bb18fea2b2c2fea2d 100644
GIT binary patch
delta 18
ZcmbQ`G0S5^3=^Z}WJhN4%_U6B6ahTL1?vC+

delta 16
XcmbQ`G0S5^4AW!>W{J%uOv@AjG}Z;N

diff --git a/Test/PSKeePassUsage.Tests.ps1 b/Test/PSKeePassUsage.Tests.ps1
index 6f26999..5c0a848 100644
--- a/Test/PSKeePassUsage.Tests.ps1
+++ b/Test/PSKeePassUsage.Tests.ps1
@@ -119,8 +119,8 @@ InModuleScope "PoShKeePass" {
                 $DatabaseConfiguration.UseNetworkAccount | Should Be $false
                 $DatabaseConfiguration.UseMasterKey | Should Be $false
                 $DatabaseConfiguration.AuthenticationType | Should Be 'Key'
+                $DatabaseConfiguration.Default | Should Be $false
             }
-            break
         }
 
         Context "Example 2: Create a new KeePass Database Configuration Profile - MasterKey" {
@@ -198,6 +198,28 @@ InModuleScope "PoShKeePass" {
                 $DatabaseConfiguration.AuthenticationType | Should Be 'Network'
             }
         }
+
+        Context "Example 5: Create a new KeePass Database Configuration Profile - Default DB" {
+
+            New-KPConfigurationFile -Force
+
+            It "Example 5.1: Database Configuration Profile - Default - Valid with PassThru" {
+                $DatabaseConfiguration = New-KeePassDatabaseConfiguration -DatabaseProfileName 'DefaultTestPassThru' -DatabasePath "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx" -UseNetworkAccount -Default -PassThru
+
+                $DatabaseConfiguration.Name | Should Be 'DefaultTestPassThru'
+                $DatabaseConfiguration.DatabasePath | Should Be "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx"
+                $DatabaseConfiguration.KeyPath | Should Be ''
+                $DatabaseConfiguration.UseNetworkAccount | Should Be $True
+                $DatabaseConfiguration.UseMasterKey | Should Be $false
+                $DatabaseConfiguration.AuthenticationType | Should Be 'Network'
+                $DatabaseConfiguration.Default | Should Be $true
+            }
+
+            It "Example 5.2: Database Configuration Profile - Default - Invalid Already Default" {
+                {New-KeePassDatabaseConfiguration -DatabaseProfileName 'DefaultTestFailPassThru' -DatabasePath "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx" -UseNetworkAccount -Default -PassThru } | should Throw
+                # $Error[0].exception.message -ilike 'DefaultTestPassThru profile is already set to the default*' | should be $true
+            }
+        }
     }
 
     Describe "Get-KeePassDatabaseConfiguration - UnitTest" -Tag UnitTest {
@@ -228,6 +250,20 @@ InModuleScope "PoShKeePass" {
                 $DatabaseConfiguration.UseMasterKey | Should Be 'False'
                 $DatabaseConfiguration.AuthenticationType | Should Be 'Network'
             }
+
+            It "Example 1.3: Get Database Configuration Profile - Valid - By Default" {
+                New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile1' -DatabasePath "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx" -UseNetworkAccount -Default | Should Be $null
+
+                $DatabaseConfiguration = Get-KeePassDatabaseConfiguration -Default
+
+                $DatabaseConfiguration.Name | Should Be 'SampleProfile1'
+                $DatabaseConfiguration.DatabasePath | Should Be "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx"
+                $DatabaseConfiguration.KeyPath | Should Be ''
+                $DatabaseConfiguration.UseNetworkAccount | Should Be 'True'
+                $DatabaseConfiguration.UseMasterKey | Should Be 'False'
+                $DatabaseConfiguration.AuthenticationType | Should Be 'Network'
+                $DatabaseConfiguration.Default | Should Be $true
+            }
         }
 
         New-KPConfigurationFile -Force
@@ -252,6 +288,30 @@ InModuleScope "PoShKeePass" {
             }
         }
 
+        Context "Example 2: Update a KeePass Database Configuration Profile - Default DB" {
+
+            New-KPConfigurationFile -Force
+
+            It "Example 2.1: Update Database Configuration Profile - Valid - DefaultDB" {
+                New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx" -UseNetworkAccount | Should Be $null
+
+                $DatabaseConfiguration = Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -NewDatabaseProfileName 'Updated' -Default -PassThru
+
+                $DatabaseConfiguration.Name | Should Be 'Updated'
+                $DatabaseConfiguration.DatabasePath | Should Be "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx"
+                $DatabaseConfiguration.KeyPath | Should Be ''
+                $DatabaseConfiguration.UseNetworkAccount | Should Be 'True'
+                $DatabaseConfiguration.UseMasterKey | Should Be 'False'
+                $DatabaseConfiguration.AuthenticationType | Should Be 'Network'
+                $DatabaseConfiguration.Default | Should Be $true
+            }
+
+            It "Example 2.2: Update Database Configuration Profile - Valid - Invalid Already Default" {
+                {New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile1' -DatabasePath "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx" -UseNetworkAccount -Default -PassThru } | should Throw
+                # $Error[0].exception.message -ilike 'DefaultTestPassThru profile is already set to the default*' | should be $true
+            }
+        }
+
         New-KPConfigurationFile -Force
     }
 
diff --git a/functions/Get-KeePassDatabaseConfiguration.ps1 b/functions/Get-KeePassDatabaseConfiguration.ps1
index 00b01b7..af99332 100644
--- a/functions/Get-KeePassDatabaseConfiguration.ps1
+++ b/functions/Get-KeePassDatabaseConfiguration.ps1
@@ -20,14 +20,18 @@ function Get-KeePassDatabaseConfiguration
         .OUTPUTS
             PSObject
     #>
-    [CmdletBinding()]
+    [CmdletBinding(DefaultParameterSetName = '__None')]
     param
     (
-        [Parameter(Position = 0)]
+        [Parameter(Position = 0, ParameterSetName = '__Profile')]
         [ValidateNotNullOrEmpty()]
         [String] $DatabaseProfileName,
 
-        [Parameter(Position = 1)]
+        [Parameter(Position = 1, ParameterSetName = '__DefaultDB')]
+        [ValidateNotNullOrEmpty()]
+        [Switch] $Default,
+
+        [Parameter(Position = 2)]
         [Switch] $Stop
     )
     process
@@ -41,6 +45,10 @@ function Get-KeePassDatabaseConfiguration
             {
                 $ProfileResults = $XML.Settings.DatabaseProfiles.Profile | Where-Object { $_.Name -ilike $DatabaseProfileName }
             }
+            elseif($Default)
+            {
+                $ProfileResults = $XML.Settings.DatabaseProfiles.Profile | Where-Object { $_.Default -ieq 'true' }
+            }
             else
             {
                 $ProfileResults = $XML.Settings.DatabaseProfiles.Profile
@@ -55,6 +63,7 @@ function Get-KeePassDatabaseConfiguration
             {
                 $UseNetworkAccount = if($ProfileResult.UseNetworkAccount -eq 'True'){$true}else{$false}
                 $UseMasterKey = if($ProfileResult.UseMasterKey -eq 'True'){$true}else{$false}
+                $ProfileDefault = if($ProfileResult.Default -eq 'True'){$true}else{$false}
 
                 [hashtable] $ProfileObject = [ordered]@{
                     'Name'               = $ProfileResult.Name;
@@ -63,6 +72,7 @@ function Get-KeePassDatabaseConfiguration
                     'UseMasterKey'       = $UseMasterKey;
                     'UseNetworkAccount'  = $UseNetworkAccount;
                     'AuthenticationType' = $ProfileResult.AuthenticationType;
+                    'Default'            = $ProfileDefault;
                 }
 
                 New-Object -TypeName PSObject -Property $ProfileObject
diff --git a/functions/New-KeePassDatabaseConfiguration.ps1 b/functions/New-KeePassDatabaseConfiguration.ps1
index 71a2bb2..10c6f07 100644
--- a/functions/New-KeePassDatabaseConfiguration.ps1
+++ b/functions/New-KeePassDatabaseConfiguration.ps1
@@ -65,6 +65,9 @@ function New-KeePassDatabaseConfiguration
         [Switch] $UseMasterKey,
 
         [Parameter(Position = 5)]
+        [Switch] $Default,
+
+        [Parameter(Position = 6)]
         [Switch] $PassThru
     )
     begin
@@ -97,6 +100,16 @@ function New-KeePassDatabaseConfiguration
         {
             try
             {
+                if($Default)
+                {
+                    $defaultProfile = Get-KeePassDatabaseConfiguration -Default
+
+                    if($defaultProfile)
+                    {
+                        throw ('{0} profile is already set to the default, if you would like to overwrite it as the default please use the Update-KeePassDatabaseConfiguration function and remove the default flag.' -f $defaultProfile.Name)
+                    }
+                }
+
                 [Xml] $XML = New-Object -TypeName System.Xml.XmlDocument
                 $XML.Load($Global:KeePassConfigurationFile)
                 ## Create New Profile Element with Name of the new profile
@@ -126,6 +139,10 @@ function New-KeePassDatabaseConfiguration
                 $AuthenticationTypeNode.InnerText = $PSCmdlet.ParameterSetName
                 $DatabaseProfile.AppendChild($AuthenticationTypeNode) | Out-Null
 
+                $DefaultNode = $XML.CreateNode('element', 'Default', '')
+                $DefaultNode.InnerText = $Default
+                $DatabaseProfile.AppendChild($DefaultNode) | Out-Null
+
                 $XML.SelectSingleNode('/Settings/DatabaseProfiles').AppendChild($DatabaseProfile) | Out-Null
 
                 $XML.Save($Global:KeePassConfigurationFile)
diff --git a/functions/Update-KeePassDatabaseConfiguration.ps1 b/functions/Update-KeePassDatabaseConfiguration.ps1
index 6358143..3098c19 100644
--- a/functions/Update-KeePassDatabaseConfiguration.ps1
+++ b/functions/Update-KeePassDatabaseConfiguration.ps1
@@ -69,6 +69,9 @@ function Update-KeePassDatabaseConfiguration
         [Switch] $UseMasterKey,
 
         [Parameter(Position = 6)]
+        [Switch] $Default,
+
+        [Parameter(Position = 7)]
         [Switch] $PassThru
     )
     begin
@@ -101,6 +104,16 @@ function Update-KeePassDatabaseConfiguration
         }
         else
         {
+            if($Default)
+            {
+                $defaultProfile = Get-KeePassDatabaseConfiguration -Default
+
+                if($defaultProfile -and $defaultProfile.Name -ine $DatabaseProfileName)
+                {
+                    throw ('{0} profile is already set to the default, if you would like to overwrite it as the default please use the Update-KeePassDatabaseConfiguration function and remove the default flag.' -f $defaultProfile.Name)
+                }
+            }
+
             try
             {
                 [Xml] $XML = New-Object -TypeName System.Xml.XmlDocument
@@ -142,6 +155,10 @@ function Update-KeePassDatabaseConfiguration
                 $AuthenticationTypeNode.InnerText = $_AuthenticationType
                 $DatabaseProfile.AppendChild($AuthenticationTypeNode) | Out-Null
 
+                $DefaultNode = $XML.CreateNode('element', 'Default', '')
+                $DefaultNode.InnerText = $Default
+                $DatabaseProfile.AppendChild($DefaultNode) | Out-Null
+
                 $XML.SelectSingleNode('/Settings/DatabaseProfiles').ReplaceChild($DatabaseProfile, $OldProfile) | Out-Null
 
                 $XML.Save($Global:KeePassConfigurationFile)

From be614864b282df002ae084a8974e64650ac46610 Mon Sep 17 00:00:00 2001
From: John Klann <dba@jkdba.com>
Date: Mon, 25 Mar 2019 12:11:12 -0400
Subject: [PATCH 2/2] #160 - Updated core commands to support default config

- fixed error handling when no default profile and -stop parameter passed
- added support to New-KPConnection for default profile
- Updated exported commands to no longer require -DatabaseProfileName parameter.
- Added tests for all changes
- Updated documentation
---
 PoShKeePass.psd1                              | Bin 9242 -> 9242 bytes
 Test/PSKeePassUsage.Tests.ps1                 | 141 ++++++++++++++----
 changelog.md                                  |  22 +++
 .../Get-KeePassDatabaseConfiguration.ps1      |   5 +
 functions/Get-KeePassEntry.ps1                |   2 +-
 functions/Get-KeePassGroup.ps1                |   2 +-
 functions/New-KeePassEntry.ps1                |   2 +-
 functions/New-KeePassGroup.ps1                |   2 +-
 functions/Remove-KeePassEntry.ps1             |   2 +-
 functions/Remove-KeePassGroup.ps1             |   2 +-
 functions/Update-KeePassEntry.ps1             |   2 +-
 functions/Update-KeePassGroup.ps1             |   2 +-
 internal/New-KPConnection.ps1                 |  15 +-
 readme.md                                     |  41 ++---
 14 files changed, 183 insertions(+), 57 deletions(-)

diff --git a/PoShKeePass.psd1 b/PoShKeePass.psd1
index 3da87309d2418641c05fd82bb18fea2b2c2fea2d..d25a232eec5753d55ed924e90a62b3c768e16101 100644
GIT binary patch
delta 22
dcmbQ`G0S5^1QV+<gC2vyWJhN4%_U6B6ah@5215V<

delta 22
dcmbQ`G0S5^1QV+fgC2wBWJhN4%_U6B6ah@{21@_{

diff --git a/Test/PSKeePassUsage.Tests.ps1 b/Test/PSKeePassUsage.Tests.ps1
index 5c0a848..d50890f 100644
--- a/Test/PSKeePassUsage.Tests.ps1
+++ b/Test/PSKeePassUsage.Tests.ps1
@@ -56,6 +56,27 @@ InModuleScope "PoShKeePass" {
             }
         }
 
+        Context "Example 4: Open with PSKeePass Credential Object - KeyFile - Default Profile" {
+            New-KPConfigurationFile -Force
+
+            It "Example 4.1: Get KeePass Database Connection with KeyFile using Default Profile - Valid" {
+                New-KeePassDatabaseConfiguration -DatabaseProfileName 'KeyFileTest' -DatabasePath "$PSScriptRoot\Includes\AuthenticationDatabases\KeyFile.kdbx" -KeyPath "$PSScriptRoot\Includes\AuthenticationDatabases\KeyFile.key" -Default | Should Be $null
+
+                $KeePassConnection = New-KPConnection -DatabaseProfileName '' -MasterKey ''
+                $KeePassConnection | Should BeOfType 'KeePassLib.PwDatabase'
+                $KeePassConnection.IsOpen | Should Be $true
+                $KeePassConnection.RootGroup.Name | Should Be 'KeyFile'
+                $KeePassConnection.Close() | Should Be $null
+                $KeePassConnection.IsOpen | Should Be $false
+            }
+
+            It "Example 4.2: Get KeePass Database Connection with KeyFile using Default Profile - Invalid" {
+                Update-KeePassDatabaseConfiguration -DatabaseProfileName 'KeyFileTest' -Default:$false | Should Be $null
+
+                {New-KPConnection -DatabaseProfileName '' -MasterKey ''} | Should Throw
+            }
+        }
+
         ## Holding off on Network Account Testing until I can script the creation of a database.
     }
 
@@ -523,10 +544,9 @@ InModuleScope "PoShKeePass" {
 
             New-KPConfigurationFile -Force
 
-            # It "Example 1.1: Creates a New KeePass Entry - Invalid - No Profile" {
-            #     # New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath "$($PSScriptRoot)\Includes\AuthenticationDatabases\MasterKey.kdbx" -UseNetworkAccount | Should Be $null
-            #     { New-KeePassEntry -KeePassEntryGroupPath 'database' -Title 'test' -UserName 'testuser' -Notes 'testnotes' -URL 'http://url.test.com' } | Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+            It "Example 1.1: Creates a New KeePass Entry - Invalid - No Profile/Default" {
+                { New-KeePassEntry -KeePassEntryGroupPath 'database' -Title 'test' -UserName 'testuser' -Notes 'testnotes' -URL 'http://url.test.com' } | Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -594,6 +614,21 @@ InModuleScope "PoShKeePass" {
                 $PassThruResult.Expires | Should be $true
                 $PassThruResult.ExpireTime | Should be $expiryTime.ToUniversalTime()
             }
+
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.9: Creates a New KeePass Entry - Valid - PassThru using Default Profile" {
+
+                $PassThruResult = New-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' -Title 'testPassThru1' -UserName 'testuser1' -Notes 'testnotes' -URL 'http://url.test.com' -PassThru
+
+                $PassThruResult.KPEntry | Should BeOfType KeePassLib.PwEntry
+                $PassThruResult.KPEntry.ParentGroup.Name | Should BeLike 'PSKeePassTestDatabase'
+                $PassThruResult.KPEntry.Strings.ReadSafe('Title') | Should Be 'testPassThru1'
+                $PassThruResult.KPEntry.Strings.ReadSafe('UserName') | Should Be 'testuser1'
+                $PassThruResult.KPEntry.Strings.ReadSafe('Notes') | Should Be 'testnotes'
+                $PassThruResult.KPEntry.Strings.ReadSafe('URL') | Should be 'http://url.test.com'
+                $PassThruResult.Expires | Should be $false
+            }
         }
 
         New-KPConfigurationFile -Force
@@ -605,10 +640,10 @@ InModuleScope "PoShKeePass" {
 
             New-KPConfigurationFile -Force
 
-            # It "Example 1.1: Gets All KeePass Entries - Invalid - No Database Configuration Profiles." {
+            It "Example 1.1: Gets All KeePass Entries - Invalid - No Database Configuration Profiles." {
 
-            #     { Get-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase/BadPath' } | Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+                { Get-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase/BadPath' } | Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -648,6 +683,12 @@ InModuleScope "PoShKeePass" {
                 { Get-KeePassEntry -DatabaseProfileName SampleProfile -KeePassEntryGroupPath 'PSKeePassTestDatabase/BadPath' } | Should Throw
             }
 
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.6 Gets All KeePass Entries - Valid - default profile" {
+                $ResultEntries = Get-KeePassEntry
+                $ResultEntries.Count | Should Be 3
+            }
         }
 
         New-KPConfigurationFile -Force
@@ -659,9 +700,9 @@ InModuleScope "PoShKeePass" {
 
             New-KPConfigurationFile -Force
 
-            # It "Example 1.1: Creates a New KeePass Entry - Invalid - No Profile" {
-            #     { Update-KeePassEntry -KeePassEntry $( New-Object KeePassLib.PwEntry($true, $true)) -KeePassEntryGroupPath 'database' -Title 'test' -UserName 'testuser' -Notes 'testnotes' -URL 'http://url.test.com' }| Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+            It "Example 1.1: Creates a New KeePass Entry - Invalid - No Profile" {
+                { Update-KeePassEntry -KeePassEntry $( New-Object KeePassLib.PwEntry($true, $true)) -KeePassEntryGroupPath 'database' -Title 'test' -UserName 'testuser' -Notes 'testnotes' -URL 'http://url.test.com' } | Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -746,6 +787,14 @@ InModuleScope "PoShKeePass" {
                 $UpdatePassThruResult.Expires | Should be $true
                 $UpdatePassThruResult.ExpireTime | should be $expiryTime.ToUniversalTime()
             }
+
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.9: Updates a KeePass Entry - Valid - Properties - Default Profile" {
+                New-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' -Title 'test1' -UserName 'testuser' -Notes 'testnotes' -URL 'http://url.test.com'| Should Be $null
+                $KeePassEntry = Get-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' | Where-Object { $_.Title -eq 'test1' }
+                Update-KeePassEntry -KeePassEntry $KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' -title 'UpdateTest1' -UserName 'UpdateTestUser' -Notes 'UpdateTestNotes' -URL 'http://UpdateURL.Test.com' -Force | Should Be $null
+            }
         }
         New-KPConfigurationFile -Force
     }
@@ -755,9 +804,9 @@ InModuleScope "PoShKeePass" {
 
         Context "Example 1: Remove a KeePass Entry" {
 
-            # It "Example 1.1: Removes a KeePass Entry - Invalid - No Profile" {
-            #     { Remove-KeePassEntry -KeePassEntry $( New-Object KeePassLib.PwEntry($true, $true)) }| Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+            It "Example 1.1: Removes a KeePass Entry - Invalid - No Profile" {
+                { Remove-KeePassEntry -KeePassEntry $( New-Object KeePassLib.PwEntry($true, $true)) }| Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -790,6 +839,14 @@ InModuleScope "PoShKeePass" {
                 $KeePassEntry = Get-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' -DatabaseProfileName 'SampleProfile' | Where-Object { $_.KPEntry.Strings.ReadSafe('Title') -eq 'test4' }
                 $KeePassEntry | Remove-KeePassEntry -Force | Should Be $null
             }
+
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.6: Removes a KeePass Entry - Valid - Default Profile " {
+                New-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' -Title 'test1' -UserName 'testuser' -Notes 'testnotes' -URL 'http://url.test.com' | Should Be $null
+                $KeePassEntry = Get-KeePassEntry -KeePassEntryGroupPath 'PSKeePassTestDatabase' | Where-Object { $_.Title -eq 'test1' }
+                Remove-KeePassEntry -KeePassEntry $KeePassEntry -Force | Should Be $null
+            }
         }
 
         New-KPConfigurationFile -Force
@@ -801,9 +858,9 @@ InModuleScope "PoShKeePass" {
 
             New-KPConfigurationFile -Force
 
-            # It "Example 1.1: Creates a New KeePass Group - Invalid - No Profile" {
-            #     { New-KeePassGroup -KeePassGroupParentPath 'database' -KeePassGroupName 'test' } | Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+            It "Example 1.1: Creates a New KeePass Group - Invalid - No Profile" {
+                { New-KeePassGroup -KeePassGroupParentPath 'database' -KeePassGroupName 'test' } | Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -852,6 +909,12 @@ InModuleScope "PoShKeePass" {
                 $PassThruResult.Expires | Should Be $true
                 $PassThruResult.ExpireTime | Should Be $expiryTime.ToUniversalTime()
             }
+
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.7: Creates a New KeePass Group - Valid - Default Profile" {
+                New-KeePassGroup -KeePassGroupParentPath 'PSKeePassTestDatabase' -KeePassGroupName 'test1' | Should Be $null
+            }
         }
         New-KPConfigurationFile -Force
     }
@@ -862,10 +925,10 @@ InModuleScope "PoShKeePass" {
 
             New-KPConfigurationFile -Force
 
-            # It "Example 1.1: Gets All KeePass Groups - Invalid - No Database Configuration Profiles." {
+            It "Example 1.1: Gets All KeePass Groups - Invalid - No Database Configuration Profiles." {
 
-            #     { Get-KeePassGroup -KeePassGroupPath 'PSKeePassTestDatabase/BadPath' } | Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+                { Get-KeePassGroup -KeePassGroupPath 'PSKeePassTestDatabase/BadPath' } | Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -896,6 +959,12 @@ InModuleScope "PoShKeePass" {
                 { Get-KeePassEntry -DatabaseProfileName SampleProfile -KeePassEntryGroupPath 'PSKeePassTestDatabase/BadPath' } | Should Throw
             }
 
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.6 Gets All KeePass Groups - Valid - Default Profile" {
+                $ResultGroups = Get-KeePassGroup
+                $ResultGroups.Count | Should Be 7
+            }
         }
 
         New-KPConfigurationFile -Force
@@ -907,9 +976,9 @@ InModuleScope "PoShKeePass" {
 
             New-KPConfigurationFile -Force
 
-            # It "Example 1.1: Updates a KeePass Group - Invalid - No Profile" {
-            #     { Update-KeePassGroup -KeePassGroup $( New-Object KeePassLib.PwGroup($true, $true)) -Force } | Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+            It "Example 1.1: Updates a KeePass Group - Invalid - No Profile" {
+                { Update-KeePassGroup -KeePassGroup $( New-Object KeePassLib.PwGroup($true, $true)) -Force } | Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -1011,6 +1080,17 @@ InModuleScope "PoShKeePass" {
                 $KeePassGroup.ParentGroup | Should be 'PSKeePassTestDatabase'
                 $KeePassGroup.Notes | Should Be 'meh'
             }
+
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 2.1: Updates a KeePass Group - Valid - Name - Default Profile" {
+                New-KeePassGroup -KeePassGroupParentPath 'PSKeePassTestDatabase' -KeePassGroupName 'test1' | Should Be $null
+                $KeePassGroup = Get-KeePassGroup -KeePassGroupPath 'PSKeePassTestDatabase/test1'
+                $KeePassGroup.Name | Should Be 'test1'
+                Update-KeePassGroup -KeePassGroup $KeePassGroup -GroupName 'Test1Update' -Force | Should Be $null
+                $KeePassGroup = Get-KeePassGroup -KeePassGroupPath 'PSKeePassTestDatabase/Test1Update'
+                $KeePassGroup.Name | Should Be 'Test1Update'
+            }
         }
 
         New-KPConfigurationFile -Force
@@ -1021,9 +1101,9 @@ InModuleScope "PoShKeePass" {
 
         Context "Example 1: Remove a KeePass Group" {
 
-            # It "Example 1.1: Removes a KeePass Group - Invalid - No Profile" {
-            #     { Remove-KeePassGroup -KeePassGroup $( New-Object KeePassLib.PwGroup($true, $true)) }| Should Throw 'InvalidKeePassConfiguration : No KeePass Configuration has been created.'
-            # }
+            It "Example 1.1: Removes a KeePass Group - Invalid - No Profile" {
+                { Remove-KeePassGroup -KeePassGroup $( New-Object KeePassLib.PwGroup($true, $true)) }| Should Throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+            }
 
             ## Create Profile
             New-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -DatabasePath $Global:KPTestDatabaseFile -KeyPath $Global:KPTestKeyPath
@@ -1066,6 +1146,17 @@ InModuleScope "PoShKeePass" {
                 $KeePassGroup | Remove-KeePassGroup -Force | Should Be $null
                 Get-KeePassGroup -DatabaseProfileName SampleProfile -KeePassGroupPath 'PSKeePassTestDatabase/RecycleBin/test4' | Should Not Be $null
             }
+
+            Update-KeePassDatabaseConfiguration -DatabaseProfileName 'SampleProfile' -Default
+
+            It "Example 1.5: Removes a KeePass Group - Valid - Default Profile" {
+                New-KeePassGroup -KeePassGroupParentPath 'PSKeePassTestDatabase' -KeePassGroupName 'test1' | Should Be $null
+                $KeePassGroup = Get-KeePassGroup -KeePassGroupPath 'PSKeePassTestDatabase/test1'
+                $KeePassGroup.Name | Should Be 'test1'
+                Remove-KeePassGroup -KeePassGroup $KeePassGroup -Force | Should Be $null
+                $Check = Get-KeePassGroup -KeePassGroupPath 'PSKeePassTestDatabase/RecycleBin/test1'
+                $Check.Name | Should Be 'test1'
+            }
         }
 
         New-KPConfigurationFile -Force
diff --git a/changelog.md b/changelog.md
index 1b5d7e5..3063079 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## v.2.1.3.0
+
+* Added [#160](https://github.com/PSKeePass/PoShKeePass/issues/160) - Default Database Configuration Profile.
+  * When set, the `-DatabaseProfileName` parameter is optional, and if not passed it will grab the default profile from the config.
+  * To Set it up on an existing profile simply use the update command:
+
+  ```powershell
+    Update-KeePassDatabaseConfigurationProfile -DatabaseProfileName 'name' -Default
+  ```
+
+  * To Create a new profile as default use the new command:
+
+  ```powershell
+    New-KeePassDatabaseConfigurationProfile -DatabaseProfileName 'name' -Default -DatabasePath '' other options
+  ```
+
+  * This allows for calls to the main module functions without the `-DatabaseProfileName` parameter such as:
+
+  ```powershell
+    Get-KeePassEntry -UserName 'aUser'
+  ```
+
 ## v.2.1.2.8
 
 * Added - [#84](https://github.com/PSKeePass/PoShKeePass/issues/84) - Manage Notes properties on KPGroup Objects.
diff --git a/functions/Get-KeePassDatabaseConfiguration.ps1 b/functions/Get-KeePassDatabaseConfiguration.ps1
index af99332..a08e6c7 100644
--- a/functions/Get-KeePassDatabaseConfiguration.ps1
+++ b/functions/Get-KeePassDatabaseConfiguration.ps1
@@ -48,6 +48,11 @@ function Get-KeePassDatabaseConfiguration
             elseif($Default)
             {
                 $ProfileResults = $XML.Settings.DatabaseProfiles.Profile | Where-Object { $_.Default -ieq 'true' }
+
+                if($Stop -and -not $ProfileResults)
+                {
+                    throw 'Unable to find a default KeePass Configuration, please specify a database profile name or set a default profile.'
+                }
             }
             else
             {
diff --git a/functions/Get-KeePassEntry.ps1 b/functions/Get-KeePassEntry.ps1
index 90c74a6..fcff71b 100644
--- a/functions/Get-KeePassEntry.ps1
+++ b/functions/Get-KeePassEntry.ps1
@@ -57,7 +57,7 @@ function Get-KeePassEntry
         [Alias('AsPSCredential')]
         [Switch] $WithCredential,
 
-        [Parameter(Position = 5, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 5, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/Get-KeePassGroup.ps1 b/functions/Get-KeePassGroup.ps1
index 0702149..dde11ba 100644
--- a/functions/Get-KeePassGroup.ps1
+++ b/functions/Get-KeePassGroup.ps1
@@ -41,7 +41,7 @@ function Get-KeePassGroup
         [Parameter(Position = 1)]
         [Switch] $AsPlainText,
 
-        [Parameter(Position = 2, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 2, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/New-KeePassEntry.ps1 b/functions/New-KeePassEntry.ps1
index 7de72b1..446bd55 100644
--- a/functions/New-KeePassEntry.ps1
+++ b/functions/New-KeePassEntry.ps1
@@ -92,7 +92,7 @@ function New-KeePassEntry
         [Parameter(Position = 8)]
         [DateTime] $ExpiryTime,
 
-        [Parameter(Position = 9, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 9, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/New-KeePassGroup.ps1 b/functions/New-KeePassGroup.ps1
index 183bcdc..76068f9 100644
--- a/functions/New-KeePassGroup.ps1
+++ b/functions/New-KeePassGroup.ps1
@@ -62,7 +62,7 @@ function New-KeePassGroup
         [Parameter(Position = 5)]
         [DateTime] $ExpiryTime,
 
-        [Parameter(Position = 6, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 6, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/Remove-KeePassEntry.ps1 b/functions/Remove-KeePassEntry.ps1
index bed1ba6..979d070 100644
--- a/functions/Remove-KeePassEntry.ps1
+++ b/functions/Remove-KeePassEntry.ps1
@@ -35,7 +35,7 @@ function Remove-KeePassEntry
         [Parameter(Position = 2)]
         [Switch] $Force,
 
-        [Parameter(Position = 3, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 3, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/Remove-KeePassGroup.ps1 b/functions/Remove-KeePassGroup.ps1
index ce67639..61782e9 100644
--- a/functions/Remove-KeePassGroup.ps1
+++ b/functions/Remove-KeePassGroup.ps1
@@ -35,7 +35,7 @@ function Remove-KeePassGroup
         [Parameter(Position = 2)]
         [Switch] $Force,
 
-        [Parameter(Position = 3, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 3, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/Update-KeePassEntry.ps1 b/functions/Update-KeePassEntry.ps1
index 1aa9616..274d9b1 100644
--- a/functions/Update-KeePassEntry.ps1
+++ b/functions/Update-KeePassEntry.ps1
@@ -100,7 +100,7 @@ function Update-KeePassEntry
         [Parameter(Position = 9)]
         [DateTime] $ExpiryTime,
 
-        [Parameter(Position = 10, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 10, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/functions/Update-KeePassGroup.ps1 b/functions/Update-KeePassGroup.ps1
index 7512e83..648212b 100644
--- a/functions/Update-KeePassGroup.ps1
+++ b/functions/Update-KeePassGroup.ps1
@@ -79,7 +79,7 @@ function Update-KeePassGroup
         [Parameter(Position = 4)]
         [DateTime] $ExpiryTime,
 
-        [Parameter(Position = 5, Mandatory, ValueFromPipelineByPropertyName)]
+        [Parameter(Position = 5, ValueFromPipelineByPropertyName)]
         [ValidateNotNullOrEmpty()]
         [string] $DatabaseProfileName,
 
diff --git a/internal/New-KPConnection.ps1 b/internal/New-KPConnection.ps1
index 92c2c84..863627c 100644
--- a/internal/New-KPConnection.ps1
+++ b/internal/New-KPConnection.ps1
@@ -16,11 +16,11 @@ function New-KPConnection
         .PARAMETER UseWindowsAccount
             Use the current windows account as an authentication method
     #>
-    [CmdletBinding(DefaultParameterSetName = 'Profile')]
+    [CmdletBinding(DefaultParameterSetName = '__None')]
     param
     (
-        [Parameter(Position = 0, Mandatory, ParameterSetName = 'Profile')]
-        [ValidateNotNullOrEmpty()]
+        [Parameter(Position = 0, ParameterSetName = 'Profile')]
+        [AllowNull()]
         [String] $DatabaseProfileName,
 
         [Parameter(Position = 0, Mandatory, ParameterSetName = 'CompositeKey')]
@@ -57,9 +57,14 @@ function New-KPConnection
             Write-Error -Message ('[PROCESS] The MasterKey of type: ({0}). Is not Supported Please supply a MasterKey of Types (SecureString or PSCredential).' -f $($MasterKey.GetType().Name)) -Category InvalidType -TargetObject $MasterKey -RecommendedAction 'Provide a MasterKey of Type PSCredential or SecureString'
         }
 
-        if($PSCmdlet.ParameterSetName -eq 'Profile')
+        if($PSCmdlet.ParameterSetName -eq 'Profile' -or $PSCmdlet.ParameterSetName -eq '__None')
         {
-            $KeepassConfigurationObject = Get-KeePassDatabaseConfiguration -DatabaseProfileName $DatabaseProfileName -Stop
+            ## if not passing a profile name, attempt to get the default db
+            $getKeePassDatabaseConfigurationSplat = @{ Stop = $true }
+            if($DatabaseProfileName){ $getKeePassDatabaseConfigurationSplat.DatabaseProfileName = $DatabaseProfileName }
+            else{ $getKeePassDatabaseConfigurationSplat.Default = $true }
+
+            $KeepassConfigurationObject = Get-KeePassDatabaseConfiguration @getKeePassDatabaseConfigurationSplat
 
             $Database = $KeepassConfigurationObject.DatabasePath
             if(-not [string]::IsNullOrEmpty($KeepassConfigurationObject.KeyPath)){ $KeyPath = $KeepassConfigurationObject.KeyPath }
diff --git a/readme.md b/readme.md
index 27238e9..65df6ee 100644
--- a/readme.md
+++ b/readme.md
@@ -31,6 +31,28 @@ Please check out our [Getting Started](https://github.com/PSKeePass/PoShKeePass/
 
 Please review the [changelog document](https://github.com/PSKeePass/PoShKeePass/blob/master/changelog.md) for a full history.
 
+## v.2.1.3.0
+
+* Added [#160](https://github.com/PSKeePass/PoShKeePass/issues/160) - Default Database Configuration Profile.
+  * When set, the `-DatabaseProfileName` parameter is optional, and if not passed it will grab the default profile from the config.
+  * To Set it up on an existing profile simply use the update command:
+
+  ```powershell
+    Update-KeePassDatabaseConfigurationProfile -DatabaseProfileName 'name' -Default
+  ```
+
+  * To Create a new profile as default use the new command:
+
+  ```powershell
+    New-KeePassDatabaseConfigurationProfile -DatabaseProfileName 'name' -Default -DatabasePath '' other options
+  ```
+
+  * This allows for calls to the main module functions without the `-DatabaseProfileName` parameter such as:
+
+  ```powershell
+    Get-KeePassEntry -UserName 'aUser'
+  ```
+
 ## v.2.1.2.8
 
 * Added - [#84](https://github.com/PSKeePass/PoShKeePass/issues/84) - Manage Notes properties on KPGroup Objects.
@@ -95,25 +117,6 @@ Please review the [changelog document](https://github.com/PSKeePass/PoShKeePass/
     * **Breaking Change** Since this has been implemeneted the `-AsPsCredential` parameter has been removed. The new method is better as it allows for multiple entries to be returned with thier cred objects instead of limiting it to 1 entry.
 * **Breaking Change** - `ConvertTo-KPPSObject` and all returned objects the `.FullPath` property now returns the true full path of the object. The `ParentGroup` property still exists and can be used as an alteranative data source for any lost functionality.
 
-### v2.0.5.6
-
-* Update-KeePassEntry no longer creates a new entry, Entry history is retained, UUID is never changed, All time modificiation fields are now updated when appropriate.
-  * [#127](https://github.com/PSKeePass/PoShKeePass/issues/127)
-  * [#123](https://github.com/PSKeePass/PoShKeePass/issues/123)
-  * [#120](https://github.com/PSKeePass/PoShKeePass/issues/120)
-* Code clean up in the internal functions
-  * Removed unecessary comments.
-  * Simplified parameter attributes, and formatting.
-  * Updated error handling to use write-error and simplified handling.
-* Normalized repetative checks to their own `Test-X` functions and moved error\null handling inside.
-  * Test-KPConnection - Checks to see if connection exists and and is open.
-  * Test-KPPasswordValue - Correctly checks for supported types and moved error handling inside.
-* Fixed Dev Tool AutoVersioning Script, now updates psd1 version again.
-* Simplified `Import-KPLibrary` function.
-* Updated `ConvertTo-KPPSObject` to be construct PSObject differently and gained 86% speed performance improvement.
-* Created a `build.ps1` script to build the module for use and publishing to gallery
-* Updated `New-KPConnection` to prompt for user MasterKey (keepass passsword) via console prompt `Read-host` instead of `$Host.ui.PromptForCredential()`, this is much faster than loading the gui.
-
 ## Known Issues
 
 See the [Known-Issue](https://github.com/PSKeePass/PoShKeePass/issues?q=is%3Aissue+is%3Aopen+label%3AKnown-Issue) tag to get a list of known issues and their status.