Revision 9fd36718 snf-cyclades-app/synnefo/helpdesk/views.py
b/snf-cyclades-app/synnefo/helpdesk/views.py | ||
---|---|---|
32 | 32 |
|
33 | 33 |
return None |
34 | 34 |
|
35 |
|
|
35 | 36 |
# TODO: here we mix ui setting with helpdesk settings |
36 | 37 |
# if sometime in the future helpdesk gets splitted from the |
37 | 38 |
# cyclades api code this should change and helpdesk should provide |
38 | 39 |
# its own setting HELPDESK_AUTH_COOKIE_NAME. |
39 |
HELPDESK_AUTH_COOKIE = getattr(settings, 'UI_AUTH_COOKIE_NAME', '_pithos2_a') |
|
40 |
AUTH_COOKIE = getattr(settings, 'UI_AUTH_COOKIE_NAME', getattr(settings, |
|
41 |
'HELPDESK_AUTH_COOKIE_NAME', '_pithos2_a')) |
|
42 |
|
|
40 | 43 |
|
41 | 44 |
def helpdesk_user_required(func, groups=['helpdesk']): |
42 | 45 |
""" |
... | ... | |
44 | 47 |
permissions (exists in helpdesk group) |
45 | 48 |
""" |
46 | 49 |
def wrapper(request, *args, **kwargs): |
47 |
token = get_token_from_cookie(request, HELPDESK_AUTH_COOKIE) |
|
50 |
HELPDESK_ENABLED = getattr(settings, 'HELPDESK_ENABLED', True) |
|
51 |
if not HELPDESK_ENABLED: |
|
52 |
raise Http404 |
|
53 |
|
|
54 |
token = get_token_from_cookie(request, AUTH_COOKIE) |
|
48 | 55 |
get_user(request, settings.ASTAKOS_URL, fallback_token=token) |
49 | 56 |
if hasattr(request, 'user') and request.user: |
50 | 57 |
groups = request.user.get('groups', []) |
Also available in: Unified diff