bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2026-01-03 17:13:16 +00:00
Code Issues Releases Wiki Activity

null checks

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-19 10:44:42 -04:00
parent b90a52e932
commit 1ced231e48
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Console/Program.cs
View File

@@ -821,7 +821,7 @@ namespace Bit.Console
if(result.Success)
{
WriteSuccessLine(string.Format("Syncing complete ({0} users, {1} groups).",
result.Users.Count, result.Groups.Count));
result.Users?.Count ?? 0, result.Groups?.Count ?? 0));
}
else
{
@@ -855,22 +855,30 @@ namespace Bit.Console
var result = await Sync.SyncAllAsync(force, false);
if(result.Success)
{
Con.WriteLine("Groups:");
foreach(var group in result.Groups)
if(result.Groups != null)
{
Con.WriteLine(" {0} - {1}", group.Name, group.ExternalId);
foreach(var user in group.UserMemberExternalIds)
Con.WriteLine("Groups:");
foreach(var group in result.Groups)
{
Con.WriteLine(" {0}", user);
Con.WriteLine(" {0} - {1}", group.Name, group.ExternalId);
foreach(var user in group.UserMemberExternalIds)
{
Con.WriteLine(" {0}", user);
}
}
}
Con.WriteLine();
Con.WriteLine("Users:");
foreach(var user in result.Users)
if(result.Users != null)
{
Con.WriteLine(" {0}{1}{2}", user.Email ?? user.ExternalId,
user.Disabled ? " (-)" : null, user.Deleted ? " (X)" : null);
Con.WriteLine();
Con.WriteLine("Users:");
foreach(var user in result.Users)
{
Con.WriteLine(" {0}{1}{2}", user.Email ?? user.ExternalId,
user.Disabled ? " (-)" : null, user.Deleted ? " (X)" : null);
}
}
}
else

4
src/Core/Models/ImportRequest.cs
View File

@@ -8,8 +8,8 @@ namespace Bit.Core.Models
{
public ImportRequest(List<GroupEntry> groups, List<UserEntry> users)
{
Groups = groups.Select(g => new Group(g)).ToArray();
Users = users.Select(u => new User(u)).ToArray();
Groups = groups?.Select(g => new Group(g)).ToArray() ?? new Group[] { };
Users = users?.Select(u => new User(u)).ToArray() ?? new User[] { };
}
public Group[] Groups { get; set; }

7
src/Core/Utilities/Sync.cs
View File

@@ -24,14 +24,17 @@ namespace Bit.Core.Utilities
var groups = entriesResult.Item1;
var users = entriesResult.Item2;
FlattenUsersToGroups(groups, null, groups);
if(groups?.Any() ?? false)
{
FlattenUsersToGroups(groups, null, groups);
}
if(!sendToServer)
{
RestoreDeltas(startingGroupDelta, startingUserDelta);
}
if(!sendToServer || (groups.Count == 0 && users.Count == 0))
if(!sendToServer || ((groups?.Count ?? 0) == 0 && (users?.Count ?? 0) == 0))
{
return new SyncResult
{

2
src/Service/Service.cs
View File

@@ -100,7 +100,7 @@ namespace Service
sw.Stop();
if(result.Success)
{
_eventLog.WriteEntry($"Synced {result.Groups.Count} groups, {result.Users.Count} users. " +
_eventLog.WriteEntry($"Synced {result.Groups?.Count ?? 0} groups, {result.Users?.Count ?? 0} users. " +
$"The sync took {(int)sw.Elapsed.TotalSeconds} seconds to complete.",
EventLogEntryType.SuccessAudit);
}