From 6a0f72bc7638359eaf4d4fa1d751f52bca5d181b Mon Sep 17 00:00:00 2001
From: Pierre HUBERT <pierre.git@communiquons.org>
Date: Tue, 13 Jul 2021 17:50:22 +0200
Subject: [PATCH] Fix conflict

---
 assets/js/components/account/interface.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/components/account/interface.js b/assets/js/components/account/interface.js
index 65f72f36..c14e86e3 100644
--- a/assets/js/components/account/interface.js
+++ b/assets/js/components/account/interface.js
@@ -121,7 +121,7 @@ const AccountInterface = {
 	checkPasswordResetToken: function(token, callback){
 		var apiURI = "account/check_password_reset_token";
 		var params = {
-			token: token
+			reset_token: token
 		};
 		ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, callback);
 	},
@@ -136,7 +136,7 @@ const AccountInterface = {
 	resetUserPassword: function(token, passwd, callback){
 		var apiURI = "account/reset_user_passwd";
 		var params = {
-			token: token,
+			reset_token: token,
 			password: passwd
 		};
 		ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, callback);