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

Merge branch 'develop' into feature/add-move-to-archive-dialog

Browse Source
This commit is contained in:
TimofeyBoyko 2022-11-10 15:22:33 +03:00
commit 879cfd0256
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/services/ASC.ApiSystem/Controllers/PortalController.cs
View File

@ -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")]

1
packages/client/src/pages/Confirm/sub-components/changePassword.js
View File

@ -59,7 +59,6 @@ const ChangePasswordForm = (props) => {
const hash = createPasswordHash(password, hashSettings);
const { uid, confirmHeader } = linkData;
changePassword(uid, hash, confirmHeader)
.then(() => logout())
.then(() => {

6
packages/client/src/pages/Profile/Section/Footer/index.js
View File

@ -54,13 +54,13 @@ const ActiveSessions = ({
setCurrentSession(res.loginEvent);
});
}, []);
const onClickRemoveAllSessions = async () => {
try {
setLoading(true);
await removeAllSessions().then((res) => console.log(res));
await removeAllSessions().then((res) => window.location.replace(res));
} catch (error) {
console.log(error);
toastr.error(error);
} finally {
setLoading(false);
setLogoutAllVisible(false);