X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Femailactivationview.py;h=533cccfa36b366b179da97882d334f9c350b0d68;hb=315584500343184f1c3909d7ef6f38721d82092d;hp=2a3e6179e4531eddd7749c89ceba5a0f05a43f99;hpb=d81f5f5ca87b6eba05adb93cd27ac3c9952cc294;p=myslice.git diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py index 2a3e6179..533cccfa 100644 --- a/portal/emailactivationview.py +++ b/portal/emailactivationview.py @@ -2,7 +2,7 @@ from unfold.loginrequired import FreeAccessView # from manifold.core.query import Query from manifoldapi.manifoldapi import execute_query, execute_admin_query -from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, authority_get_pi_emails +from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, authority_get_pi_emails, make_request_user, create_user # from unfold.page import Page from ui.topmenu import topmenu_items_live, the_user @@ -11,20 +11,35 @@ from django.http import HttpResponse, HttpResponseRedirec from django.contrib import messages from django.contrib.auth.decorators import login_required from myslice.theme import ThemeView -from portal.models import PendingUser +from portal.models import PendingUser, PendingAuthority from django.core.mail import EmailMultiAlternatives, send_mail from django.contrib.sites.models import Site # import json, os, re, itertools +def ValuesQuerySetToDict(vqs): + return [item for item in vqs] + # requires login class ActivateEmailView(FreeAccessView, ThemeView): template_name = "email_activation.html" + def is_ple_enabled(self, pending_user): + pending_authorities = PendingAuthority.objects.filter(site_authority__iexact = pending_user.authority_hrn) + if pending_authorities: + return False + pending_user_email = pending_user.email + query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled') + results = execute_admin_query(self.request, query) + for result in results: + # User is enabled in PLE + if 'enabled' in result and result['enabled']==True: + return True + return False + def dispatch(self, *args, **kwargs): return super(ActivateEmailView, self).dispatch(*args, **kwargs) - def get_context_data(self, **kwargs): page = Page(self.request) @@ -35,43 +50,58 @@ class ActivateEmailView(FreeAccessView, ThemeView): #print "%s = %s" % (key, value) if key == "hash_code": hash_code=value - - if PendingUser.objects.filter(email_hash__iexact = hash_code): - #get_user = PendingUser.objects.filter(email_hash__iexact = hash_code) - #get_user.status= 'True' - #get_user.save() - #for user in PendingUser.objects.all(): - # first_name = user.first_name - # last_name = user.last_name - # authority_hrn = user.authority_hrn - # public_key = user.public_key - # email = user.email - # user_hrn = user.user_hrn - PendingUser.objects.filter(email_hash__iexact = hash_code).update(status='True') + if PendingUser.objects.filter(email_hash__iexact = hash_code).filter(status__iexact = 'False'): activation = 'success' - # sending email after activation success - #try: - # Send an email: the recipients are the PI of the authority - # If No PI is defined for this Authority, send to a default email (different for each theme) - # recipients = authority_get_pi_emails(wsgi_request, authority_hrn) - # theme.template_name = 'user_request_email.html' - # html_content = render_to_string(theme.template, request) - # theme.template_name = 'user_request_email.txt' - # text_content = render_to_string(theme.template, request) - # theme.template_name = 'user_request_email_subject.txt' - # subject = render_to_string(theme.template, request) - # subject = subject.replace('\n', '') - # theme.template_name = 'email_default_sender.txt' - # sender = render_to_string(theme.template, request) - # sender = sender.replace('\n', '') - # msg = EmailMultiAlternatives(subject, text_content, sender, recipients) - # msg.attach_alternative(html_content, "text/html") - # msg.send() - # except Exception, e: - # print "Failed to send email, please check the mail templates and the SMTP configuration of your server" - # import traceback - # traceback.print_exc() + # AUTO VALIDATION of PLE enabled users (only for OneLab Portal) + if self.theme == "onelab": + # Auto-Validation of pending user, which is enabled in a trusted SFA Registry (example: PLE) + # We could check in the Registry based on email, but it takes too long + # as we currently need to do a Resolve on each user_hrn of the Registry in order to get its email + # TODO in SFA XXX We need a Resolve based on email + # TODO maybe we can use MyPLC API for PLE + pending_users = PendingUser.objects.filter(email_hash__iexact = hash_code) + + # by default user is not in PLE + ple_user_enabled = False + + if pending_users: + pending_user = pending_users[0] + + # Auto Validation + if self.is_ple_enabled(pending_user): + pending_user_request = make_request_user(pending_user) + # Create user in SFA and Update in Manifold + create_user(self.request, pending_user_request, namespace = 'myslice', as_admin = True) + # Delete pending user + PendingUser.objects.filter(email_hash__iexact = hash_code).delete() + + # template user auto validated + activation = 'validated' + + # sending email after activation success + #try: + # # Send an email: the recipient is the user + # recipients = pending_user_eamil + # theme.template_name = 'user_request_email.html' + # html_content = render_to_string(theme.template, request) + # theme.template_name = 'user_request_email.txt' + # text_content = render_to_string(theme.template, request) + # theme.template_name = 'user_request_email_subject.txt' + # subject = render_to_string(theme.template, request) + # subject = subject.replace('\n', '') + # theme.template_name = 'email_default_sender.txt' + # sender = render_to_string(theme.template, request) + # sender = sender.replace('\n', '') + # msg = EmailMultiAlternatives(subject, text_content, sender, recipients) + # msg.attach_alternative(html_content, "text/html") + # msg.send() + #except Exception, e: + # print "Failed to send email, please check the mail templates and the SMTP configuration of your server" + # import traceback + # traceback.print_exc() + + PendingUser.objects.filter(email_hash__iexact = hash_code).update(status='True') else: activation = 'failed'