Refactor auth and rename CcnetUser to User

thirdpart/auth/views.py

@@ -18,7 +18,7 @@ from auth.forms import AuthenticationForm
 from auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm
 from auth.tokens import default_token_generator
 
-from seaserv import get_ccnetuser
+from seahub.base.accounts import User
 
 @csrf_protect
 @never_cache
@@ -150,19 +150,16 @@ def password_reset_confirm(request, uidb36=None, token=None, template_name='regi
         post_reset_redirect = reverse('auth.views.password_reset_complete')
     try:
         uid_int = base36_to_int(uidb36)
-    except ValueError:
-        raise Http404
+        user = User.objects.get(id=uid_int)
+    except (ValueError, User.DoesNotExist):
+        user = None
 
-    ccnetuser = get_ccnetuser(userid=uid_int)
-    if not ccnetuser:
-        raise Http404
-    
     context_instance = RequestContext(request)
 
-    if token_generator.check_token(ccnetuser, token):
+    if token_generator.check_token(user, token):
         context_instance['validlink'] = True
         if request.method == 'POST':
-            form = set_password_form(ccnetuser, request.POST)
+            form = set_password_form(user, request.POST)
             if form.is_valid():
                 form.save()
                 return HttpResponseRedirect(post_reset_redirect)