Revision b4b82ec4 snf-cyclades-app/synnefo/helpdesk/views.py

b/snf-cyclades-app/synnefo/helpdesk/views.py
1
# Copyright 2012 GRNET S.A. All rights reserved.
1
# Copyright 2012, 2013 GRNET S.A. All rights reserved.
2 2
#
3 3
# Redistribution and use in source and binary forms, with or
4 4
# without modification, are permitted provided that the following
......
95 95
            raise PermissionDenied
96 96

  
97 97
        token = request.POST.get('token', None)
98
        if token and token == request.user.get('auth_token', None):
99
            return func(request, *args, **kwargs)
98
        if token:
99
            try:
100
                req_token = request.user["access"]["token"]["id"]
101
                if token == req_token:
102
                    return func(request, *args, **kwargs)
103
            except KeyError:
104
                pass
100 105

  
101 106
        raise PermissionDenied
102 107

  
......
117 122
        astakos.get_user(request, settings.ASTAKOS_AUTH_URL,
118 123
                         fallback_token=token, logger=logger)
119 124
        if hasattr(request, 'user') and request.user:
120
            groups = request.user.get('groups', [])
125
            groups = request.user['access']['user']['roles']
126
            groups = [g["name"] for g in groups]
121 127

  
122 128
            if not groups:
123 129
                logger.error("Failed to access helpdesk view. User: %r",
......
181 187
    is_uuid = UUID_SEARCH_REGEX.match(search_query)
182 188
    is_vm = VM_SEARCH_REGEX.match(search_query)
183 189
    account_name = search_query
184
    auth_token = request.user.get('auth_token')
190
    auth_token = request.user['access']['token']['id']
185 191

  
186 192
    if is_ip:
187 193
        try:
......
258 264
        'vms': vms,
259 265
        'show_deleted': show_deleted,
260 266
        'account_name': account_name,
261
        'token': request.user['auth_token'],
267
        'token': request.user['access']['token']['id'],
262 268
        'networks': networks,
263 269
        'HELPDESK_MEDIA_URL': HELPDESK_MEDIA_URL,
264 270
        'UI_MEDIA_URL': UI_MEDIA_URL

Also available in: Unified diff