Merge branch 'develop' into feature/mobile-main-button

README.md

@@ -2,7 +2,7 @@
 Platform for building your own scalable online office with ONLYOFFICE modules
 
 ## Overview
-App Server is a platform for building your own online office by connecting ONLYOFFICE modules packed as separate apps.
+App Server is a platform for building your own online office by connecting ONLYOFFICE modules packaged as separate apps.
 
 ## How to install
 [coming soon]
@@ -35,4 +35,4 @@ Components source code - [https://github.com/ONLYOFFICE/AppComponents](https://g
 
 ## User feedback and support
 
-If you have any problems or question about App Server, use the issues section here, in this repository.
+If you have any problems or questions about App Server, use the issues section here, in this repository.

build/build.frontend.bat

@@ -1,4 +1,6 @@
 PUSHD %~dp0..
 
 REM call yarn wipe
-call yarn install
+call yarn install
+
+POPD

build/buildAndDeploy.bat

@@ -6,6 +6,7 @@ echo "##########################################################"
 
 echo.
 
+PUSHD %~dp0
 setlocal EnableDelayedExpansion
 
 call runasadmin.bat "%~dpnx0"

build/install/common/systemd/build.sh

@@ -36,7 +36,7 @@ BASE_DIR="/var/www/${PRODUCT}"
 PATH_TO_CONF="/etc/onlyoffice/${PRODUCT}"
 STORAGE_ROOT="${PATH_TO_CONF}/data"
 LOG_DIR="/var/log/onlyoffice/${PRODUCT}"
-DOTNET_RUN="/usr/bin/dotnet"
+DOTNET_RUN="/usr/share/dotnet/dotnet"
 APP_URLS="http://0.0.0.0"
 ENVIRONMENT=" --ENVIRONMENT=production"
 

build/install/docker/Dockerfile.app

@@ -201,7 +201,7 @@ WORKDIR ${BUILD_PATH}/products/ASC.Files/service/
 COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
 COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.Service/service/ .
 
-CMD ["ASC.Files.Service.dll", "ASC.Files.Service", "core:products:folder=/var/www/products/", "core:products:subfolder=server"]
+CMD ["ASC.Files.Service.dll", "ASC.Files.Service", "core:products:folder=/var/www/products/", "core:products:subfolder=server", "disable_elastic=true"]
 
 ## ASC.Mail ##
 FROM builder AS mail

build/install/docker/docker-entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+PARAMETERS=${PARAMETERS:-""}
 # read parameters
 if [ -n "$1" ]; then
 	DOTNET_RUN="${1}";
@@ -22,7 +22,6 @@ echo "#-------------------------------------#"
 
 PRODUCT=${PRODUCT:-"onlyoffice"}
 BASE_DIR="/app/${PRODUCT}"
-PARAMETERS=""
 PROXY_HOST=${PROXY_HOST:-"proxy"}
 SHEME=${SHEME:-"http"}
 SERVICE_PORT=${SERVICE_PORT:-"5050"}

build/install/docker/hooks/push

@@ -1,3 +1,18 @@
 #!/bin/bash
 export DOCKER_TAG=$DOCKER_TAG
+BASE_NAME="appserver"
+BUILD_NUMBER="$(date "+%Y%m%d%H")"
+docker-compose -f build.yml push
+
+# Get docker images name to array
+arrayImagesName=($(docker image ls | grep "$DOCKER_TAG" | grep "$STATUS" | grep "$BASE_NAME" | awk '{print $1}' ))
+
+# Modify docker image tag
+for i in ${!arrayImagesName[@]}; do
+    echo " Modify ${arrayImagesName[$i]}:$DOCKER_TAG "
+    docker image tag ${arrayImagesName[$i]}:$DOCKER_TAG ${arrayImagesName[$i]}:$DOCKER_TAG-$BUILD_NUMBER
+done
+
+# Push the same images with a new tag
+DOCKER_TAG=$DOCKER_TAG-$BUILD_NUMBER
 docker-compose -f build.yml push

common/ASC.Core.Common/Billing/TariffService.cs

@@ -330,7 +330,7 @@ public IEnumerable<PaymentInfo> GetPayments(int tenantId)
                 if (BillingClient.Configured)
                 {
                     try
-{
+                    {
                         var quotas = QuotaService.GetTenantQuotas();
                         var client = GetBillingClient();
                         foreach (var pi in client.GetPayments(GetPortalId(tenantId)))
@@ -483,7 +483,7 @@ private Tariff GetBillingInfo(int tenant)
             var r = CoreDbContext.Tariffs
                 .Where(r => r.Tenant == tenant)
                 .OrderByDescending(r => r.Id)
-                .SingleOrDefault();
+                .FirstOrDefault();
 
             if (r == null) return Tariff.CreateDefault();
 

common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs

@@ -49,7 +49,7 @@ public OAuth20TokenHelper(IHttpContextAccessor httpContextAccessor, ConsumerFact
             ConsumerFactory = consumerFactory;
         }
 
-        public string RequestCode<T>(string scope = null, Dictionary<string, string> additionalArgs = null) where T : Consumer, IOAuthProvider, new()
+        public string RequestCode<T>(string scope = null, IDictionary<string, string> additionalArgs = null, IDictionary<string, string> additionalStateArgs = null) where T : Consumer, IOAuthProvider, new()
         {
             var loginProvider = ConsumerFactory.Get<T>();
             var requestUrl = loginProvider.CodeUrl;
@@ -67,7 +67,20 @@ public OAuth20TokenHelper(IHttpContextAccessor httpContextAccessor, ConsumerFact
             if (!string.IsNullOrEmpty(scope)) query += $"&scope={HttpUtility.UrlEncode(scope)}";
 
             var u = HttpContextAccessor.HttpContext.Request.GetUrlRewriter();
-            var state = HttpUtility.UrlEncode(new UriBuilder(u.Scheme, u.Host, u.Port, $"thirdparty/{loginProvider.Name.ToLower()}/code").Uri.AbsoluteUri);
+
+            var stateUriBuilder = new UriBuilder(u.Scheme, u.Host, u.Port, $"thirdparty/{loginProvider.Name.ToLower()}/code");
+
+            if (additionalStateArgs != null && additionalStateArgs.Any())
+            {
+                var stateQuery = "";
+                stateQuery = additionalStateArgs.Keys
+                    .Where(a => a != null)
+                    .Aggregate(stateQuery, (current, a) => a != null ? $"{current}&{a.Trim()}={additionalStateArgs[a] ?? "".Trim()}" : null);
+
+                stateUriBuilder.Query = stateQuery.Substring(1);
+            }
+
+            var state = HttpUtility.UrlEncode(stateUriBuilder.Uri.AbsoluteUri);
             query += $"&state={state}";
 
             if (additionalArgs != null)

common/ASC.FederatedLogin/Login.cs

@@ -26,6 +26,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
@@ -104,10 +105,22 @@ public async Task Invoke(HttpContext context)
             {
                 try
                 {
-                    var profile = ProviderManager.Process(Auth, context, _params);
+                    var desktop = _params.ContainsKey("desktop") && _params["desktop"] == "true";
+                    IDictionary<string, string> additionalStateArgs = null;
+
+                    if (desktop)
+                    {
+                        additionalStateArgs = context.Request.Query.ToDictionary(r => r.Key, r => r.Value.FirstOrDefault());
+                        if (!additionalStateArgs.ContainsKey("desktop"))
+                        {
+                            additionalStateArgs.Add("desktop", "true");
+                        }
+                    }
+
+                    var profile = ProviderManager.Process(Auth, context, null, additionalStateArgs);
                     if (profile != null)
                     {
-                        await SendClientData(context, profile);
+                        await SendJsCallback(context, profile);
                     }
                 }
                 catch (ThreadAbortException)
@@ -116,7 +129,7 @@ public async Task Invoke(HttpContext context)
                 }
                 catch (Exception ex)
                 {
-                    await SendClientData(context, LoginProfile.FromError(Signature, InstanceCrypto, ex));
+                    await SendJsCallback(context, LoginProfile.FromError(Signature, InstanceCrypto, ex));
                 }
             }
             else
@@ -179,48 +192,16 @@ public bool IsReusable
             get { return false; }
         }
 
-        private async Task SendClientData(HttpContext context, LoginProfile profile)
-        {
-            switch (Mode)
-            {
-                case LoginMode.Redirect:
-                    await RedirectToReturnUrl(context, profile);
-                    break;
-                case LoginMode.Popup:
-                    await SendJsCallback(context, profile);
-                    break;
-            }
-        }
-
         private async Task SendJsCallback(HttpContext context, LoginProfile profile)
         {
             //Render a page
             context.Response.ContentType = "text/html";
-            await context.Response.WriteAsync(JsCallbackHelper.GetCallbackPage().Replace("%PROFILE%", profile.ToJson()).Replace("%CALLBACK%", Callback));
-        }
-
-        private async Task RedirectToReturnUrl(HttpContext context, LoginProfile profile)
-        {
-            var useMinimalProfile = Minimal;
-            if (useMinimalProfile)
-                profile = profile.GetMinimalProfile(); //Only id and provider
-
-            if (context.Session != null && !useMinimalProfile)
-            {
-                //Store in session
-                context.Response.Redirect(new Uri(ReturnUrl, UriKind.Absolute).AddProfileSession(profile, context).ToString(), true);
-            }
-            else if (MemoryCache != null && !useMinimalProfile)
-            {
-                context.Response.Redirect(new Uri(ReturnUrl, UriKind.Absolute).AddProfileCache(profile, MemoryCache).ToString(), true);
-            }
-            else
-            {
-                context.Response.Redirect(new Uri(ReturnUrl, UriKind.Absolute).AddProfile(profile).ToString(), true);
-            }
-
-            await context.Response.CompleteAsync();
-            return;
+            await context.Response.WriteAsync(
+                JsCallbackHelper.GetCallbackPage()
+                .Replace("%PROFILE%", $"\"{profile.Serialized}\"")
+                .Replace("%CALLBACK%", Callback)
+                .Replace("%DESKTOP%", (Mode == LoginMode.Redirect).ToString().ToLowerInvariant())
+                );
         }
     }
 

common/ASC.FederatedLogin/LoginProviders/BaseLoginProvider.cs

@@ -113,11 +113,11 @@ protected BaseLoginProvider(
             InstanceCrypto = instanceCrypto;
         }
 
-        public virtual LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params)
+        public virtual LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
             try
             {
-                var token = Auth(context, Scopes, out var redirect);
+                var token = Auth(context, Scopes, out var redirect, @params, additionalStateArgs);
 
                 if (redirect)
                 {
@@ -136,7 +136,7 @@ public virtual LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary
             }
         }
 
-        protected virtual OAuth20Token Auth(HttpContext context, string scopes, out bool redirect, Dictionary<string, string> additionalArgs = null)
+        protected virtual OAuth20Token Auth(HttpContext context, string scopes, out bool redirect, IDictionary<string, string> additionalArgs = null, IDictionary<string, string> additionalStateArgs = null)
         {
             var error = context.Request.Query["error"];
             if (!string.IsNullOrEmpty(error))
@@ -151,7 +151,7 @@ protected virtual OAuth20Token Auth(HttpContext context, string scopes, out bool
             var code = context.Request.Query["code"];
             if (string.IsNullOrEmpty(code))
             {
-                context.Response.Redirect(OAuth20TokenHelper.RequestCode<T>(scopes, additionalArgs));
+                context.Response.Redirect(OAuth20TokenHelper.RequestCode<T>(scopes, additionalArgs, additionalStateArgs));
                 redirect = true;
                 return null;
             }

common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs

@@ -114,7 +114,7 @@ public GosUslugiLoginProvider(
         }
 
 
-        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params)
+        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
             try
             {
@@ -142,7 +142,7 @@ public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionar
             }
         }
 
-        protected override OAuth20Token Auth(HttpContext context, string scopes, out bool redirect, Dictionary<string, string> additionalArgs = null)
+        protected override OAuth20Token Auth(HttpContext context, string scopes, out bool redirect, IDictionary<string, string> additionalArgs = null, IDictionary<string, string> additionalStateArgs = null)
         {
             var error = context.Request.Query["error"];
             if (!string.IsNullOrEmpty(error))

common/ASC.FederatedLogin/LoginProviders/ILoginProvider.cs

@@ -34,7 +34,7 @@ namespace ASC.FederatedLogin.LoginProviders
 {
     public interface ILoginProvider : IOAuthProvider
     {
-        LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params);
+        LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs);
 
         LoginProfile GetLoginProfile(string accessToken);
     }

common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs

@@ -97,7 +97,7 @@ public MailRuLoginProvider(
         {
         }
 
-        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params)
+        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
             try
             {

common/ASC.FederatedLogin/LoginProviders/OpenIdLoginProvider.cs

@@ -53,7 +53,7 @@ public OpenIdLoginProvider(Signature signature, InstanceCrypto instanceCrypto, C
             ConsumerFactory = consumerFactory;
         }
 
-        public LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params)
+        public LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
             var response = Openid.GetResponse();
             if (response == null)

common/ASC.FederatedLogin/LoginProviders/ProviderManager.cs

@@ -71,9 +71,9 @@ public ILoginProvider GetLoginProvider(string providerType)
                 : ConsumerFactory.GetByKey(providerType) as ILoginProvider;
         }
 
-        public LoginProfile Process(string providerType, HttpContext context, IDictionary<string, string> @params)
+        public LoginProfile Process(string providerType, HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
-            return GetLoginProvider(providerType).ProcessAuthoriztion(context, @params);
+            return GetLoginProvider(providerType).ProcessAuthoriztion(context, @params, additionalStateArgs);
         }
 
         public LoginProfile GetLoginProfile(string providerType, string accessToken)

common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs

@@ -102,7 +102,7 @@ public VKLoginProvider(
         }
 
 
-        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params)
+        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
             try
             {
@@ -111,7 +111,7 @@ public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionar
                                           {
                                                               { "revoke", "1" }
                                           }
-                                      : null);
+                                      : null, additionalStateArgs);
 
                 if (redirect)
                 {

common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs

@@ -94,7 +94,7 @@ public YandexLoginProvider(
         {
         }
 
-        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params)
+        public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs = null)
         {
             try
             {
@@ -103,7 +103,7 @@ public override LoginProfile ProcessAuthoriztion(HttpContext context, IDictionar
                                                           {
                                                               { "force_confirm", "true" }
                                                           }
-                                                      : null);
+                                                      : null, additionalStateArgs);
                 if (redirect)
                 {
                     return null;

common/ASC.FederatedLogin/callback.htm

@@ -2,12 +2,17 @@
 <html>
 <head>
     <script language="javascript" type="text/javascript">
-        try {
-            window.opener.%CALLBACK%(%PROFILE%);
+        if (%DESKTOP%) {
+			localStorage.setItem("profile", %PROFILE%);
+			window.location.href = "/";
+        } else {
+            try {
+                window.opener.%CALLBACK%(%PROFILE%);
+            }
+            catch (ex) {
+            }
+            window.close();
         }
-        catch (ex) {
-        }
-        window.close();
     </script>
 </head>
 <body></body>