zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bugs

Browse source
This commit is contained in:
vfedosevich 2013-08-28 20:18:56 +03:00
parent 3fc3a425e0
commit 80d4843693
24 changed files with 2453 additions and 2295 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ADAttributes.cs
View file

@ -58,7 +58,7 @@ namespace WebsitePanel.Providers.HostedSolution
public const string UserPrincipalName = "UserPrincipalName";
public const string GroupType = "GroupType";
public const string Name = "Name";
public const string ExternalEmail = "mail";
public const string ExternalEmail = "mail";
public const string CustomAttribute2 = "extensionAttribute2";
public const string DistinguishedName = "distinguishedName";

22
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
View file

@ -44,21 +44,21 @@ namespace WebsitePanel.Providers.HostedSolution
return de;
}
public static string[] GetUsersGroup(string group)
public static string[] GetGroupObjects(string group, string objectType)
{
List<string> rets = new List<string>();
DirectorySearcher deSearch = new DirectorySearcher
{
Filter =
"(&(objectClass=user))"
"(&(objectClass=" + objectType + "))"
};
SearchResultCollection srcUsers = deSearch.FindAll();
SearchResultCollection srcObjects = deSearch.FindAll();
foreach (SearchResult srcUser in srcUsers)
foreach (SearchResult srcObject in srcObjects)
{
DirectoryEntry de = srcUser.GetDirectoryEntry();
DirectoryEntry de = srcObject.GetDirectoryEntry();
PropertyValueCollection props = de.Properties["memberOf"];
foreach (string str in props)
@ -371,20 +371,20 @@ namespace WebsitePanel.Providers.HostedSolution
newGroupObject.CommitChanges();
}
public static void AddUserToGroup(string userPath, string groupPath)
public static void AddObjectToGroup(string objectPath, string groupPath)
{
DirectoryEntry user = new DirectoryEntry(userPath);
DirectoryEntry obj = new DirectoryEntry(objectPath);
DirectoryEntry group = new DirectoryEntry(groupPath);
group.Invoke("Add", user.Path);
group.Invoke("Add", obj.Path);
}
public static void RemoveUserFromGroup(string userPath, string groupPath)
public static void RemoveObjectFromGroup(string obejctPath, string groupPath)
{
DirectoryEntry user = new DirectoryEntry(userPath);
DirectoryEntry obj = new DirectoryEntry(obejctPath);
DirectoryEntry group = new DirectoryEntry(groupPath);
group.Invoke("Remove", user.Path);
group.Invoke("Remove", obj.Path);
}
public static bool AdObjectExists(string path)

2
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
View file

@ -66,7 +66,7 @@ namespace WebsitePanel.Providers.HostedSolution
void SetUserPassword(string organizationId, string accountName, string password);
void SetUserPrincipalName(string organizationId, string accountName, string userPrincipalName);
bool OrganizationExists(string organizationId);
void DeleteOrganizationDomain(string organizationDistinguishedName, string domain);

2
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSecurityGroup.cs
View file

@ -19,7 +19,7 @@ namespace WebsitePanel.Providers.HostedSolution
set;
}
public OrganizationUser[] MembersAccounts
public ExchangeAccount[] MembersAccounts
{
get;
set;