break out nonce and anonymous id methods - they need better implementations

3 files changed, 8 insertions, 5 deletions

diff --git a/coip/apps/auth/utils.py b/coip/apps/auth/utils.py
index b7bb044..9e0a736 100644
--- a/coip/apps/auth/utils.py
+++ b/coip/apps/auth/utils.py
@@ -6,4 +6,7 @@ Created on Jul 7, 2010
 from uuid import uuid4
 
 def nonce():
-    return uuid4().hex;
\ No newline at end of file
+    return uuid4().hex;
+
+def anonid():
+    return uuid4().urn;
\ No newline at end of file
diff --git a/coip/apps/auth/views.py b/coip/apps/auth/views.py
index 3e54e9c..d38be1f 100644
--- a/coip/apps/auth/views.py
+++ b/coip/apps/auth/views.py
@@ -6,7 +6,7 @@ Created on Jul 5, 2010
 from django.http import HttpResponseRedirect
 from coip.apps.userprofile.models import UserProfile
 from django.contrib.auth.models import User
-from uuid import uuid4
+from coip.apps.auth.utils import anonid
 
 def meta(request,attr):
     v = request.META.get(attr)
@@ -20,7 +20,7 @@ def accounts_login_federated(request):
             request.user = profile.user
         else:
             profile.identifier = request.user.username
-            request.user = User(username=uuid4().urn)
+            request.user = User(username=anonid())
             request.user.save()
             profile.user = request.user
             
diff --git a/coip/apps/userprofile/views.py b/coip/apps/userprofile/views.py
index 36f6a48..fe943d8 100644
--- a/coip/apps/userprofile/views.py
+++ b/coip/apps/userprofile/views.py
@@ -6,12 +6,12 @@ Created on Jul 6, 2010
 from django.contrib.auth.decorators import login_required
 from coip.apps.userprofile.models import PKey
 from django.http import HttpResponseRedirect
-from uuid import uuid4
 from coip.multiresponse import respond_to
 from coip.apps.membership.models import Membership
 from coip.apps.userprofile.utils import user_profile
 from django.core.exceptions import ObjectDoesNotExist
 from pprint import pprint
+from coip.apps.auth.utils import nonce
 
 @login_required
 def merge(request,pkey=None):
@@ -26,7 +26,7 @@ def merge(request,pkey=None):
         return HttpResponseRedirect("/user/home")
     else:
         profile = profile(request)
-        k = PKey(profile=profile,key=uuid4().hex)
+        k = PKey(profile=profile,key=nonce())
         k.save()
         return HttpResponseRedirect("/accounts/login?next=/user/merge/"+k.key)