From 3089d02e7dba1fca874ba39d803ee6e0e8102886 Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Fri, 24 Jun 2022 20:23:19 +0200
Subject: [PATCH] feat(api): fixed invite user

---
 api/chalicelib/core/users.py    | 6 +++---
 ee/api/chalicelib/core/users.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py
index 794121064..78499860b 100644
--- a/api/chalicelib/core/users.py
+++ b/api/chalicelib/core/users.py
@@ -116,7 +116,7 @@ def reset_member(tenant_id, editor_id, user_id_to_update):
 
 
 def update(tenant_id, user_id, changes):
-    AUTH_KEYS = ["password", "generatedPassword", "invitationToken", "invitedAt", "changePwdExpireAt", "changePwdToken"]
+    AUTH_KEYS = ["password", "invitationToken", "invitedAt", "changePwdExpireAt", "changePwdToken"]
     if len(changes.keys()) == 0:
         return None
 
@@ -422,7 +422,7 @@ def change_password(tenant_id, user_id, email, old_password, new_password):
     auth = authenticate(email, old_password, for_change_password=True)
     if auth is None:
         return {"errors": ["wrong password"]}
-    changes = {"password": new_password, "generatedPassword": False}
+    changes = {"password": new_password}
     user = update(tenant_id=tenant_id, user_id=user_id, changes=changes)
     r = authenticate(user['email'], new_password)
     tenant_id = r.pop("tenantId")
@@ -448,7 +448,7 @@ def change_password(tenant_id, user_id, email, old_password, new_password):
 
 
 def set_password_invitation(user_id, new_password):
-    changes = {"password": new_password, "generatedPassword": False,
+    changes = {"password": new_password,
                "invitationToken": None, "invitedAt": None,
                "changePwdExpireAt": None, "changePwdToken": None}
     user = update(tenant_id=-1, user_id=user_id, changes=changes)
diff --git a/ee/api/chalicelib/core/users.py b/ee/api/chalicelib/core/users.py
index e5d5d17c9..f874d2301 100644
--- a/ee/api/chalicelib/core/users.py
+++ b/ee/api/chalicelib/core/users.py
@@ -132,7 +132,7 @@ def reset_member(tenant_id, editor_id, user_id_to_update):
 
 
 def update(tenant_id, user_id, changes):
-    AUTH_KEYS = ["password", "generatedPassword", "invitationToken", "invitedAt", "changePwdExpireAt", "changePwdToken"]
+    AUTH_KEYS = ["password", "invitationToken", "invitedAt", "changePwdExpireAt", "changePwdToken"]
     if len(changes.keys()) == 0:
         return None
 
@@ -475,7 +475,7 @@ def change_password(tenant_id, user_id, email, old_password, new_password):
     auth = authenticate(email, old_password, for_change_password=True)
     if auth is None:
         return {"errors": ["wrong password"]}
-    changes = {"password": new_password, "generatedPassword": False}
+    changes = {"password": new_password}
     user = update(tenant_id=tenant_id, user_id=user_id, changes=changes)
     r = authenticate(user['email'], new_password)
 
@@ -501,7 +501,7 @@ def change_password(tenant_id, user_id, email, old_password, new_password):
 
 
 def set_password_invitation(tenant_id, user_id, new_password):
-    changes = {"password": new_password, "generatedPassword": False,
+    changes = {"password": new_password,
                "invitationToken": None, "invitedAt": None,
                "changePwdExpireAt": None, "changePwdToken": None}
     user = update(tenant_id=tenant_id, user_id=user_id, changes=changes)