From 5815a1cc7c0898aadb513ae68645f08ebd69256c Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Fri, 18 Jan 2019 15:36:25 +0100
Subject: [PATCH] =?UTF-8?q?correction=20bug=20mot=20de=20passe=20oubli?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mondumas.egg-info/PKG-INFO                  |  2 +-
 mondumas.egg-info/requires.txt              |  1 -
 mondumas/models/default.py                  | 15 +++++++--------
 mondumas/templates/default/envoyer_mdp.pt   |  2 +-
 mondumas/templates/layouts/global_layout.pt |  1 +
 setup.py                                    |  3 +--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/mondumas.egg-info/PKG-INFO b/mondumas.egg-info/PKG-INFO
index 0c05da4..442dec3 100644
--- a/mondumas.egg-info/PKG-INFO
+++ b/mondumas.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mondumas
-Version: 0.1
+Version: 1.0
 Summary: mondumas
 Home-page: UNKNOWN
 Author: 
diff --git a/mondumas.egg-info/requires.txt b/mondumas.egg-info/requires.txt
index ff7abf7..fbe21fc 100644
--- a/mondumas.egg-info/requires.txt
+++ b/mondumas.egg-info/requires.txt
@@ -1,6 +1,5 @@
 pyramid
 pyramid_chameleon
-pyramid_mako==0.3.1
 pyramid_debugtoolbar
 pyramid_layout
 pyramid_mailer
diff --git a/mondumas/models/default.py b/mondumas/models/default.py
index 87803c0..aaa863d 100644
--- a/mondumas/models/default.py
+++ b/mondumas/models/default.py
@@ -35,15 +35,14 @@ def get_member_by_id(request, mbr_id):
     return results
 
 def update_membre_mdp_oublie(request, login):
-    import base64
-    import uuid
-
     # get a UUID - URL safe, Base64
-    r_uuid = base64.urlsafe_b64encode(uuid.uuid4().bytes)
-    r_uuid = r_uuid.replace('=', '')
-    query = "UPDATE p_users SET mdp_oublie=:r_uuid, mdp_oublie_date=now() WHERE CD_UTI=:login;"
-    execute_query(request, query, {'r_uuid':r_uuid, 'login':login})
-    return r_uuid
+    
+    uid = uuid.uuid1()
+    urlslug = base64.urlsafe_b64encode(uid.bytes).decode("utf-8").rstrip('=\n').replace('/', '_')
+    query = "UPDATE p_users SET mdp_oublie=:urlslug, mdp_oublie_date=now() WHERE CD_UTI=:login;"
+    execute_query(request, query, {'urlslug':urlslug, 'login':login})
+    
+    return urlslug
 
 def update_membre_mdp(request, login, password):
     """Update password for member login"""
diff --git a/mondumas/templates/default/envoyer_mdp.pt b/mondumas/templates/default/envoyer_mdp.pt
index b02c754..003389d 100644
--- a/mondumas/templates/default/envoyer_mdp.pt
+++ b/mondumas/templates/default/envoyer_mdp.pt
@@ -8,7 +8,7 @@
         <p>
           Pour des raisons de sécurité, nous gardons votre mot de passe chiffré, et nous ne pouvons pas vous l'envoyer. 
           Si vous souhaitez ré-initialiser votre mot de passe, remplissez le formulaire ci-dessous et nous vous enverrons un email pour démarrer la phase de ré-initialisation de votre mot de passe.		</p>
-        <br />
+       OK <br />
         <form id="email_login-form" role="form" action="${url}" method="post">
             <div class="form-group">
               <label class="control-label" for="login">Mon identifiant</label>
diff --git a/mondumas/templates/layouts/global_layout.pt b/mondumas/templates/layouts/global_layout.pt
index 09cb69c..7b25be0 100644
--- a/mondumas/templates/layouts/global_layout.pt
+++ b/mondumas/templates/layouts/global_layout.pt
@@ -98,6 +98,7 @@
     <div id="footer">
         <div class="well">
             <p>© 2017&nbsp;-&nbsp;<a href="http://www.entreprise-dumas.com/" target="_blank">Entreprise Dumas, 49 Chemin du Bois – 69140 RILLIEUX LA PAPE</a></p>
+        ggggggg
         </div>
     </div>
 
diff --git a/setup.py b/setup.py
index 76686d6..5d3cf2a 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,6 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
 requires = [
     'pyramid',
     'pyramid_chameleon',
-    'pyramid_mako==0.3.1',    # bug dans pserve --reload
     'pyramid_debugtoolbar',
     'pyramid_layout',
     'pyramid_mailer',
@@ -33,7 +32,7 @@ tests_require = [
     ]
 
 setup(name='mondumas',
-      version='0.1',
+      version='1.0',
       description='mondumas',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[