Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.6 beta02 #127

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Release 1.0.6 beta02 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e2dfc2
Make LoadV2 methos public
sk-keeper Sep 5, 2024
5ec727b
PowerCommander: Display enterprise role
sk-keeper Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Commander/Commander.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
<Compile Include="CommanderStorageProtection.cs" />
<Compile Include="enterprise\EnterpriseCommands.cs" />
<Compile Include="enterprise\QueuedTeamManagement.cs" />
<Compile Include="enterprise\RoleDataManagement.cs" />
<Compile Include="StorageUtils.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
6 changes: 3 additions & 3 deletions Commander/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Keeper Security Inc.")]
[assembly: AssemblyProduct(".NET Commander")]
[assembly: AssemblyCopyright("Copyright (c) 2023")]
[assembly: AssemblyCopyright("Copyright (c) 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1.3")]
[assembly: AssemblyFileVersion("1.0.1.3")]
[assembly: AssemblyVersion("1.0.1.5")]
[assembly: AssemblyFileVersion("1.0.1.5")]
27 changes: 12 additions & 15 deletions Commander/enterprise/EnterpriseCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal interface IEnterpriseContext
{
EnterpriseLoader Enterprise { get; }
EnterpriseData EnterpriseData { get; }
RoleDataManagement RoleManagement { get; }
RoleData RoleManagement { get; }
QueuedTeamDataManagement QueuedTeamManagement { get; }
UserAliasData UserAliasData { get; }

Expand Down Expand Up @@ -761,7 +761,7 @@ public static async Task ExtendAccountShareExpirationCommand(this IEnterpriseCon

private static string[] _privilegeNames = new string[] { "MANAGE_NODES", "MANAGE_USER", "MANAGE_ROLES", "MANAGE_TEAMS", "RUN_REPORTS", "MANAGE_BRIDGE", "APPROVE_DEVICE", "TRANSFER_ACCOUNT" };

public static async Task EnterpriseRoleCommand(this RoleDataManagement roleData, EnterpriseData enterpriseData, EnterpriseRoleOptions arguments)
public static async Task EnterpriseRoleCommand(this RoleData roleData, EnterpriseData enterpriseData, EnterpriseRoleOptions arguments)
{
if (arguments.Force)
{
Expand Down Expand Up @@ -928,7 +928,7 @@ public static async Task EnterpriseRoleCommand(this RoleDataManagement roleData,
nodeId = enterpriseData.RootNode.Id;
}

await roleData.CreateRole(arguments.Role, nodeId, arguments.VisibleBelow, arguments.NewUser);
await roleData.CreateRole(arguments.Role, nodeId, arguments.NewUser);
Console.WriteLine($"Role \"{arguments.Role}\" successfully added.");
return;
}
Expand Down Expand Up @@ -1028,7 +1028,7 @@ public static async Task EnterpriseRoleCommand(this RoleDataManagement roleData,

if (string.CompareOrdinal(arguments.Command, "delete") == 0)
{
await roleData.DeleteRole(role.Id);
await roleData.DeleteRole(role);
return;
}

Expand Down Expand Up @@ -1088,11 +1088,11 @@ public static async Task EnterpriseRoleCommand(this RoleDataManagement roleData,
Console.Write($"User: \"{user.Email}\" : ");
if (isAdd)
{
await roleData.AddUserToRole(role.Id, user.Id);
await roleData.AddUserToRole(role, user);
}
else
{
await roleData.RemoveUserFromRole(role.Id, user.Id);
await roleData.RemoveUserFromRole(role, user);
}
Console.WriteLine("Success");
}
Expand All @@ -1108,11 +1108,11 @@ public static async Task EnterpriseRoleCommand(this RoleDataManagement roleData,
Console.Write($"Team: \"{team.Name}\" : ");
if (isAdd)
{
await roleData.AddTeamToRole(role.Id, team.Uid);
await roleData.AddTeamToRole(role, team);
}
else
{
await roleData.RemoveTeamFromRole(role.Id, team.Uid);
await roleData.RemoveTeamFromRole(role, team);
}
Console.WriteLine("Success");
}
Expand Down Expand Up @@ -1850,7 +1850,7 @@ internal class McEnterpriseContext : StateCommands, IEnterpriseContext
public EnterpriseLoader Enterprise { get; }
public EnterpriseData EnterpriseData { get; }
public DeviceApprovalData DeviceApproval { get; }
public RoleDataManagement RoleManagement { get; }
public RoleData RoleManagement { get; }
public QueuedTeamDataManagement QueuedTeamManagement { get; }
public UserAliasData UserAliasData { get; }

Expand All @@ -1859,7 +1859,7 @@ public McEnterpriseContext(ManagedCompanyAuth auth)
if (auth.AuthContext.IsEnterpriseAdmin)
{
DeviceApproval = new DeviceApprovalData();
RoleManagement = new RoleDataManagement();
RoleManagement = new RoleData();
EnterpriseData = new EnterpriseData();
QueuedTeamManagement = new QueuedTeamDataManagement();
UserAliasData = new UserAliasData();
Expand Down Expand Up @@ -1896,7 +1896,7 @@ public partial class ConnectedContext : IEnterpriseContext
{
public EnterpriseLoader Enterprise { get; private set; }
public EnterpriseData EnterpriseData { get; private set; }
public RoleDataManagement RoleManagement { get; private set; }
public RoleData RoleManagement { get; private set; }
public QueuedTeamDataManagement QueuedTeamManagement { get; private set; }
public UserAliasData UserAliasData { get; internal set; }

Expand All @@ -1915,7 +1915,7 @@ private void CheckIfEnterpriseAdmin()
if (_auth.AuthContext.IsEnterpriseAdmin)
{
EnterpriseData = new EnterpriseData();
RoleManagement = new RoleDataManagement();
RoleManagement = new RoleData();
DeviceApproval = new DeviceApprovalData();
_managedCompanies = new ManagedCompanyData();
QueuedTeamManagement = new QueuedTeamDataManagement();
Expand Down Expand Up @@ -2308,9 +2308,6 @@ class EnterpriseRoleOptions : EnterpriseGenericOptions
[Option("node", Required = false, HelpText = "Node Name or ID. \"add\"")]
public string Node { get; set; }

[Option('b', "visible-below", Required = false, Default = true, HelpText = "Visible to all nodes in hierarchy below. \"add\"")]
public bool VisibleBelow { get; set; }

[Option('n', "new-user", Required = false, Default = false, HelpText = "New users automatically get this role assigned. \"add\"")]
public bool NewUser { get; set; }

Expand Down
120 changes: 0 additions & 120 deletions Commander/enterprise/RoleDataManagement.cs
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions KeeperSdk/KeeperSdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<LangVersion>7.1</LangVersion>
<Version>1.0.5</Version>
<Version>1.0.6-beta02</Version>
<Authors>Keeper Security Inc.</Authors>
<Product>.NET Keeper Sdk</Product>
<PackageTags>keeper password manager</PackageTags>
Expand All @@ -13,8 +13,8 @@
<RepositoryType>Github</RepositoryType>
<PackageProjectUrl>https://github.com/Keeper-Security/keeper-sdk-dotnet</PackageProjectUrl>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<AssemblyVersion>1.0.5.33</AssemblyVersion>
<FileVersion>1.0.5.33</FileVersion>
<AssemblyVersion>1.0.6.40</AssemblyVersion>
<FileVersion>1.0.6.40</FileVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<IncludeSymbols>true</IncludeSymbols>
Expand Down
6 changes: 3 additions & 3 deletions KeeperSdk/enterprise/EnterpriseTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,21 @@ public class AccountTransferResult
public interface IEnterpriseDataManagement
{
/// <summary>
/// Invides User to Enterprise.
/// Invites a User to Enterprise.
/// </summary>
/// <param name="email">User email</param>
/// <param name="options">Invided user options</param>
/// <returns>Invited User</returns>
Task<EnterpriseUser> InviteUser(string email, InviteUserOptions options = null);
/// <summary>
/// Locks or Unlocks Enterprise User.
/// Locks or Unlocks an Enterprise User.
/// </summary>
/// <param name="user">Enterprise User</param>
/// <param name="locked">Lock flag</param>
/// <returns>User</returns>
Task<EnterpriseUser> SetUserLocked(EnterpriseUser user, bool locked);
/// <summary>
/// Deletes Enterprise User.
/// Deletes an Enterprise User.
/// </summary>
/// <param name="user">Enterprise User</param>
/// <returns>Task</returns>
Expand Down
Loading
Loading