From 08969cd831d20f1ba41b2a42172acd17462cbfe4 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Thu, 5 Aug 2021 17:25:13 +0200 Subject: [PATCH] Api changes (#131) * feat(api): include smtp flag in login response * feat(api): changed smtp flag in login response * feat(api): owner role is not allowed to change * feat(api): changed chalice template * feat(api): reset password invitation|token * feat(api): fixed invitation token * feat(api): after invitation return identical result * feat(api): remove password when user deleted * feat(api): fix login on password change --- api/chalicelib/core/users.py | 2 +- ee/api/chalicelib/core/users.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py index d1b2abef6..a87a6023f 100644 --- a/api/chalicelib/core/users.py +++ b/api/chalicelib/core/users.py @@ -435,7 +435,7 @@ def set_password_invitation(user_id, new_password): "invitationToken": None, "invitedAt": None, "changePwdExpireAt": None, "changePwdToken": None} user = update(tenant_id=-1, user_id=user_id, changes=changes) - r = authenticate(user['email'], user['password']) + r = authenticate(user['email'], new_password) tenant_id = r.pop("tenantId") r["limits"] = { diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py index 3d8b1750c..4c6032fc2 100644 --- a/ee/api/chalicelib/core/users.py +++ b/ee/api/chalicelib/core/users.py @@ -445,7 +445,7 @@ def set_password_invitation(user_id, new_password): "invitationToken": None, "invitedAt": None, "changePwdExpireAt": None, "changePwdToken": None} user = update(tenant_id=-1, user_id=user_id, changes=changes) - r = authenticate(user['email'], user['password']) + r = authenticate(user['email'], new_password) tenant_id = r.pop("tenantId") r["limits"] = {