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

Commit merge and fixed merging impact

Browse source
This commit is contained in:
robvde 2013-08-26 19:40:04 +04:00
commit 8bc4ebc9d9
31 changed files with 1422 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

95
WebsitePanel/Sources/WebsitePanel.Server.Client/OrganizationProxy.cs
View file

@ -87,6 +87,8 @@ namespace WebsitePanel.Providers.HostedSolution
private System.Threading.SendOrPostCallback AddUserToSecurityGroupOperationCompleted;
private System.Threading.SendOrPostCallback DeleteUserFromSecurityGroupOperationCompleted;
private System.Threading.SendOrPostCallback SetUserGeneralSettingsOperationCompleted;
private System.Threading.SendOrPostCallback SetUserPasswordOperationCompleted;
@ -142,6 +144,9 @@ namespace WebsitePanel.Providers.HostedSolution
/// <remarks/>
public event AddUserToSecurityGroupCompletedEventHandler AddUserToSecurityGroupCompleted;
/// <remarks/>
public event DeleteUserFromSecurityGroupCompletedEventHandler DeleteUserFromSecurityGroupCompleted;
/// <remarks/>
public event SetUserGeneralSettingsCompletedEventHandler SetUserGeneralSettingsCompleted;
@ -486,22 +491,20 @@ namespace WebsitePanel.Providers.HostedSolution
/// <remarks/>
[System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/CreateSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public int CreateSecurityGroup(string organizationId, string groupName, string managedBy)
public int CreateSecurityGroup(string organizationId, string groupName)
{
object[] results = this.Invoke("CreateSecurityGroup", new object[] {
organizationId,
groupName,
managedBy});
groupName});
return ((int)(results[0]));
}
/// <remarks/>
public System.IAsyncResult BeginCreateSecurityGroup(string organizationId, string groupName, string managedBy, System.AsyncCallback callback, object asyncState)
public System.IAsyncResult BeginCreateSecurityGroup(string organizationId, string groupName, System.AsyncCallback callback, object asyncState)
{
return this.BeginInvoke("CreateSecurityGroup", new object[] {
organizationId,
groupName,
managedBy}, callback, asyncState);
groupName}, callback, asyncState);
}
/// <remarks/>
@ -512,13 +515,13 @@ namespace WebsitePanel.Providers.HostedSolution
}
/// <remarks/>
public void CreateSecurityGroupAsync(string organizationId, string groupName, string managedBy)
public void CreateSecurityGroupAsync(string organizationId, string groupName)
{
this.CreateSecurityGroupAsync(organizationId, groupName, managedBy, null);
this.CreateSecurityGroupAsync(organizationId, groupName, null);
}
/// <remarks/>
public void CreateSecurityGroupAsync(string organizationId, string groupName, string managedBy, object userState)
public void CreateSecurityGroupAsync(string organizationId, string groupName, object userState)
{
if ((this.CreateSecurityGroupOperationCompleted == null))
{
@ -526,8 +529,7 @@ namespace WebsitePanel.Providers.HostedSolution
}
this.InvokeAsync("CreateSecurityGroup", new object[] {
organizationId,
groupName,
managedBy}, this.CreateSecurityGroupOperationCompleted, userState);
groupName}, this.CreateSecurityGroupOperationCompleted, userState);
}
private void OnCreateSecurityGroupOperationCompleted(object arg)
@ -646,23 +648,21 @@ namespace WebsitePanel.Providers.HostedSolution
/// <remarks/>
[System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetSecurityGroupGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string[] memberAccounts, string notes)
{
this.Invoke("SetSecurityGroupGeneralSettings", new object[] {
organizationId,
groupName,
managedBy,
memberAccounts,
notes});
}
/// <remarks/>
public System.IAsyncResult BeginSetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes, System.AsyncCallback callback, object asyncState)
public System.IAsyncResult BeginSetSecurityGroupGeneralSettings(string organizationId, string groupName, string[] memberAccounts, string notes, System.AsyncCallback callback, object asyncState)
{
return this.BeginInvoke("SetSecurityGroupGeneralSettings", new object[] {
organizationId,
groupName,
managedBy,
memberAccounts,
notes}, callback, asyncState);
}
@ -674,13 +674,13 @@ namespace WebsitePanel.Providers.HostedSolution
}
/// <remarks/>
public void SetSecurityGroupGeneralSettingsAsync(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
public void SetSecurityGroupGeneralSettingsAsync(string organizationId, string groupName, string[] memberAccounts, string notes)
{
this.SetSecurityGroupGeneralSettingsAsync(organizationId, groupName, managedBy, memberAccounts, notes, null);
this.SetSecurityGroupGeneralSettingsAsync(organizationId, groupName, memberAccounts, notes, null);
}
/// <remarks/>
public void SetSecurityGroupGeneralSettingsAsync(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes, object userState)
public void SetSecurityGroupGeneralSettingsAsync(string organizationId, string groupName, string[] memberAccounts, string notes, object userState)
{
if ((this.SetSecurityGroupGeneralSettingsOperationCompleted == null))
{
@ -689,7 +689,6 @@ namespace WebsitePanel.Providers.HostedSolution
this.InvokeAsync("SetSecurityGroupGeneralSettings", new object[] {
organizationId,
groupName,
managedBy,
memberAccounts,
notes}, this.SetSecurityGroupGeneralSettingsOperationCompleted, userState);
}
@ -757,6 +756,60 @@ namespace WebsitePanel.Providers.HostedSolution
}
}
/// <remarks/>
[System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/DeleteUserFromSecurityGroup", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public void DeleteUserFromSecurityGroup(string organizationId, string loginName, string groupName)
{
this.Invoke("DeleteUserFromSecurityGroup", new object[] {
organizationId,
loginName,
groupName});
}
/// <remarks/>
public System.IAsyncResult BeginDeleteUserFromSecurityGroup(string organizationId, string loginName, string groupName, System.AsyncCallback callback, object asyncState)
{
return this.BeginInvoke("DeleteUserFromSecurityGroup", new object[] {
organizationId,
loginName,
groupName}, callback, asyncState);
}
/// <remarks/>
public void EndDeleteUserFromSecurityGroup(System.IAsyncResult asyncResult)
{
this.EndInvoke(asyncResult);
}
/// <remarks/>
public void DeleteUserFromSecurityGroupAsync(string organizationId, string loginName, string groupName)
{
this.DeleteUserFromSecurityGroupAsync(organizationId, loginName, groupName, null);
}
/// <remarks/>
public void DeleteUserFromSecurityGroupAsync(string organizationId, string loginName, string groupName, object userState)
{
if ((this.DeleteUserFromSecurityGroupOperationCompleted == null))
{
this.DeleteUserFromSecurityGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteUserFromSecurityGroupOperationCompleted);
}
this.InvokeAsync("DeleteUserFromSecurityGroup", new object[] {
organizationId,
loginName,
groupName}, this.DeleteUserFromSecurityGroupOperationCompleted, userState);
}
private void OnDeleteUserFromSecurityGroupOperationCompleted(object arg)
{
if ((this.DeleteUserFromSecurityGroupCompleted != null))
{
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.DeleteUserFromSecurityGroupCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
/// <remarks/>
[System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/SetUserGeneralSettings", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@ -1568,6 +1621,10 @@ namespace WebsitePanel.Providers.HostedSolution
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
public delegate void AddUserToSecurityGroupCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
public delegate void DeleteUserFromSecurityGroupCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
public delegate void SetUserGeneralSettingsCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);