Revision bf0c6de5 snf-astakos-app/astakos/im/functions.py
b/snf-astakos-app/astakos/im/functions.py | ||
---|---|---|
40 | 40 |
from django.core.urlresolvers import reverse |
41 | 41 |
from django.core.exceptions import ValidationError |
42 | 42 |
from django.template import Context, loader |
43 |
from django.contrib.auth import login as auth_login, logout as auth_logout |
|
43 |
from django.contrib.auth import ( |
|
44 |
login as auth_login, |
|
45 |
logout as auth_logout, |
|
46 |
SESSION_KEY |
|
47 |
) |
|
44 | 48 |
from django.http import HttpRequest |
45 | 49 |
|
46 | 50 |
from urllib import quote |
... | ... | |
49 | 53 |
from datetime import datetime |
50 | 54 |
from functools import wraps |
51 | 55 |
|
52 |
from astakos.im.settings import DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, \ |
|
53 |
SITENAME, BASEURL, DEFAULT_ADMIN_EMAIL, LOGGING_LEVEL, \ |
|
54 |
VERIFICATION_EMAIL_SUBJECT, ADMIN_NOTIFICATION_EMAIL_SUBJECT, \ |
|
55 |
HELPDESK_NOTIFICATION_EMAIL_SUBJECT, INVITATION_EMAIL_SUBJECT, \ |
|
56 |
from astakos.im.settings import ( |
|
57 |
DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, |
|
58 |
SITENAME, BASEURL, DEFAULT_ADMIN_EMAIL, LOGGING_LEVEL, |
|
59 |
VERIFICATION_EMAIL_SUBJECT, ADMIN_NOTIFICATION_EMAIL_SUBJECT, |
|
60 |
HELPDESK_NOTIFICATION_EMAIL_SUBJECT, INVITATION_EMAIL_SUBJECT, |
|
56 | 61 |
GREETING_EMAIL_SUBJECT, FEEDBACK_EMAIL_SUBJECT, EMAIL_CHANGE_EMAIL_SUBJECT |
57 |
from astakos.im.models import Invitation, AstakosUser |
|
62 |
) |
|
63 |
from astakos.im.models import Invitation, AstakosUser, SessionCatalog |
|
58 | 64 |
|
59 | 65 |
logger = logging.getLogger(__name__) |
60 | 66 |
|
... | ... | |
75 | 81 |
return r |
76 | 82 |
return with_logging |
77 | 83 |
|
78 |
login = logged(auth_login, '%s logged in.') |
|
84 |
|
|
85 |
def login(request, user): |
|
86 |
auth_login(request, user) |
|
87 |
SessionCatalog(session_key=request.session.session_key, user=user).save() |
|
88 |
|
|
89 |
login = logged(login, '%s logged in.') |
|
79 | 90 |
logout = logged(auth_logout, '%s logged out.') |
80 | 91 |
|
81 | 92 |
def send_verification(user, template_name='im/activation_email.txt'): |
Also available in: Unified diff