bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-20 10:13:23 +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

15
src/Console/Program.cs
View File

@@ -473,6 +473,10 @@ namespace Bit.Console
var parameters = ParseParameters(); var parameters = ParseParameters();
config.SyncGroups = parameters.ContainsKey("g"); config.SyncGroups = parameters.ContainsKey("g");
config.SyncUsers = parameters.ContainsKey("u");
if(Core.Services.SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
{
if(parameters.ContainsKey("gf")) if(parameters.ContainsKey("gf"))
{ {
config.GroupFilter = parameters["gf"]; config.GroupFilter = parameters["gf"];
@@ -482,7 +486,6 @@ namespace Bit.Console
config.GroupNameAttribute = parameters["gn"]; config.GroupNameAttribute = parameters["gn"];
} }
config.SyncGroups = parameters.ContainsKey("u");
if(parameters.ContainsKey("uf")) if(parameters.ContainsKey("uf"))
{ {
config.UserFilter = parameters["uf"]; config.UserFilter = parameters["uf"];
@@ -519,6 +522,7 @@ namespace Bit.Console
config.RevisionDateAttribute = parameters["r"]; config.RevisionDateAttribute = parameters["r"];
} }
} }
}
else else
{ {
string input; string input;
@@ -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,6 +572,8 @@ namespace Bit.Console
} }
} }
if(Core.Services.SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
{
Con.Write("Member Of Attribute [{0}]: ", config.MemberAttribute); Con.Write("Member Of Attribute [{0}]: ", config.MemberAttribute);
input = Con.ReadLine(); input = Con.ReadLine();
if(!string.IsNullOrEmpty(input)) if(!string.IsNullOrEmpty(input))
@@ -584,6 +592,7 @@ namespace Bit.Console
{ {
config.RevisionDateAttribute = 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;