Powershell Commander: transfer-user in MC environment

Keeper-Security · Oct 15, 2024 · 05a7b6d · 05a7b6d
1 parent 6a7e86d
commit 05a7b6d
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 9 deletions.
diff --git a/PowerCommander/Enterprise.format.ps1xml b/PowerCommander/Enterprise.format.ps1xml
@@ -312,5 +312,69 @@
                 </ListEntries>
             </ListControl>
         </View>
+
+        <View>
+            <Name>KeeperSecurity.Enterprise.EnterpriseRole_TableView</Name>
+            <ViewSelectedBy>
+                <TypeName>KeeperSecurity.Enterprise.EnterpriseRole</TypeName>
+            </ViewSelectedBy>
+            <TableControl>
+                <TableHeaders>
+                    <TableColumnHeader />
+                    <TableColumnHeader />
+                    <TableColumnHeader />
+                    <TableColumnHeader />
+                </TableHeaders>
+                <TableRowEntries>
+                    <TableRowEntry>
+                        <Wrap />
+                        <TableColumnItems>
+                            <TableColumnItem>
+                                <PropertyName>Id</PropertyName>
+                            </TableColumnItem>
+                            <TableColumnItem>
+                                <PropertyName>DisplayName</PropertyName>
+                            </TableColumnItem>
+                            <TableColumnItem>
+                                <PropertyName>ParentNodeName</PropertyName>
+                            </TableColumnItem>
+                            <TableColumnItem>
+                                <PropertyName>NewUserInherit</PropertyName>
+                            </TableColumnItem>
+                        </TableColumnItems>
+                    </TableRowEntry>
+                </TableRowEntries>
+            </TableControl>
+        </View>
+        <View>
+            <Name>KeeperSecurity.Enterprise.EnterpriseRole_ListView</Name>
+            <ViewSelectedBy>
+                <TypeName>KeeperSecurity.Enterprise.EnterpriseRole</TypeName>
+            </ViewSelectedBy>
+            <ListControl>
+                <ListEntries>
+                    <ListEntry>
+                        <ListItems>
+                            <ListItem>
+                                <PropertyName>Id</PropertyName>
+                            </ListItem>
+                            <ListItem>
+                                <PropertyName>DisplayName</PropertyName>
+                            </ListItem>
+                            <ListItem>
+                                <PropertyName>ParentNodeId</PropertyName>
+                            </ListItem>
+                            <ListItem>
+                                <PropertyName>ParentNodeName</PropertyName>
+                            </ListItem>
+                            <ListItem>
+                                <PropertyName>NewUserInherit</PropertyName>
+                            </ListItem>
+                        </ListItems>
+                    </ListEntry>
+                </ListEntries>
+            </ListControl>
+        </View>
+
     </ViewDefinitions>
 </Configuration>
diff --git a/PowerCommander/Enterprise.ps1 b/PowerCommander/Enterprise.ps1
@@ -38,7 +38,7 @@ function getEnterprise {
                 $enterpriseMc.enterpriseData = New-Object KeeperSecurity.Enterprise.EnterpriseData
                 $enterpriseMc.roleData = New-Object KeeperSecurity.Enterprise.RoleData
 
-                [KeeperSecurity.Enterprise.EnterpriseDataPlugin[]] $plugins = $enterpriseMc.enterpriseData, $enterprise.roleData
+                [KeeperSecurity.Enterprise.EnterpriseDataPlugin[]] $plugins = $enterpriseMc.enterpriseData, $enterpriseMc.roleData
 
                 $enterpriseMc.loader = New-Object KeeperSecurity.Enterprise.EnterpriseLoader($authMc, $plugins)
                 $enterpriseMc.loader.Load().GetAwaiter().GetResult() | Out-Null
@@ -504,7 +504,7 @@ function resolveUser {
             return $u
         }
     }
-    Write-Output "`"${user}`" cannot be resolved as enterprise user"
+    Write-Error "`"${user}`" cannot be resolved as enterprise user" -ErrorAction Stop
 }
 
 function resolveSingleNode {
@@ -537,3 +537,14 @@ function Get-KeeperEnterpriseNode {
 }
 New-Alias -Name ken -Value Get-KeeperEnterpriseNode
 
+function Get-KeeperEnterpriseRole {
+    <#
+        .Synopsis
+    	Get a list of enterprise roles
+    #>
+    [CmdletBinding()]
+
+    [Enterprise]$enterprise = getEnterprise
+    return $enterprise.roleData.Roles
+}
+New-Alias -Name ker -Value Get-KeeperEnterpriseRole
diff --git a/PowerCommander/Enterprise.types.ps1xml b/PowerCommander/Enterprise.types.ps1xml
@@ -108,4 +108,16 @@
             </AliasProperty>
         </Members>
     </Type>
+    <Type>
+        <Name>KeeperSecurity.Enterprise.EnterpriseRole</Name>
+        <Members>
+            <ScriptProperty>
+                <Name>ParentNodeName</Name>
+                <GetScriptBlock>
+                    Get-KeeperNodeName $this.ParentNodeId
+                </GetScriptBlock>
+            </ScriptProperty>
+        </Members>
+    </Type>
+
 </Types>
diff --git a/PowerCommander/PowerCommander.psd1 b/PowerCommander/PowerCommander.psd1
@@ -11,7 +11,7 @@
     RootModule         = 'PowerCommander.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '0.9.14'
+    ModuleVersion      = '0.9.15'
 
     # Supported PSEditions
     CompatiblePSEditions = @('Desktop')
@@ -77,7 +77,7 @@
         'Get-KeeperSharedFolder', 'Add-KeeperFolder', 'Remove-KeeperFolder', 'Get-KeeperRecordType',
         'Get-KeeperEnterpriseUser', 'Get-KeeperEnterpriseTeam', 'Sync-KeeperEnterprise', 'Get-KeeperEnterpriseNode', 'Get-KeeperNodeName',
         'Add-KeeperEnterpriseUser', 'Lock-KeeperEnterpriseUser', 'Unlock-KeeperEnterpriseUser', 'Move-KeeperEnterpriseUser', 
-        'Remove-KeeperEnterpriseUser', 'New-KeeperEnterpriseNode',
+        'Remove-KeeperEnterpriseUser', 'New-KeeperEnterpriseNode', 'Get-KeeperEnterpriseRole',
         'Get-KeeperManagedCompany', 'New-KeeperManagedCompany', 'Remove-KeeperManagedCompany', 'Edit-KeeperManagedCompany', 'Get-MspBillingReport',
         'Switch-KeeperMC', 'Switch-KeeperMSP', 'Get-KeeperEnterpriseTeamUser', 'Get-KeeperInformation', 'Get-KeeperDeviceSettings',
         'Set-KeeperDeviceSettings',
@@ -97,7 +97,7 @@
 
     # Aliases to export from this module
     AliasesToExport    = @('kc', 'ks', 'kq', 'kpwd', 'kcd', 'kdir', 'ko', 'kr', 'ksf', 'kcc', '2fa', 'kadd', 'kdel', 'kmv', 'kmkdir', 'krmdir', 'krti',
-        'ked', 'keu', 'ken', 'ket', 'ketu', 'kmc', 'kamc', 'krmc', 'kemc', 'kena', 'msp-license', 'switch-to-mc', 'switch-to-msp',
+        'ked', 'keu', 'ken', 'ket', 'ker', 'ketu', 'kmc', 'kamc', 'krmc', 'kemc', 'kena', 'msp-license', 'switch-to-mc', 'switch-to-msp',
         'invite-user', 'lock-user', 'unlock-user', 'transfer-user', 'delete-user', 'kshrsh', 'kshr', 'kushr', 'kshf', 'kushf', 
         'kat', 'ktr', 'kotsr', 'kotsg', 'kotsn', 'kwhoami', 'this-device',
         'ksm', 'ksm-create', 'ksm-share', 'ksm-unshare', 'ksm-addclient', 'ksm-rmclient', 'kda')
@@ -115,7 +115,7 @@
             LicenseUri = 'https://github.com/Keeper-Security/keeper-sdk-dotnet/blob/master/LICENSE'
             ProjectUri = 'https://github.com/Keeper-Security/keeper-sdk-dotnet'
             IconUri  = 'https://keeper-email-images.s3.amazonaws.com/common/powershell.png'
-            ReleaseNotes = 'this-device and invite-user commands'
+            ReleaseNotes = 'Fix bug in `transfer-user` in MC environment.'
         }
     }
 

diff --git a/PowerCommander/PowerCommander.psm1 b/PowerCommander/PowerCommander.psm1
@@ -42,8 +42,8 @@ Export-ModuleMember -Alias kmkdir, krmdir
 Export-ModuleMember -Function Sync-KeeperEnterprise, Get-KeeperEnterpriseUser, Get-KeeperEnterpriseTeam,
 Get-KeeperEnterpriseNode, Get-KeeperNodeName, Add-KeeperEnterpriseUser, Lock-KeeperEnterpriseUser,
 Unlock-KeeperEnterpriseUser, Move-KeeperEnterpriseUser, Remove-KeeperEnterpriseUser,
-Get-KeeperEnterpriseTeamUser, New-KeeperEnterpriseNode
-Export-ModuleMember -Alias ked, keu, ket, ketu, ken, kena, invite-user, lock-user, unlock-user, transfer-user, delete-user
+Get-KeeperEnterpriseTeamUser, New-KeeperEnterpriseNode, Get-KeeperEnterpriseRole
+Export-ModuleMember -Alias ked, keu, ket, ketu, ken, ker, kena, invite-user, lock-user, unlock-user, transfer-user, delete-user
 
 Export-ModuleMember -Function Get-KeeperManagedCompany, New-KeeperManagedCompany, Remove-KeeperManagedCompany,
 Edit-KeeperManagedCompany, Get-MspBillingReport, Switch-KeeperMC, Switch-KeeperMSP

diff --git a/PowerCommander/README.md b/PowerCommander/README.md
@@ -64,6 +64,7 @@ To run the PowerCommander module from the source copy PowerCommander\ directory
 | Unlock-KeeperEnterpriseUser            | unlock-user | Unlock Enterprise User
 | Move-KeeperEnterpriseUser              |transfer-user| Transfer user account to another user
 | Remove-KeeperEnterpriseUser            | delete-user | Delete Enterprise User
+| Get-KeeperEnterpriseRole               | ker         | Enumerate all enterprise roles <sup style="color:red">(new)</sup>
 | Get-KeeperMspLicenses                  | msp-license | Return MSP licenses
 | Switch-KeeperMC                        |switch-to-mc | Switch to Managed Company <sup style="color:red">(new)</sup>
 | Switch-KeeperMSP                       |switch-to-msp| Switch back to MSP <sup style="color:red">(new)</sup>

diff --git a/PowerCommander/config.json b/PowerCommander/config.json