IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix_API_return: first version

Browse Source
This commit is contained in:
SuhorukovAnton 2020-10-09 13:05:48 +03:00
parent 43a085eb18
commit 370400e4c0
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/services/ASC.Data.Backup/Controllers/BackupController.cs
View File

@ -204,7 +204,7 @@ namespace ASC.Data.Backup.Controllers
///<visible>false</visible>
[Read("backuptmp")]
public string GetTempPath()
public object GetTempPath()
{
if (CoreBaseSettings.Standalone)
{

8
products/ASC.Files/Server/Controllers/FilesController.cs
View File

@ -519,13 +519,13 @@ namespace ASC.Api.Documents
/// <category>Files</category>
/// <returns></returns>
[Create("file/{fileId}/startedit", DisableFormat = true)]
public string StartEdit(string fileId, bool editingAlone, string doc)
public object StartEdit(string fileId, bool editingAlone, string doc)
{
return FilesControllerHelperString.StartEdit(fileId, editingAlone, doc);
}
[Create("file/{fileId:int}/startedit")]
public string StartEdit(int fileId, bool editingAlone, string doc)
public object StartEdit(int fileId, bool editingAlone, string doc)
{
return FilesControllerHelperInt.StartEdit(fileId, editingAlone, doc);
}
@ -1264,13 +1264,13 @@ namespace ASC.Api.Documents
/// <category>Files</category>
/// <returns>Shared file link</returns>
[Update("{fileId}/sharedlink", DisableFormat = true)]
public string GenerateSharedLink(string fileId, FileShare share)
public object GenerateSharedLink(string fileId, FileShare share)
{
return FilesControllerHelperString.GenerateSharedLink(fileId, share);
}
[Update("{fileId:int}/sharedlink")]
public string GenerateSharedLink(int fileId, FileShare share)
public object GenerateSharedLink(int fileId, FileShare share)
{
return FilesControllerHelperInt.GenerateSharedLink(fileId, share);
}

6
products/ASC.People/Server/Controllers/PeopleController.cs
View File

@ -949,7 +949,7 @@ namespace ASC.Employee.Core.Controllers
[AllowAnonymous]
[Create("password", false)]
public string SendUserPassword(MemberModel memberModel)
public object SendUserPassword(MemberModel memberModel)
{
string error;
if (!string.IsNullOrEmpty(error = UserManagerWrapper.SendUserPassword(memberModel.Email)))
@ -1010,7 +1010,7 @@ namespace ASC.Employee.Core.Controllers
[Create("email", false)]
public string SendEmailChangeInstructions(UpdateMemberModel model)
public object SendEmailChangeInstructions(UpdateMemberModel model)
{
Guid.TryParse(model.UserId, out var userid);
@ -1237,7 +1237,7 @@ namespace ASC.Employee.Core.Controllers
[Update("self/delete")]
public string SendInstructionsToDelete()
public object SendInstructionsToDelete()
{
var user = UserManager.GetUsers(SecurityContext.CurrentAccount.ID);

6
web/ASC.Web.Api/Controllers/PortalController.cs
View File

@ -91,7 +91,7 @@ namespace ASC.Web.Api.Controllers
}
[Read("users/invite/{employeeType}")]
public string GeInviteLink(EmployeeType employeeType)
public object GeInviteLink(EmployeeType employeeType)
{
if (!WebItemSecurity.IsProductAdministrator(WebItemManager.PeopleProductID, AuthContext.CurrentAccount.ID))
{
@ -103,7 +103,7 @@ namespace ASC.Web.Api.Controllers
}
[Update("getshortenlink")]
public string GetShortenLink(string link)
public object GetShortenLink(string link)
{
try
{
@ -160,7 +160,7 @@ namespace ASC.Web.Api.Controllers
[Read("path")]
public string GetFullAbsolutePath(string virtualPath)
public object GetFullAbsolutePath(string virtualPath)
{
return CommonLinkUtility.GetFullAbsolutePath(virtualPath);
}

36
web/ASC.Web.Api/Controllers/SettingsController.cs
View File

@ -336,7 +336,7 @@ namespace ASC.Api.Settings
}
[Create("messagesettings")]
public ContentResult EnableAdminMessageSettings(AdminMessageSettingsModel model)
public object EnableAdminMessageSettings(AdminMessageSettingsModel model)
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
@ -344,12 +344,12 @@ namespace ASC.Api.Settings
MessageService.Send(MessageAction.AdministratorMessageSettingsUpdated);
return new ContentResult() { Content = Resource.SuccessfullySaveSettingsMessage };
return Resource.SuccessfullySaveSettingsMessage;
}
[AllowAnonymous]
[Create("sendadmmail")]
public ContentResult SendAdmMail(AdminMessageSettingsModel model)
public object SendAdmMail(AdminMessageSettingsModel model)
{
var studioAdminMessageSettings = SettingsManager.Load<StudioAdminMessageSettings>();
var enableAdmMess = studioAdminMessageSettings.Enable || TenantExtra.IsNotPaid();
@ -368,11 +368,11 @@ namespace ASC.Api.Settings
StudioNotifyService.SendMsgToAdminFromNotAuthUser(model.Email, model.Message);
MessageService.Send(MessageAction.ContactAdminMailSent);
return new ContentResult() { Content = Resource.AdminMessageSent };
return Resource.AdminMessageSent;
}
[Create("maildomainsettings")]
public ContentResult SaveMailDomainSettings(MailDomainSettingsModel model)
public object SaveMailDomainSettings(MailDomainSettingsModel model)
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
@ -382,7 +382,7 @@ namespace ASC.Api.Settings
foreach (var d in model.Domains.Select(domain => (domain ?? "").Trim().ToLower()))
{
if (!(!string.IsNullOrEmpty(d) && new Regex("^[a-z0-9]([a-z0-9-.]){1,98}[a-z0-9]$").IsMatch(d)))
return new ContentResult() { Content = Resource.ErrorNotCorrectTrustedDomain };
return Resource.ErrorNotCorrectTrustedDomain;
Tenant.TrustedDomains.Add(d);
}
@ -399,12 +399,12 @@ namespace ASC.Api.Settings
MessageService.Send(MessageAction.TrustedMailDomainSettingsUpdated);
return new ContentResult { Content = Resource.SuccessfullySaveSettingsMessage };
return Resource.SuccessfullySaveSettingsMessage;
}
[AllowAnonymous]
[Create("sendjoininvite")]
public ContentResult SendJoinInviteMail(AdminMessageSettingsModel model)
public object SendJoinInviteMail(AdminMessageSettingsModel model)
{
try
{
@ -445,7 +445,7 @@ namespace ASC.Api.Settings
{
StudioNotifyService.SendJoinMsg(email, emplType);
MessageService.Send(MessageInitiator.System, MessageAction.SentInviteInstructions, email);
return new ContentResult() { Content = Resource.FinishInviteJoinEmailMessage };
return Resource.FinishInviteJoinEmailMessage;
}
throw new Exception(Resource.ErrorEmailDomainNotAllowed);
@ -454,7 +454,7 @@ namespace ASC.Api.Settings
{
StudioNotifyService.SendJoinMsg(email, emplType);
MessageService.Send(MessageInitiator.System, MessageAction.SentInviteInstructions, email);
return new ContentResult() { Content = Resource.FinishInviteJoinEmailMessage };
return Resource.FinishInviteJoinEmailMessage ;
}
default:
throw new Exception(Resource.ErrorNotCorrectEmail);
@ -462,11 +462,11 @@ namespace ASC.Api.Settings
}
catch (FormatException)
{
return new ContentResult() { Content = Resource.ErrorNotCorrectEmail };
return Resource.ErrorNotCorrectEmail;
}
catch (Exception e)
{
return new ContentResult() { Content = e.Message.HtmlEncode() };
return e.Message.HtmlEncode();
}
}
@ -608,7 +608,7 @@ namespace ASC.Api.Settings
[Authorize(AuthenticationSchemes = "confirm", Roles = "Wizard")]
[Read("machine", Check = false)]
public string GetMachineName()
public object GetMachineName()
{
return Dns.GetHostName().ToLowerInvariant();
}
@ -892,7 +892,7 @@ namespace ASC.Api.Settings
}
[Read("logo")]
public string GetLogo()
public object GetLogo()
{
return TenantInfoSettingsHelper.GetAbsoluteCompanyLogoPath(SettingsManager.Load<TenantInfoSettings>());
}
@ -1073,7 +1073,7 @@ namespace ASC.Api.Settings
///<visible>false</visible>
[Read("whitelabel/logotext")]
public string GetWhiteLabelLogoText(WhiteLabelModel model)
public object GetWhiteLabelLogoText(WhiteLabelModel model)
{
if (!TenantLogoManager.WhiteLabelEnabled)
{
@ -1319,7 +1319,7 @@ namespace ASC.Api.Settings
}
[Update("tfaappnewapp")]
public string TfaAppNewApp(TfaModel model)
public object TfaAppNewApp(TfaModel model)
{
var isMe = model.Id.Equals(Guid.Empty);
var user = UserManager.GetUsers(isMe ? AuthContext.CurrentAccount.ID : model.Id);
@ -1372,7 +1372,7 @@ namespace ASC.Api.Settings
///<visible>false</visible>
[Update("timeandlanguage")]
public string TimaAndLanguage(SettingsModel model)
public object TimaAndLanguage(SettingsModel model)
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
@ -1469,7 +1469,7 @@ namespace ASC.Api.Settings
///<visible>false</visible>
[Update("defaultpage")]
public string SaveDefaultPageSettings(SettingsModel model)
public object SaveDefaultPageSettings(SettingsModel model)
{
PermissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);