bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-20 02:03:21 +00:00
Code Issues Releases Wiki Activity

dont ask all sync questions for azure

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-15 16:46:57 -04:00
parent 8e4a81ba8a
commit fb66336750
2 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/Console/Program.cs
View File

@@ -473,50 +473,54 @@ namespace Bit.Console
var parameters = ParseParameters(); var parameters = ParseParameters();
config.SyncGroups = parameters.ContainsKey("g"); config.SyncGroups = parameters.ContainsKey("g");
if(parameters.ContainsKey("gf")) config.SyncUsers = parameters.ContainsKey("u");
{
config.GroupFilter = parameters["gf"];
}
if(parameters.ContainsKey("gn"))
{
config.GroupNameAttribute = parameters["gn"];
}
config.SyncGroups = parameters.ContainsKey("u"); if(Core.Services.SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
if(parameters.ContainsKey("uf"))
{ {
config.UserFilter = parameters["uf"]; if(parameters.ContainsKey("gf"))
} {
if(parameters.ContainsKey("ue")) config.GroupFilter = parameters["gf"];
{ }
config.UserEmailAttribute = parameters["ue"]; if(parameters.ContainsKey("gn"))
} {
config.GroupNameAttribute = parameters["gn"];
}
if(parameters.ContainsKey("m")) if(parameters.ContainsKey("uf"))
{ {
config.MemberAttribute = parameters["m"]; config.UserFilter = parameters["uf"];
} }
if(parameters.ContainsKey("ue"))
{
config.UserEmailAttribute = parameters["ue"];
}
config.EmailPrefixSuffix = parameters.ContainsKey("ps"); if(parameters.ContainsKey("m"))
{
config.MemberAttribute = parameters["m"];
}
if(parameters.ContainsKey("ep")) config.EmailPrefixSuffix = parameters.ContainsKey("ps");
{
config.UserEmailPrefixAttribute = parameters["ep"];
}
if(parameters.ContainsKey("es")) if(parameters.ContainsKey("ep"))
{ {
config.UserEmailSuffix = parameters["es"]; config.UserEmailPrefixAttribute = parameters["ep"];
} }
if(parameters.ContainsKey("c")) if(parameters.ContainsKey("es"))
{ {
config.CreationDateAttribute = parameters["c"]; config.UserEmailSuffix = parameters["es"];
} }
if(parameters.ContainsKey("r")) if(parameters.ContainsKey("c"))
{ {
config.RevisionDateAttribute = parameters["r"]; config.CreationDateAttribute = parameters["c"];
}
if(parameters.ContainsKey("r"))
{
config.RevisionDateAttribute = parameters["r"];
}
} }
} }
else else
@@ -529,7 +533,8 @@ namespace Bit.Console
{ {
config.SyncGroups = input == "y" || input == "yes"; config.SyncGroups = input == "y" || input == "yes";
} }
if(config.SyncGroups) if(config.SyncGroups &&
Core.Services.SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
{ {
Con.Write("Group filter [{0}]: ", config.GroupFilter); Con.Write("Group filter [{0}]: ", config.GroupFilter);
input = Con.ReadLine(); input = Con.ReadLine();
@@ -550,7 +555,8 @@ namespace Bit.Console
{ {
config.SyncUsers = input == "y" || input == "yes"; config.SyncUsers = input == "y" || input == "yes";
} }
if(config.SyncUsers) if(config.SyncUsers &&
Core.Services.SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
{ {
Con.Write("User filter [{0}]: ", config.UserFilter); Con.Write("User filter [{0}]: ", config.UserFilter);
input = Con.ReadLine(); input = Con.ReadLine();
@@ -566,23 +572,26 @@ namespace Bit.Console
} }
} }
Con.Write("Member Of Attribute [{0}]: ", config.MemberAttribute); if(Core.Services.SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
input = Con.ReadLine();
if(!string.IsNullOrEmpty(input))
{ {
config.MemberAttribute = input; Con.Write("Member Of Attribute [{0}]: ", config.MemberAttribute);
} input = Con.ReadLine();
Con.Write("Creation Attribute [{0}]: ", config.CreationDateAttribute); if(!string.IsNullOrEmpty(input))
input = Con.ReadLine(); {
if(!string.IsNullOrEmpty(input)) config.MemberAttribute = input;
{ }
config.CreationDateAttribute = input; Con.Write("Creation Attribute [{0}]: ", config.CreationDateAttribute);
} input = Con.ReadLine();
Con.Write("Changed Attribute [{0}]: ", config.RevisionDateAttribute); if(!string.IsNullOrEmpty(input))
input = Con.ReadLine(); {
if(!string.IsNullOrEmpty(input)) config.CreationDateAttribute = input;
{ }
config.RevisionDateAttribute = input; Con.Write("Changed Attribute [{0}]: ", config.RevisionDateAttribute);
input = Con.ReadLine();
if(!string.IsNullOrEmpty(input))
{
config.RevisionDateAttribute = input;
}
} }
input = null; input = null;

7
src/Core/Models/SyncConfiguration.cs
View File

@@ -24,6 +24,13 @@ namespace Bit.Core.Models
UserEmailPrefixAttribute = "sAMAccountName"; UserEmailPrefixAttribute = "sAMAccountName";
break; break;
case DirectoryType.AzureActiveDirectory: case DirectoryType.AzureActiveDirectory:
GroupFilter = null;
UserFilter = null;
MemberAttribute = null;
GroupNameAttribute = null;
UserEmailAttribute = null;
UserEmailPrefixAttribute = null;
UserEmailSuffix = null;
break; break;
case DirectoryType.Other: case DirectoryType.Other:
break; break;