More reliable GUID set for registered users

1 files changed, 5 insertions, 6 deletions

diff --git a/restful_document/user.py b/restful_document/user.py
index 05d5681..4d713dc 100644
--- a/restful_document/user.py
+++ b/restful_document/user.py
@@ -33,11 +33,6 @@ _logger = logging.getLogger('sugar_stats')
 
 class User(Document):
 
-    def __init__(self, guid=None, manual_guid=None, *args, **kwargs):
-        Document.__init__(self, guid, *args, **kwargs)
-        if guid is None and manual_guid is not None:
-            self._guid = manual_guid
-
     @ad.active_property(slot=1, prefix='N', full_text=True)
     def nickname(self, value):
         return value
@@ -66,7 +61,7 @@ class User(Document):
                 _('Property "pubkey" is required for user registeration'))
         props['manual_guid'], props['pubkey'] = \
                 _load_pubkey(props['pubkey'].strip())
-        doc = cls.create(env.request.content)
+        doc = cls.create(props)
         return {'guid': doc.guid}
 
     @classmethod
@@ -89,6 +84,10 @@ class User(Document):
         # for all possible user documents
         Document.init(User)
 
+    def on_create(self, properties):
+        properties['guid'] = properties.pop('manual_guid')
+        Document.on_create(self, properties)
+
 
 def _load_pubkey(pubkey):
     try: