From 33e766c334b5dda78b17648177f10035ea35d492 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Tue, 8 Nov 2022 12:33:11 +0500 Subject: [PATCH 1/5] Web:Client:ActiveSessions: bugfix --- packages/client/src/pages/Profile/Section/Footer/index.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/client/src/pages/Profile/Section/Footer/index.js b/packages/client/src/pages/Profile/Section/Footer/index.js index 16bbfadee6..fa3028c870 100644 --- a/packages/client/src/pages/Profile/Section/Footer/index.js +++ b/packages/client/src/pages/Profile/Section/Footer/index.js @@ -58,11 +58,9 @@ const ActiveSessions = ({ const onClickRemoveAllSessions = async () => { try { setLoading(true); - await removeAllSessions().then(() => - getAllSessions().then((res) => setSessions(res.items)) - ); + await removeAllSessions().then((res) => window.location.replace(res)); } catch (error) { - console.log(error); + toastr.error(error); } finally { setLoading(false); setLogoutAllVisible(false); From 5d6ab42543ae49bc93d45b9b82b162f7a8e993bc Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Wed, 9 Nov 2022 14:23:28 +0500 Subject: [PATCH 2/5] Web:Client:ActiveSessions: bugfix --- .../client/src/pages/Confirm/sub-components/changePassword.js | 2 +- packages/client/src/pages/Profile/Section/Footer/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/Confirm/sub-components/changePassword.js b/packages/client/src/pages/Confirm/sub-components/changePassword.js index f32a55b1c2..a242d373c0 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePassword.js +++ b/packages/client/src/pages/Confirm/sub-components/changePassword.js @@ -59,7 +59,7 @@ const ChangePasswordForm = (props) => { const hash = createPasswordHash(password, hashSettings); const { uid, confirmHeader } = linkData; - + console.log(uid); changePassword(uid, hash, confirmHeader) .then(() => logout()) .then(() => { diff --git a/packages/client/src/pages/Profile/Section/Footer/index.js b/packages/client/src/pages/Profile/Section/Footer/index.js index fa3028c870..7d6c285026 100644 --- a/packages/client/src/pages/Profile/Section/Footer/index.js +++ b/packages/client/src/pages/Profile/Section/Footer/index.js @@ -54,7 +54,7 @@ const ActiveSessions = ({ setCurrentSession(res.loginEvent); }); }, []); - + const onClickRemoveAllSessions = async () => { try { setLoading(true); From efa6334c758dff264de84faa4127f5795cf75280 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Thu, 10 Nov 2022 15:09:14 +0500 Subject: [PATCH 3/5] Web:Client:ActiveSessions: bugfix --- packages/client/src/pages/Profile/Section/Footer/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/client/src/pages/Profile/Section/Footer/index.js b/packages/client/src/pages/Profile/Section/Footer/index.js index 22ae06238a..7d6c285026 100644 --- a/packages/client/src/pages/Profile/Section/Footer/index.js +++ b/packages/client/src/pages/Profile/Section/Footer/index.js @@ -58,7 +58,6 @@ const ActiveSessions = ({ const onClickRemoveAllSessions = async () => { try { setLoading(true); - await removeAllSessions().then((res) => console.log(res)); await removeAllSessions().then((res) => window.location.replace(res)); } catch (error) { toastr.error(error); From e628f8b580e4aefe8e74a1a6e762825d0079e262 Mon Sep 17 00:00:00 2001 From: Elyor Djalilov Date: Thu, 10 Nov 2022 15:30:58 +0500 Subject: [PATCH 4/5] Web:Client:ActiveSessions: removed console.log --- .../client/src/pages/Confirm/sub-components/changePassword.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/client/src/pages/Confirm/sub-components/changePassword.js b/packages/client/src/pages/Confirm/sub-components/changePassword.js index a242d373c0..f54e1ee95e 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePassword.js +++ b/packages/client/src/pages/Confirm/sub-components/changePassword.js @@ -59,7 +59,6 @@ const ChangePasswordForm = (props) => { const hash = createPasswordHash(password, hashSettings); const { uid, confirmHeader } = linkData; - console.log(uid); changePassword(uid, hash, confirmHeader) .then(() => logout()) .then(() => { From 6537a2c7e6c2b474881266ba7ab65fdd12e071ec Mon Sep 17 00:00:00 2001 From: SuhorukovAnton Date: Thu, 10 Nov 2022 14:04:58 +0300 Subject: [PATCH 5/5] add logs --- .../Controllers/PortalController.cs | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/common/services/ASC.ApiSystem/Controllers/PortalController.cs b/common/services/ASC.ApiSystem/Controllers/PortalController.cs index 608e8feaa6..d0183a6f4c 100644 --- a/common/services/ASC.ApiSystem/Controllers/PortalController.cs +++ b/common/services/ASC.ApiSystem/Controllers/PortalController.cs @@ -309,18 +309,26 @@ public class PortalController : ControllerBase } } - var reference = _commonMethods.CreateReference(Request.Scheme, t.GetTenantDomain(_coreSettings), info.Email, isFirst); - - _log.LogDebug("PortalName = {0}; Elapsed ms. CreateReferenceByCookie...: {1}", model.PortalName, sw.ElapsedMilliseconds); - - sw.Stop(); - - return Ok(new + try { - reference, - tenant = _commonMethods.ToTenantWrapper(t), - referenceWelcome = sendCongratulationsAddress - }); + _log.LogDebug("try CreateReference"); + var reference = _commonMethods.CreateReference(Request.Scheme, t.GetTenantDomain(_coreSettings), info.Email, isFirst); + _log.LogDebug("PortalName = {0}; Elapsed ms. CreateReferenceByCookie...: {1}", model.PortalName, sw.ElapsedMilliseconds); + + sw.Stop(); + + return Ok(new + { + reference, + tenant = _commonMethods.ToTenantWrapper(t), + referenceWelcome = sendCongratulationsAddress + }); + }catch (Exception e) + { + _log.LogError(e, "CreateReference error"); + + return BadRequest(error); + } } [HttpDelete("remove")]