{this.state.errorMsg}
{errorMsg}
; + } + + if (!invitationsList.length) { + return ( +| {gettext('Email')} | @@ -108,100 +154,74 @@ class InvitationsListView extends React.Component {
|---|
{% trans "Hi," %}
+ ++{% blocktrans %}{{ inviter }} revoke your access to {{ site_name }}.{% endblocktrans %} +
+ + +{% endautoescape %} + +{% endblock %} \ No newline at end of file diff --git a/seahub/invitations/views.py b/seahub/invitations/views.py index 273d13e941..8283ed526b 100644 --- a/seahub/invitations/views.py +++ b/seahub/invitations/views.py @@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404, render from django.utils.translation import ugettext as _ -from seahub.auth import login as auth_login +from seahub.auth import login as auth_login, authenticate from seahub.auth import get_backends from seahub.base.accounts import User from seahub.constants import GUEST_USER @@ -21,36 +21,55 @@ def token_view(request, token): if i.is_expired(): raise Http404 + if request.method == 'GET': + try: + user = User.objects.get(email=i.accepter) + if user.is_active is True: + # user is active return exist + messages.error(request, _('A user with this email already exists.')) + except User.DoesNotExist: + pass + + return render(request, 'invitations/token_view.html', {'iv': i, }) + if request.method == 'POST': passwd = request.POST.get('password', '') if not passwd: return HttpResponseRedirect(request.META.get('HTTP_REFERER')) try: - User.objects.get(email=i.accepter) - messages.error(request, _('A user with this email already exists.')) + user = User.objects.get(email=i.accepter) + if user.is_active is True: + # user is active return exist + messages.error(request, _('A user with this email already exists.')) + return render(request, 'invitations/token_view.html', {'iv': i, }) + else: + # user is inactive then set active and new password + user.set_password(passwd) + user.is_active = True + user.save() + user = authenticate(username=user.username, password=passwd) + except User.DoesNotExist: - # Create user, set that user as guest, and log user in. - u = User.objects.create_user(email=i.accepter, password=passwd, - is_active=True) - User.objects.update_role(u.username, GUEST_USER) - - i.accept() # Update invitaion accept time. - + # Create user, set that user as guest. + user = User.objects.create_user( + email=i.accepter, password=passwd, is_active=True) + User.objects.update_role(user.username, GUEST_USER) for backend in get_backends(): - u.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__) - auth_login(request, u) + user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__) - # send signal to notify inviter - accept_guest_invitation_successful.send( - sender=None, invitation_obj=i) + # Update invitation accept time. + i.accept() - # send email to notify admin - if NOTIFY_ADMIN_AFTER_REGISTRATION: - notify_admins_on_register_complete(u.email) + # login + auth_login(request, user) - return HttpResponseRedirect(SITE_ROOT) + # send signal to notify inviter + accept_guest_invitation_successful.send( + sender=None, invitation_obj=i) - return render(request, 'invitations/token_view.html', { - 'iv': i, - }) + # send email to notify admin + if NOTIFY_ADMIN_AFTER_REGISTRATION: + notify_admins_on_register_complete(user.email) + + return HttpResponseRedirect(SITE_ROOT) diff --git a/seahub/urls.py b/seahub/urls.py index 36ee196059..3067c024da 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -69,7 +69,7 @@ from seahub.api2.endpoints.copy_move_task import CopyMoveTaskView from seahub.api2.endpoints.query_copy_move_progress import QueryCopyMoveProgressView from seahub.api2.endpoints.move_folder_merge import MoveFolderMergeView from seahub.api2.endpoints.invitations import InvitationsView, InvitationsBatchView -from seahub.api2.endpoints.invitation import InvitationView +from seahub.api2.endpoints.invitation import InvitationView, InvitationRevokeView from seahub.api2.endpoints.notifications import NotificationsView, NotificationView from seahub.api2.endpoints.user_enabled_modules import UserEnabledModulesView from seahub.api2.endpoints.repo_file_uploaded_bytes import RepoFileUploadedBytesView @@ -386,6 +386,7 @@ urlpatterns = [ url(r'^api/v2.1/invitations/$', InvitationsView.as_view()), url(r'^api/v2.1/invitations/batch/$', InvitationsBatchView.as_view()), url(r'^api/v2.1/invitations/(?P