X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=3a5fcbc3b5d77eed8d6517b2151d8f565a5f69d4;hb=d5f4c4f7fb3b131fd5f939f3a6b216c6fabbc05c;hp=7cda3a977ff573de0d7dc6e41eb62c7ddb953586;hpb=fc1057dc7f9526c7f13e002408bf181d978d0184;p=myslice.git diff --git a/portal/actions.py b/portal/actions.py index 7cda3a97..3a5fcbc3 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -6,9 +6,9 @@ import json from django.contrib.auth.models import User from django.template.loader import render_to_string -from django.core.mail import EmailMultiAlternatives +from django.core.mail import EmailMultiAlternatives, send_mail -from myslice.theme import ThemeView +from myslice.theme import ThemeView theme = ThemeView() @@ -23,6 +23,7 @@ theme = ThemeView() def authority_get_pis(request, authority_hrn): query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users') results = execute_admin_query(request, query) + print "authority_get_pis = %s" % results # NOTE: temporarily commented. Because results is giving empty list. # Needs more debugging #if not results: @@ -33,11 +34,15 @@ def authority_get_pis(request, authority_hrn): def authority_get_pi_emails(request, authority_hrn): pi_users = authority_get_pis(request,authority_hrn) - if any(d['pi_users'] == None for d in pi_users): - theme.template_name = 'email_default_recipients.txt' - default_email = render_to_string(theme.template, request) - default_email = default_email.replace('\n', '') - return default_email + print "pi_users = %s" % pi_users + + if any(pi['pi_users'] == None or not pi['pi_users'] for pi in pi_users): + #theme.template_name = 'email_default_recipients.txt' + #default_email = render_to_string(theme.template, request) + #default_email = default_email.replace('\n', '') + #return default_email + # the above doesn't work + return ['support@myslice.info'] else: pi_user_hrns = [ hrn for x in pi_users for hrn in x['pi_users'] ] query = Query.get('user').filter_by('user_hrn', 'included', pi_user_hrns).select('user_email') @@ -247,7 +252,8 @@ def get_request_by_id(ids): def get_requests(authority_hrns=None): print "get_request_by_authority auth_hrns = ", authority_hrns if not authority_hrns: - pending_users = PendingUser.objects.all() + ## get those pending users who have confirmed their emails + pending_users = PendingUser.objects.filter(status__iexact = 'True') pending_slices = PendingSlice.objects.all() pending_authorities = PendingAuthority.objects.all() else: @@ -315,13 +321,14 @@ def portal_validate_request(wsgi_request, request_ids): # XXX tmp sfa dependency from sfa.util.xrn import Xrn urn = Xrn(hrn, request['type']).get_urn() - + + # Only hrn is required for Manifold Query sfa_authority_params = { - 'hrn' : hrn, - 'urn' : urn, - 'type' : request['type'], + 'authority_hrn' : hrn, + #'authority_urn' : urn, + #'type' : request['type'], #'pi' : None, - 'enabled' : True + #'enabled' : True } print "ADD Authority" sfa_add_authority(wsgi_request, sfa_authority_params) @@ -396,7 +403,7 @@ def create_pending_slice(wsgi_request, request, email): slice_name = request['slice_name'], user_hrn = request['user_hrn'], authority_hrn = request['authority_hrn'], - number_of_nodes = request['number_of_nodes'], + number_of_nodes = request['exp_url'], purpose = request['purpose'], ) s.save() @@ -404,7 +411,7 @@ def create_pending_slice(wsgi_request, request, email): try: # Send an email: the recipients are the PI of the authority recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn']) - + theme.template_name = 'slice_request_email.txt' text_content = render_to_string(theme.template, request) @@ -416,8 +423,7 @@ def create_pending_slice(wsgi_request, request, email): subject = subject.replace('\n', '') sender = email - msg = EmailMultiAlternatives(subject, text_content, sender, [recipients]) - print msg + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() except Exception, e: @@ -533,10 +539,30 @@ def create_pending_user(wsgi_request, request, user_detail): public_key = request['public_key'], private_key = request['private_key'], user_hrn = request['user_hrn'], - pi = '', # XXX Why not None ? + pi = request['pi'], + email_hash = request['email_hash'], + status = 'False', ) b.save() - + # sends email to user to activate the email + theme.template_name = 'activate_user.html' + html_content = render_to_string(theme.template, request) + theme.template_name = 'activate_user.txt' + text_content = render_to_string(theme.template, request) + theme.template_name = 'activate_user_email_subject.txt' + subject = render_to_string(theme.template, request) + subject = subject.replace('\n', '') + #sender = 'support@myslice.info' + theme.template_name = 'email_default_sender.txt' + sender = render_to_string(theme.template, request) + sender = sender.replace('\n', '') + recipient = [request['email']] + #recipient = recipient.append(request['email']) + + msg = EmailMultiAlternatives(subject, text_content, sender, recipient) + msg.attach_alternative(html_content, "text/html") + msg.send() + # saves the user to django auth_user table [needed for password reset] user = User.objects.create_user(request['email'], request['email'], request['password']) @@ -583,7 +609,7 @@ def create_pending_user(wsgi_request, request, user_detail): 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) @@ -595,8 +621,10 @@ def create_pending_user(wsgi_request, request, user_detail): sender = render_to_string(theme.template, request) sender = sender.replace('\n', '') - msg = EmailMultiAlternatives(subject, text_content, sender, [recipients]) + 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()