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

fix periodic and welcome notifications

Browse Source
This commit is contained in:
NikitaVashchuk 2023-04-26 20:47:06 +05:00
parent aaf7885f50
commit 30f001a4c0
7 changed files with 123 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
products/ASC.People/Server/Api/UserController.cs
View File

@ -889,6 +889,21 @@ public class UserController : PeopleControllerBase
u.ActivationStatus = activationstatus;
await _userManager.UpdateUserInfo(u);
if (activationstatus == EmployeeActivationStatus.Activated
&& u.IsOwner(_tenantManager.GetCurrentTenant()))
{
var settings = _settingsManager.Load<FisrtEmailConfirmSettings>();
if (settings.IsFirst)
{
_studioNotifyService.SendAdminWelcome(u);
settings.IsFirst = false;
_settingsManager.Save(settings);
}
}
yield return await _employeeFullDtoHelper.GetFull(u);
}
}

43
web/ASC.Web.Core/FisrtEmailConfirmSettings.cs Normal file
View File

@ -0,0 +1,43 @@
// (c) Copyright Ascensio System SIA 2010-2022
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// 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
namespace ASC.Web.Core;
public class FisrtEmailConfirmSettings : ISettings<FisrtEmailConfirmSettings>
{
public bool IsFirst { get; set; }
[JsonIgnore]
public Guid ID
{
get { return new Guid("{EE139F6C-8821-4011-8444-FD87882CD5F5}"); }
}
public FisrtEmailConfirmSettings GetDefault()
{
return new FisrtEmailConfirmSettings();
}
}

3
web/ASC.Web.Core/Notify/StudioNotifyService.cs
View File

@ -790,7 +790,8 @@ public class StudioNotifyService
var userId = u.Id;
var confirmationUrl = _commonLinkUtility.GetConfirmationEmailUrl(u.Email, ConfirmType.EmailActivation, null, userId);
confirmationUrl += "&first=true";
_settingsManager.Save(new FisrtEmailConfirmSettings() { IsFirst = true});
var greenButtonText = WebstudioNotifyPatternResource.ResourceManager.GetString("ButtonConfirmEmail", GetCulture(u));

6
web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs generated
View File

@ -65,11 +65,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_enterprise_whitelabel_user_welcome_custom_mode_v1 {
get {

8
web/ASC.Web.Core/PublicResources/CustomModeResource.resx
View File

@ -122,13 +122,13 @@
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton

48
web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs generated
View File

@ -878,11 +878,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_enterprise_guest_welcome_v1 {
get {
@ -912,11 +912,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_enterprise_user_welcome_v1 {
get {
@ -989,11 +989,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_enterprise_whitelabel_guest_welcome_v1 {
get {
@ -1023,11 +1023,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_enterprise_whitelabel_user_welcome_v1 {
get {
@ -1308,11 +1308,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_opensource_guest_welcome_v1 {
get {
@ -1357,11 +1357,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_opensource_user_welcome_v1 {
get {
@ -2011,11 +2011,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_saas_guest_welcome_v1 {
get {
@ -2140,11 +2140,11 @@ namespace ASC.Web.Core.PublicResources {
///
///Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to &quot;${__VirtualRootPath}&quot;:&quot;${__VirtualRootPath}&quot;. Now you can:
///
///*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
///
///*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
///
///*# Collaborate on documents* with two co-editing m [rest of string was truncated]&quot;;.
///* *Collaborate on documents* with two co-editing mo [rest of string was truncated]&quot;;.
/// </summary>
public static string pattern_saas_user_welcome_v1 {
get {

64
web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
View File

@ -349,13 +349,13 @@ You will get more tips on how to use your web-office. You can cancel the subscri
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -381,13 +381,13 @@ You will get more tips on how to use your web-office. You can cancel the subscri
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -537,13 +537,13 @@ You will get more tips on how to use your web-office. You can cancel the subscri
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -916,13 +916,13 @@ ONLYOFFICE Team
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -1528,13 +1528,13 @@ ONLYOFFICE Team
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -1549,13 +1549,13 @@ ONLYOFFICE Team
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -1570,13 +1570,13 @@ ONLYOFFICE Team
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton
@ -1619,13 +1619,13 @@ ONLYOFFICE Team
Welcome to ONLYOFFICE DocSpace! Your user profile has been successfully added to "${__VirtualRootPath}":"${__VirtualRootPath}". Now you can:
*# Work with other users in the room you are invited to*: collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
* Work with other users in the room you are invited to: *collaboration rooms for real-time co-authoring or custom rooms with flexible settings for any purpose*.
*# Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
* *Work with files of different formats*: text documents, spreadsheets, presentations, digital forms, PDFs, e-books, multimedia.
*# Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
* *Collaborate on documents* with two co-editing modes: real-time or paragraph-locking. Track changes, communicate in real-time using the built-in chat or making audio and video calls.
*# Connect any cloud storage* and work without switching between apps.
* *Connect any cloud storage* and work without switching between apps.
$GreenButton