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

Fixed: AD verification on existence of samAccountName when creating a user

Browse source 
object
This commit is contained in:
robvde 2013-01-19 09:40:27 +04:00
parent c48deb39b0
commit 53c40ab5eb
8 changed files with 172 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

24
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
View file

@ -1329,7 +1329,7 @@ namespace WebsitePanel.EnterpriseServer
Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
string upn = string.Format("{0}@{1}", name, domain);
string sAMAccountName = BuildAccountName(org.OrganizationId, name);
string sAMAccountName = BuildAccountName(org.OrganizationId, name, org.ServiceId);
TaskManager.Write("accountName :" + sAMAccountName);
TaskManager.Write("upn :" + upn);
@ -1454,21 +1454,21 @@ namespace WebsitePanel.EnterpriseServer
{
DataProvider.AddExchangeAccountEmailAddress(accountId, emailAddress);
}
private static string BuildAccountName(string orgId, string name)
private static string BuildAccountName(string orgId, string name, int ServiceId)
{
string accountName = name = name.Replace(" ", "");
string CounterStr = "00000";
int counter = 0;
bool bFound = false;
if (!AccountExists(accountName)) return accountName;
if (!AccountExists(accountName, ServiceId)) return accountName;
do
{
accountName = genSamLogin(name, CounterStr);
if (!AccountExists(accountName)) bFound = true;
if (!AccountExists(accountName, ServiceId)) bFound = true;
CounterStr = counter.ToString("d5");
counter++;
@ -1494,9 +1494,19 @@ namespace WebsitePanel.EnterpriseServer
}
private static bool AccountExists(string accountName)
private static bool AccountExists(string accountName, int ServiceId)
{
return DataProvider.ExchangeAccountExists(accountName);
if (!DataProvider.ExchangeAccountExists(accountName))
{
Organizations orgProxy = GetOrganizationProxy(ServiceId);
return orgProxy.DoesSamAccountNameExist(accountName);
}
else
return true;
}
public static int DeleteUser(int itemId, int accountId)