Merge branch 'release/v3.0.0' into develop

config/appsettings.developer.json

@@ -5,7 +5,7 @@
     }
   },
   "web": {
-    "license-url": "https://help.onlyoffice.co/Products/Files/DocEditor.aspx?fileid=8516433&doc=U0U1QUs2VEtIVmtYclFTNzVXSWkxUEN6aVlWTzdOWFFsWGdibG80Mnhacz0_IntcImVudHJ5XCI6XCI4NTE2NDMzXCIsXCJsaW5rXCI6XCI5Y2ZiMWNkMS0wMmMxLTRlNmEtYThhOC1iNjFlYTk2ZTYzNDZcIn0i0"
+    "license-url": "https://help.onlyoffice.co/Products/Files/DocEditor.aspx?fileid=9318110&doc=S2RPck54RXJsd09QaTZiaFJvUWRwNjNaNE8rTE9LV3hnZmdoSm5Lcm94az0_IntcImVudHJ5XCI6XCI5MzE4MTEwXCIsXCJsaW5rXCI6XCJkOGVjZjdmMy1mY2E1LTQxZDYtYmM2Yi1kNDI4Mzk0YTNlMTdcIn0i0"
   },
   "license": {
     "type": "developer",

config/nginx/onlyoffice.conf

@@ -241,7 +241,17 @@ server {
 		location ~* /_next/public/images/(.*)$ {
 			try_files /images/$1 /index.html =404;
 		}
+
+		location ~*/_next/static/(chunks|css|media)/(.*)$ {
+			root /var/www/build/login/static;
+			try_files /$1/$2 @wrong_login_chunk;
+        }
     }
+
+	location @wrong_login_chunk {
+		proxy_pass http://127.0.0.1:5011;
+		proxy_redirect off;
+	}
 
 	location /confirm {
 

install/OneClickInstall/install-Debian/install-app.sh

@@ -11,25 +11,21 @@ cat<<EOF
 EOF
 apt-get -y update
 
+ds_pkg_name="${package_sysname}-documentserver"
+case "${INSTALLATION_TYPE}" in
+	"DEVELOPER") ds_pkg_name+="-de" ;;
+	"ENTERPRISE") ds_pkg_name+="-ee" ;;
+esac
+
 if [ "$UPDATE" = "true" ] && [ "$DOCUMENT_SERVER_INSTALLED" = "true" ]; then
 	ds_pkg_installed_name=$(dpkg -l | grep ${package_sysname}-documentserver | tail -n1 | awk '{print $2}');
-
-	ds_pkg_name="${package_sysname}-documentserver"
-	case "${INSTALLATION_TYPE}" in
-		"DEVELOPER") ds_pkg_name+="-de" ;;
-		"ENTERPRISE") ds_pkg_name+="-ee" ;;
-	esac
-
-	if [ -n $ds_pkg_name ]; then
-		if ! dpkg -l ${ds_pkg_name} &> /dev/null; then
-			debconf-get-selections | grep ^${ds_pkg_installed_name} | sed s/${ds_pkg_installed_name}/${ds_pkg_name}/g | debconf-set-selections
-			DEBIAN_FRONTEND=noninteractive apt-get purge -yq ${ds_pkg_installed_name}
-			apt-get install -yq ${ds_pkg_name}
-
-			RECONFIGURE_PRODUCT="true"
-		else
-			apt-get install -y --only-upgrade ${ds_pkg_name};	
-		fi				
+	if [ -n "${ds_pkg_installed_name}" ] && [ "${ds_pkg_installed_name}" != "${ds_pkg_name}" ]; then
+		debconf-get-selections | grep ^${ds_pkg_installed_name} | sed s/${ds_pkg_installed_name}/${ds_pkg_name}/g | debconf-set-selections
+		DEBIAN_FRONTEND=noninteractive apt-get purge -yq ${ds_pkg_installed_name}
+		apt-get install -yq ${ds_pkg_name}
+		RECONFIGURE_PRODUCT="true"
+	else
+		apt-get install -y --only-upgrade ${ds_pkg_name};	
 	fi
 fi
 
@@ -58,11 +54,7 @@ if [ "$DOCUMENT_SERVER_INSTALLED" = "false" ]; then
 	echo ${package_sysname}-documentserver $DS_COMMON_NAME/jwt-secret select ${DS_JWT_SECRET} | sudo debconf-set-selections
 	echo ${package_sysname}-documentserver $DS_COMMON_NAME/jwt-header select ${DS_JWT_HEADER} | sudo debconf-set-selections
 
-	if [ "$INSTALLATION_TYPE" = "COMMUNITY" ]; then
-		apt-get install -yq ${package_sysname}-documentserver
-	else
-		apt-get install -yq ${package_sysname}-documentserver-ee
-	fi
+	apt-get install -yq ${ds_pkg_name}
 fi
 
 if [ "$PRODUCT_INSTALLED" = "false" ]; then

install/OneClickInstall/install-Debian/install-preq.sh

@@ -57,9 +57,8 @@ if [[ "${DISTRIB_CODENAME}" =~ ^(focal|bullseye)$ ]]; then
 		echo "If you use the database only in the ONLYOFFICE configuration, then the update will be safe for you."
 		echo "Select 'Y' to install the new version of RabbitMQ. Select 'N' to abort the installation."
 		read -r -p "Please, enter Y or N: " CHOICE_INSTALLATION
-		if [ "${CHOICE_INSTALLATION}" =~ ^[Yy]$ ]]; then
-			rm -rf /var/lib/rabbitmq/mnesia/$(rabbitmqctl eval "node().")
-			apt-get remove -y rabbitmq-server erlang*
+		if [[ "${CHOICE_INSTALLATION,,}" =~ ^(y|yes)$ ]]; then
+			apt-get purge -y rabbitmq-server $(dpkg -l | awk '/erlang/ {print $2}')
 		else
 			rm -f /etc/apt/sources.list.d/rabbitmq.list
 			exit 1

install/OneClickInstall/install-Docker.sh

@@ -777,7 +777,7 @@ install_package () {
 }
 
 install_docker_compose () {
-	curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
+	curl -L "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/bin/docker-compose
 	chmod +x /usr/bin/docker-compose
 }
 

install/OneClickInstall/install-RedHat/install-app.sh

@@ -18,24 +18,19 @@ for SVC in $package_services; do
 		systemctl enable $SVC
 done
 
+ds_pkg_name="${package_sysname}-documentserver"
+case "${INSTALLATION_TYPE}" in
+	"DEVELOPER") ds_pkg_name+="-de" ;;
+	"ENTERPRISE") ds_pkg_name+="-ee" ;;
+esac
+
 if [ "$UPDATE" = "true" ] && [ "$DOCUMENT_SERVER_INSTALLED" = "true" ]; then
 	ds_pkg_installed_name=$(rpm -qa --qf '%{NAME}\n' | grep ${package_sysname}-documentserver);
-
-	ds_pkg_name="${package_sysname}-documentserver"
-	case "${INSTALLATION_TYPE}" in
-		"DEVELOPER") ds_pkg_name+="-de" ;;
-		"ENTERPRISE") ds_pkg_name+="-ee" ;;
-	esac
-
-	if [ -n $ds_pkg_name ]; then
-		if ! rpm -qi ${ds_pkg_name} &> /dev/null; then
-			${package_manager} -y remove ${ds_pkg_installed_name} --setopt=clean_requirements_on_remove=false
-
-			DOCUMENT_SERVER_INSTALLED="false"
-			RECONFIGURE_PRODUCT="true"
-		else
-			${package_manager} -y update ${ds_pkg_name}	
-		fi				
+	if [ -n "${ds_pkg_installed_name}" ] && [ "${ds_pkg_installed_name}" != "${ds_pkg_name}" ]; then
+		${package_manager} -y remove ${ds_pkg_installed_name} --setopt=clean_requirements_on_remove=false
+		DOCUMENT_SERVER_INSTALLED="false" RECONFIGURE_PRODUCT="true"
+	else
+		${package_manager} -y update ${ds_pkg_installed_name}
 	fi
 fi
 
@@ -98,11 +93,7 @@ if [ "$DOCUMENT_SERVER_INSTALLED" = "false" ]; then
 		su - postgres -s /bin/bash -c "psql -c \"CREATE DATABASE ${DS_DB_NAME} OWNER ${DS_DB_USER};\""
 	fi
 
-	if [ "$INSTALLATION_TYPE" = "COMMUNITY" ]; then	
-		${package_manager} -y install ${package_sysname}-documentserver
-	else
-		${package_manager} -y install ${package_sysname}-documentserver-ee
-	fi
+	${package_manager} -y install ${ds_pkg_name}
 
 expect << EOF
 	
@@ -125,7 +116,7 @@ expect << EOF
 	expect -re "Password"
 	send "\025$DS_DB_PWD\r"
 	
-	if { "${INSTALLATION_TYPE}" == "ENTERPRISE" } {
+	if { "${INSTALLATION_TYPE}" == "ENTERPRISE" || "${INSTALLATION_TYPE}" == "DEVELOPER" } {
 		expect "Configuring redis access..."
 		send "\025$DS_REDIS_HOST\r"
 	}
@@ -156,9 +147,8 @@ if [ "$PRODUCT_INSTALLED" = "false" ]; then
 elif [[ "${PRODUCT_CHECK_UPDATE}" -eq "${UPDATE_AVAILABLE_CODE}" || "${RECONFIGURE_PRODUCT}" = "true" ]]; then
 	ENVIRONMENT=$(grep -oP 'ENVIRONMENT=\K.*' /etc/${package_sysname}/${product}/systemd.env || grep -oP 'ENVIRONMENT=\K.*' /usr/lib/systemd/system/${product}-api.service)
 	CONNECTION_STRING=$(json -f /etc/${package_sysname}/${product}/appsettings.$ENVIRONMENT.json ConnectionStrings.default.connectionString)
-	${package_manager} -y update ${product}
+	${package_manager} -y update ${product} --allowerasing
 	${product}-configuration \
-		-e $ENVIRONMENT \
 		-mysqlh $(grep -oP 'Server=\K[^;]*' <<< "$CONNECTION_STRING") \
 		-mysqld $(grep -oP 'Database=\K[^;]*' <<< "$CONNECTION_STRING") \
 		-mysqlu $(grep -oP 'User ID=\K[^;]*' <<< "$CONNECTION_STRING") \

install/OneClickInstall/install-RedHat/install-preq.sh

@@ -35,7 +35,7 @@ fi
 #Add repositories: EPEL, REMI and RPMFUSION
 [ "$DIST" != "fedora" ] && { rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-$REV.noarch.rpm || true; }
 rpm -ivh https://rpms.remirepo.net/$REMI_DISTR_NAME/remi-release-$REV.rpm || true
-yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/$RPMFUSION_DISTR_NAME/rpmfusion-free-release-$REV.noarch.rpm
+yum install -y --nogpgcheck https://download1.rpmfusion.org/free/$RPMFUSION_DISTR_NAME/rpmfusion-free-release-$REV.noarch.rpm
 
 [ "$REV" = "9" ] && update-crypto-policies --set DEFAULT:SHA1 && ${package_manager} -y install xorg-x11-font-utils
 [ "$DIST" = "centos" ] && TESTING_REPO="--enablerepo=$( [ "$REV" = "9" ] && echo "crb" || echo "powertools" )"
@@ -52,7 +52,7 @@ curl -fsSL https://rpm.nodesource.com/setup_${NODE_VERSION}.x | sed '/update -y/
 #add mysql repo
 dnf remove -y @mysql && dnf module -y reset mysql && dnf module -y disable mysql
 MYSQL_REPO_VERSION="$(curl https://repo.mysql.com | grep -oP "mysql84-community-release-${MYSQL_DISTR_NAME}${REV}-\K.*" | grep -o '^[^.]*' | sort | tail -n1)"
-yum localinstall -y https://repo.mysql.com/mysql84-community-release-${MYSQL_DISTR_NAME}${REV}-${MYSQL_REPO_VERSION}.noarch.rpm || true
+yum install -y https://repo.mysql.com/mysql84-community-release-${MYSQL_DISTR_NAME}${REV}-${MYSQL_REPO_VERSION}.noarch.rpm || true
 
 if ! rpm -q mysql-community-server; then
 	MYSQL_FIRST_TIME_INSTALL="true";
@@ -91,16 +91,17 @@ ${package_manager} -y install $([ $DIST != "fedora" ] && echo "epel-release") \
 			python3 \
 			nodejs ${NODEJS_OPTION} \
 			dotnet-sdk-8.0 \
-			opensearch-${ELASTIC_VERSION} --enablerepo=opensearch-2.x \
+			opensearch-${ELASTIC_VERSION} \
 			mysql-community-server \
 			postgresql \
 			postgresql-server \
 			rabbitmq-server$rabbitmq_version \
-			redis --enablerepo=remi \
-			SDL2 $POWERTOOLS_REPO \
+			redis \
+			SDL2 \
 			expect \
 			java-${JAVA_VERSION}-openjdk-headless \
-			ffmpeg $TESTING_REPO
+			ffmpeg  \
+			--enablerepo=opensearch-2.x --enablerepo=remi $TESTING_REPO
 
 # Set Java ${JAVA_VERSION} as the default version
 JAVA_PATH=$(find /usr/lib/jvm/ -name "java" -path "*java-${JAVA_VERSION}*" | head -1)
@@ -126,3 +127,4 @@ fi
 semanage permissive -a httpd_t
 
 package_services="rabbitmq-server postgresql redis mysqld"
+rpm -q valkey &>/dev/null && package_services="${package_services//redis/valkey}" || true # https://fedoraproject.org/wiki/Changes/Replace_Redis_With_Valkey 

install/common/product-configuration

@@ -759,11 +759,7 @@ setup_redis() {
 	sed -i "s~\(redis_port =\).*~\1 $REDIS_PORT~" "${OPENRESTY_DIR}/conf.d/${PACKAGE_SYSNAME}.conf"
 
 	if [ $1 == "LOCAL_REDIS_SERVER" ]; then
-		if [ -f "/etc/redis/redis.conf" ]; then
-			REDIS_CONF="/etc/redis/redis.conf"
-		elif [ -f "/etc/redis.conf" ]; then
-			REDIS_CONF="/etc/redis.conf"
-		fi
+		REDIS_CONF=$(find /etc/redis/redis.conf /etc/redis.conf /etc/valkey/valkey.conf -type f 2>/dev/null | head -n 1)
 
 		sed "s_\(^bind\).*_\1 ${REDIS_HOST}_" -i ${REDIS_CONF}
 		sed -r "/^save\s[0-9]+/d" -i ${REDIS_CONF}
@@ -845,6 +841,7 @@ if command -v yum >/dev/null 2>&1; then
 	MYSQL_PACKAGE="mysqld"
 	REDIS_PACKAGE="redis"
 	SYSTEMD_DIR="/usr/lib/systemd/system"
+	${PACKAGE_MANAGER} valkey &>/dev/null && REDIS_PACKAGE="valkey" || true
 elif command -v apt >/dev/null 2>&1; then
 	DIST="Debian"
 	PACKAGE_MANAGER="dpkg -s"

install/common/product-ssl-setup

@@ -69,7 +69,7 @@ case $1 in
       systemctl daemon-reload
       { grep -l "ExecStart=/usr/bin/node" ${SYSTEMD_DIR}/${PRODUCT}-*.service 2>/dev/null
         find ${SYSTEMD_DIR} -name "ds-*.service" ! -name "ds-example.service" 2>/dev/null
-      } | xargs -0 -I % systemctl restart $(basename %)
+      } | xargs -I % basename % | xargs systemctl restart
     fi
 
     echo "OK"
@@ -138,15 +138,21 @@ if [ -f "${CERTIFICATE_FILE}" ]; then
 
       #Checking whether the certificate is self-signed
       if [[ -n "$CERTIFICATE_SUBJECT" && -n "$CERTIFICATE_ISSUER" && "$CERTIFICATE_SUBJECT" == "$CERTIFICATE_ISSUER" ]]; then
-        grep -q "NODE_EXTRA_CA_CERTS" ${CONFIG_DIR}/systemd.env || echo "NODE_EXTRA_CA_CERTS=${CERTIFICATE_FILE}" >> ${CONFIG_DIR}/systemd.env
+        chmod o+rx $(dirname "$CERTIFICATE_FILE")
+        chmod 644 ${CERTIFICATE_FILE} ${PRIVATEKEY_FILE}
+        grep -q "NODE_EXTRA_CA_CERTS" ${CONFIG_DIR}/systemd.env && \
+          sed -i "s!\(NODE_EXTRA_CA_CERTS=\).*!\1${CERTIFICATE_FILE}!" ${CONFIG_DIR}/systemd.env || \
+          echo "NODE_EXTRA_CA_CERTS=${CERTIFICATE_FILE}" >> ${CONFIG_DIR}/systemd.env
         for SYSTEMD_NODE_FILE in ${SYSTEMD_DIR}/ds-*.service; do
           [[ ${SYSTEMD_NODE_FILE} == *"ds-example"* || ! -f ${SYSTEMD_NODE_FILE} ]] && continue
-          grep -q "NODE_EXTRA_CA_CERTS" "${SYSTEMD_NODE_FILE}" || sed -i "/ExecStart=/i Environment=NODE_EXTRA_CA_CERTS=${CERTIFICATE_FILE}" "${SYSTEMD_NODE_FILE}"
+          grep -q "NODE_EXTRA_CA_CERTS" ${SYSTEMD_NODE_FILE} && \
+            sed -i "s!\(NODE_EXTRA_CA_CERTS=\).*!\1${CERTIFICATE_FILE}!" ${SYSTEMD_NODE_FILE} || \
+            sed -i "/ExecStart=/i Environment=NODE_EXTRA_CA_CERTS=${CERTIFICATE_FILE}" ${SYSTEMD_NODE_FILE}
         done
         systemctl daemon-reload
         { grep -l "ExecStart=/usr/bin/node" ${SYSTEMD_DIR}/${PRODUCT}-*.service 2>/dev/null
           find ${SYSTEMD_DIR} -name "ds-*.service" ! -name "ds-example.service" 2>/dev/null
-        } | xargs -0 -I % systemctl restart $(basename %)
+        } | xargs -I % basename % | xargs systemctl restart
       fi
     fi
 

install/deb/debian/rules

@@ -71,7 +71,7 @@ override_dh_auto_build: check_archives
 	-e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }"  -e "this.logLevel=\"warning\"" -e "this.core={ 'products': { 'folder': '/var/www/${PRODUCT}/products', 'subfolder': 'server'} }"
 
 	find ${BUILDTOOLS_PATH}/config/ -type f -regex '.*\.\(test\|dev\)\..*' -delete
-	json -I -f ${BUILDTOOLS_PATH}/config/appsettings.json -e "this.core.notify.postman=\"services\"" -e "this['debug-info'].enabled=\"false\"" -e "this.web.samesite=\"None\""
+	json -I -f ${BUILDTOOLS_PATH}/config/appsettings.json -e "this.core.notify.postman=\"services\"" -e "this['debug-info'].enabled=\"false\"" -e "this.web.samesite=\"None\"" -e "this.core.oidc.disableValidateToken=\"false\"" -e "this.core.oidc.showPII=\"false\""
 	json -I -f ${BUILDTOOLS_PATH}/config/apisystem.json -e "this.core.notify.postman=\"services\""
 	sed 's_\(minlevel=\)"[^"]*"_\1"Warn"_g' -i ${BUILDTOOLS_PATH}/config/nlog.config
 

install/docker/Dockerfile.app

@@ -179,6 +179,9 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/public ${
 COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/editor/.next/static/chunks ${BUILD_PATH}/build/doceditor/static/chunks
 COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/editor/.next/static/css ${BUILD_PATH}/build/doceditor/static/css
 COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/editor/.next/static/media ${BUILD_PATH}/build/doceditor/static/media
+COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/login/.next/static/chunks ${BUILD_PATH}/build/login/static/chunks
+COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/login/.next/static/css ${BUILD_PATH}/build/login/static/css
+COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/login/.next/static/media ${BUILD_PATH}/build/login/static/media
 COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/campaigns/src/campaigns ${BUILD_PATH}/public/campaigns
 COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/publish/web/management ${BUILD_PATH}/management
 COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/config/nginx/docker-entrypoint.d /docker-entrypoint.d

install/docker/docker-entrypoint.py

@@ -10,7 +10,7 @@
 
 PRODUCT = os.environ["PRODUCT"] if environ.get("PRODUCT") else "onlyoffice"
 BASE_DIR =  os.environ["BASE_DIR"] if environ.get("BASE_DIR") else  "/app/" + PRODUCT
-ENV_EXTENSION = os.environ.get("ENV_EXTENSION", os.environ.get("INSTALLATION_TYPE", "none")).lower()
+ENV_EXTENSION = (os.environ.get("ENV_EXTENSION") or os.environ.get("INSTALLATION_TYPE")).lower() or "none"
 PROXY_HOST = os.environ["PROXY_HOST"] if environ.get("PROXY_HOST") else "onlyoffice-proxy"
 SERVICE_PORT = os.environ["SERVICE_PORT"] if environ.get("SERVICE_PORT") else "5050"
 URLS = os.environ["URLS"] if environ.get("URLS") else "http://0.0.0.0:"
@@ -37,6 +37,7 @@
 LOG_LEVEL = os.environ["LOG_LEVEL"].lower() if environ.get("LOG_LEVEL") else None
 DEBUG_INFO = os.environ["DEBUG_INFO"] if environ.get("DEBUG_INFO") else "false"
 SAMESITE = os.environ["SAMESITE"] if environ.get("SAMESITE") else "None"
+DISABLE_VALIDATE_TOKEN = os.environ["DISABLE_VALIDATE_TOKEN"] if environ.get("DISABLE_VALIDATE_TOKEN") else "false"
 
 CERTIFICATE_PATH = os.environ.get("CERTIFICATE_PATH")
 CERTIFICATE_PARAM = "NODE_EXTRA_CA_CERTS=" + CERTIFICATE_PATH + " " if CERTIFICATE_PATH and os.path.exists(CERTIFICATE_PATH) else ""
@@ -172,6 +173,8 @@ def writeJsonFile(jsonFile, jsonData, indent=4):
 updateJsonData(jsonData,"$.files.docservice.url.internal", DOCUMENT_SERVER_CONNECTION_HOST)
 updateJsonData(jsonData,"$.files.docservice.secret.value", DOCUMENT_SERVER_JWT_SECRET)
 updateJsonData(jsonData,"$.files.docservice.secret.header", DOCUMENT_SERVER_JWT_HEADER)
+updateJsonData(jsonData,"$.core.oidc.disableValidateToken", DISABLE_VALIDATE_TOKEN)
+updateJsonData(jsonData,"$.core.oidc.showPII", DEBUG_INFO)
 updateJsonData(jsonData,"$.debug-info.enabled", DEBUG_INFO)
 updateJsonData(jsonData,"$.web.samesite", SAMESITE)
 

install/docker/docspace.yml

@@ -112,6 +112,9 @@ services:
     <<: *x-service-base
     image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-socket:${DOCKER_TAG}"
     container_name: ${SOCKET_HOST}
+    healthcheck:
+     <<: *x-healthcheck
+     test: curl --fail http://${SERVICE_SOCKET}/health/ || exit 1
     expose:
       - ${SERVICE_PORT}
 
@@ -151,6 +154,9 @@ services:
     <<: *x-service-base
     image: "${HUB}${REPO}/${DOCKER_IMAGE_PREFIX}-ssoauth:${DOCKER_TAG}"
     container_name: ${SSOAUTH_HOST}
+    healthcheck:
+     <<: *x-healthcheck
+     test: curl --fail http://${SERVICE_SSOAUTH}/health/ || exit 1
     expose:
       - ${SERVICE_PORT}
       - "9834"

install/rpm/SPECS/build.spec

@@ -18,7 +18,7 @@ if ! grep -q 'var/www/%{product}' config/nginx/*.conf; then find config/nginx/ -
 
 json -I -f config/appsettings.services.json -e "this.logPath=\"/var/log/onlyoffice/%{product}\"" -e "this.socket={ 'path': '../ASC.Socket.IO/' }" \
 -e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }" -e "this.logLevel=\"warning\""  -e "this.core={ 'products': { 'folder': '%{buildpath}/products', 'subfolder': 'server'} }"
-json -I -f config/appsettings.json -e "this.core.notify.postman=\"services\"" -e "this['debug-info'].enabled=\"false\"" -e "this.web.samesite=\"None\""
+json -I -f config/appsettings.json -e "this.core.notify.postman=\"services\"" -e "this['debug-info'].enabled=\"false\"" -e "this.web.samesite=\"None\"" -e "this.core.oidc.disableValidateToken=\"false\"" -e "this.core.oidc.showPII=\"false\"" 
 json -I -f config/apisystem.json -e "this.core.notify.postman=\"services\""
 json -I -f %{_builddir}/publish/web/public/scripts/config.json -e "this.wrongPortalNameUrl=\"\""