Merge pull request #11 from ONLYOFFICE/develop

Release/2.1.0

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.1.0
+## Added
+- sr-Cyrl-RS empty files
+
+## Changed
+- support DocSpace v2.6
+
 ## 2.0.0
 ## Added
 - downloading files in browser

Dockerfile

@@ -2,7 +2,9 @@ ARG REPO_BUID="mcr.microsoft.com/dotnet/sdk:8.0"
 ARG REPO_RUNTIME="mcr.microsoft.com/dotnet/aspnet:8.0"
 ARG REPO_ROUTER="nginx:latest"
 ARG COUNT_WORKER_CONNECTIONS=1024
+
 FROM $REPO_BUID AS build
+
 WORKDIR /app
 
 COPY . .
@@ -13,14 +15,15 @@ WORKDIR /app/server/ASC.ZoomService
 RUN dotnet publish --self-contained true -c Release -o out
 
 FROM $REPO_RUNTIME AS api
+
 LABEL vendor = "ONLYOFFICE" \
                 maintainer = scensio System SIA <[email protected]>
 WORKDIR /app/ASC.ZoomService
 COPY --from=build /app/server/ASC.ZoomService/out/. ./
 COPY --from=build /app/server/ASC.ZoomService/out/config/. /app/onlyoffice/config/
 
 ENTRYPOINT ["dotnet", "ASC.ZoomService.dll" ]
-CMD ["--pathToConf", "/app/onlyoffice/config/", "--Urls", "http://0.0.0.0:80"]
+CMD ["--pathToConf", "/app/onlyoffice/config/", "--Urls", "http://0.0.0.0:80", "--log:dir",  "/app/onlyoffice/log",   "--log:name",  "ASC.ZoomService"]
 
 FROM $REPO_ROUTER AS router
 LABEL vendor = "ONLYOFFICE" \

client/public/index.html

@@ -780,6 +780,7 @@
                     width: "100vw",
                     downloadToEvent: true,
                     //openLinkToEvent: true,
+                    startFilling: false,
                     events: {
                         onDownload: onDownloadHandle,
                         //onOpenLink: onExternalLinkHandle,

server/ASC.ZoomService/GlobalUsings.cs

@@ -46,7 +46,6 @@
 global using ASC.Core.Tenants;
 global using ASC.Core.Users;
 global using ASC.EventBus.Extensions.Logger;
-global using ASC.Feed.Context;
 global using ASC.MessagingSystem.EF.Context;
 global using ASC.Web.Core.Helpers;
 global using ASC.Web.Core.PublicResources;

server/ASC.ZoomService/Hubs/ZoomHub.cs

@@ -79,7 +79,7 @@ public override async Task OnDisconnectedAsync(Exception exception)
     public async Task<bool> CheckIfUser()
     {
         var userId = await _zoomAccountHelper.GetUserIdFromZoomUid(GetUidClaim());
-        return !userId.HasValue || _userManager.IsUser(userId.Value);
+        return !userId.HasValue || await _userManager.IsUserAsync(userId.Value);
     }
 
     public bool CheckCollaboration()

server/ASC.ZoomService/Program.cs

@@ -40,13 +40,13 @@
                      .AddEnvironmentVariables()
                      .AddCommandLine(args);
 
-var logger = LogManager.Setup()
-                            .SetupExtensions(s =>
-                            {
-                                s.RegisterLayoutRenderer("application-context", (logevent) => AppName);
-                            })
-                            .LoadConfiguration(builder.Configuration, builder.Environment)
-                            .GetLogger(typeof(Startup).Namespace);
+var loggerSetup = LogManager.Setup();
+loggerSetup.SetupExtensions(s =>
+    {
+        s.RegisterLayoutRenderer("application-context", (logevent) => AppName);
+    });
+loggerSetup.LoadConfiguration(builder.Configuration, builder.Environment);
+var logger = loggerSetup.GetLogger(typeof(Startup).Namespace);
 
 try
 {

server/ASC.ZoomService/Startup.cs

@@ -24,6 +24,7 @@
 // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
+using ASC.Api.Core.Extensions;
 using ASC.ApiSystem.Hubs;
 using ASC.Core.Common.Notify.Engine;
 using ASC.Core.Common.Quota;
@@ -35,7 +36,6 @@
 using ASC.Notify.Textile;
 using ASC.Web.Files;
 using ASC.Web.Studio.Core.Notify;
-using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Channels;
 
 namespace ASC.ZoomService;
@@ -74,7 +74,6 @@ public async Task ConfigureServices(IServiceCollection services)
         services.AddBaseDbContextPool<WebstudioDbContext>();
         services.AddBaseDbContextPool<InstanceRegistrationContext>();
         services.AddBaseDbContextPool<IntegrationEventLogContext>();
-        services.AddBaseDbContextPool<FeedDbContext>();
         services.AddBaseDbContextPool<MessagesContext>();
         services.AddBaseDbContextPool<WebhooksDbContext>();
         services.AddBaseDbContextPool<UrlShortenerDbContext>();
@@ -97,6 +96,7 @@ public async Task ConfigureServices(IServiceCollection services)
         services.AddSession();
 
         _diHelper.Configure(services);
+        _diHelper.Scan();
 
         Action<JsonOptions> jsonOptions = options =>
         {
@@ -113,34 +113,18 @@ public async Task ConfigureServices(IServiceCollection services)
 
         services.AddSingleton(jsonOptions);
 
-        _diHelper.AddControllers();
-        _diHelper.TryAdd<IpSecurityFilter>();
-        _diHelper.TryAdd<PaymentFilter>();
-        _diHelper.TryAdd<ProductSecurityFilter>();
-        _diHelper.TryAdd<TenantStatusFilter>();
-        _diHelper.TryAdd<ConfirmAuthHandler>();
-        _diHelper.TryAdd<BasicAuthHandler>();
-        _diHelper.TryAdd<CookieAuthHandler>();
-        _diHelper.TryAdd<WebhooksGlobalFilterAttribute>();
-
-        WorkContextExtension.Register(_diHelper);
-
         services.AddSingleton(Channel.CreateUnbounded<NotifyRequest>());
         services.AddSingleton(svc => svc.GetRequiredService<Channel<NotifyRequest>>().Reader);
         services.AddSingleton(svc => svc.GetRequiredService<Channel<NotifyRequest>>().Writer);
         services.AddHostedService<NotifySenderService>();
-        services.AddActivePassiveHostedService<NotifySchedulerService>(_diHelper, _configuration);
+        services.AddActivePassiveHostedService<NotifySchedulerService>(_configuration);
 
         services.AddSingleton(Channel.CreateUnbounded<SocketData>());
         services.AddSingleton(svc => svc.GetRequiredService<Channel<SocketData>>().Reader);
         services.AddSingleton(svc => svc.GetRequiredService<Channel<SocketData>>().Writer);
         services.AddHostedService<SocketService>();
 
         services.AddSingleton<NotifyConfiguration>();
-        _diHelper.TryAdd<FileHandlerService>();
-        _diHelper.TryAdd<ASC.Web.Studio.Core.Notify.NotifyTransferRequest>();
-        _diHelper.TryAdd<ASC.Web.Studio.Core.Notify.ProductSecurityInterceptor>();
-        _diHelper.TryAdd<TextileStyler>();
 
         if (!string.IsNullOrEmpty(_corsOrigin))
         {
@@ -168,8 +152,6 @@ public async Task ConfigureServices(IServiceCollection services)
 
         services.RegisterFeature();
 
-        _diHelper.TryAdd(typeof(IWebhookPublisher), typeof(WebhookPublisher));
-
         services.AddAutoMapper(BaseStartup.GetAutoMapperProfileAssemblies());
 
         if (!_hostEnvironment.IsDevelopment())