From f79d240323cf7bf475580d55a2a296b8efa7c3bd Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Fri, 10 Mar 2017 12:39:18 +0100
Subject: [PATCH] general: remove "user hash" stuff (#15374)

... following #13840
---
 extra/modules/myspace.py  | 15 ---------------
 extra/modules/payments.py |  9 +++------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/extra/modules/myspace.py b/extra/modules/myspace.py
index 8e80b53..1cd3bcf 100644
--- a/extra/modules/myspace.py
+++ b/extra/modules/myspace.py
@@ -52,11 +52,6 @@ class MyInvoicesDirectory(Directory):
         invoices = []
         invoices.extend(Invoice.get_with_indexed_value(
             str('user_id'), str(user.id)))
-        try:
-            invoices.extend(Invoice.get_with_indexed_value(
-                str('user_hash'), str(user.hash)))
-        except AttributeError:
-            pass
 
         def cmp_invoice(a, b):
             t = cmp(a.regie_id, b.regie_id)
@@ -388,11 +383,6 @@ class JsonDirectory(Directory):
         for formdef in formdefs:
             user_forms.extend(formdef.data_class().get_with_indexed_value(
                         'user_id', self.user.id))
-            try:
-                user_forms.extend(formdef.data_class().get_with_indexed_value(
-                        'user_hash', self.user.hash))
-            except AttributeError:
-                pass
         user_forms.sort(lambda x,y: cmp(x.receipt_time, y.receipt_time))
 
         get_response().set_content_type('application/json')
@@ -460,11 +450,6 @@ class MyspaceDirectory(wcs.myspace.MyspaceDirectory):
             for formdef in formdefs:
                 user_forms.extend(formdef.data_class().get_with_indexed_value(
                             'user_id', user.id))
-                try:
-                    user_forms.extend(formdef.data_class().get_with_indexed_value(
-                            'user_hash', user.hash))
-                except AttributeError:
-                    pass
             user_forms.sort(lambda x,y: cmp(x.receipt_time, y.receipt_time))
 
         profile_links = []
diff --git a/extra/modules/payments.py b/extra/modules/payments.py
index cb97a6e..ebf6bdb 100644
--- a/extra/modules/payments.py
+++ b/extra/modules/payments.py
@@ -53,11 +53,10 @@ class Regie(StorableObject):
 
 class Invoice(StorableObject):
     _names = 'invoices'
-    _hashed_indexes = ['user_id', 'user_hash', 'regie_id']
+    _hashed_indexes = ['user_id', 'regie_id']
     _indexes = ['external_id']
 
     user_id = None
-    user_hash = None
     regie_id = None
     formdef_id = None
     formdata_id = None
@@ -269,7 +268,6 @@ class PaymentWorkflowStatusItem(WorkflowStatusItem):
     def perform(self, formdata):
         invoice = Invoice(regie_id=self.regie_id, formdef_id=formdata.formdef.id)
         invoice.user_id = formdata.user_id
-        invoice.user_hash = formdata.user_hash
         invoice.formdata_id = formdata.id
         invoice.next_status = self.next_status
         if self.subject:
@@ -351,9 +349,8 @@ class PaymentCancelWorkflowStatusItem(WorkflowStatusItem):
         # select invoices for the selected regie (if not "all regies")
         if self.regie_id != '_all':
             invoices = [i for i in invoices if i.regie_id == self.regie_id]
-        # security filter: check user 
-        invoices = [i for i in invoices if (i.user_id == formdata.user_id) \
-                or (i.user_hash == formdata.user_hash)]
+        # security filter: check user
+        invoices = [i for i in invoices if i.user_id == formdata.user_id]
         # security filter: check formdata & formdef
         invoices = [i for i in invoices if (i.formdata_id == formdata.id) \
                 and (i.formdef_id == formdata.formdef.id)]
-- 
2.11.0