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

Settings: fix

Browse Source
This commit is contained in:
pavelbannov 2020-08-03 17:06:37 +03:00
parent 39b984debd
commit 178bf82c28
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/appsettings.json
View File

@ -97,6 +97,9 @@
"url-shortener": {
"value" : "/sh/",
"internal": "http://localhost:9999/"
},
"controlpanel": {
"url": ""
}
},
"ConnectionStrings": {

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

@ -535,14 +535,14 @@ namespace ASC.Api.Settings
}
[AllowAnonymous]
[Read("cultures")]
[Read("cultures", Check = false)]
public IEnumerable<object> GetSupportedCultures()
{
return SetupInfo.EnabledCultures.Select(r => r.Name).ToArray();
}
[Authorize(AuthenticationSchemes = "confirm", Roles = "Wizard,Administrators")]
[Read("timezones")]
[Read("timezones", Check = false)]
public List<TimezonesModel> GetTimeZones()
{
ApiContext.AuthByClaim();
@ -578,7 +578,7 @@ namespace ASC.Api.Settings
}
[Authorize(AuthenticationSchemes = "confirm", Roles = "Wizard")]
[Read("machine")]
[Read("machine", Check = false)]
public string GetMachineName()
{
return Dns.GetHostName().ToLowerInvariant();
@ -1063,7 +1063,7 @@ namespace ASC.Api.Settings
return StudioPeriodicNotify.ChangeSubscription(AuthContext.CurrentAccount.ID, StudioNotifyHelper);
}
[Update("wizard/complete")]
[Update("wizard/complete", Check = false)]
[Authorize(AuthenticationSchemes = "confirm", Roles = "Wizard")]
public WizardSettings CompleteWizard(WizardModel wizardModel)
{
@ -1361,14 +1361,14 @@ namespace ASC.Api.Settings
}
[AllowAnonymous]
[Read("license/required")]
[Read("license/required", Check = false)]
public bool RequestLicense()
{
return FirstTimeTenantSettings.RequestLicense;
}
[Create("license")]
[Create("license", Check = false)]
[Authorize(AuthenticationSchemes = "confirm", Roles = "Wizard")]
public object UploadLicense(UploadLicenseModel model)
{

2
web/ASC.Web.Core/SetupInfo.cs
View File

@ -178,7 +178,7 @@ namespace ASC.Web.Studio.Core
DisplayPersonalBanners = GetAppSettings("web.display.personal.banners", false);
ShareTwitterUrl = GetAppSettings("web.share.twitter", "https://twitter.com/intent/tweet?text={0}");
ShareFacebookUrl = GetAppSettings("web.share.facebook", "");
ControlPanelUrl = GetAppSettings("web.controlpanel.url", "");
ControlPanelUrl = GetAppSettings("web:controlpanel:url", "");
FontOpenSansUrl = GetAppSettings("web.font.opensans.url", "");
VoipEnabled = GetAppSettings("voip.enabled", "false");
StartProductList = GetAppSettings("web.start.product.list", "");