Revision ef19d181 snf-astakos-app/astakos/im/api.py

b/snf-astakos-app/astakos/im/api.py
1 1
# Copyright 2011-2012 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
5 5
# conditions are met:
6
# 
6
#
7 7
#   1. Redistributions of source code must retain the above
8 8
#      copyright notice, this list of conditions and the following
9 9
#      disclaimer.
10
# 
10
#
11 11
#   2. Redistributions in binary form must reproduce the above
12 12
#      copyright notice, this list of conditions and the following
13 13
#      disclaimer in the documentation and/or other materials
14 14
#      provided with the distribution.
15
# 
15
#
16 16
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
17 17
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 18
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
......
25 25
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
26 26
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 27
# POSSIBILITY OF SUCH DAMAGE.
28
# 
28
#
29 29
# The views and conclusions contained in the software and
30 30
# documentation are those of the authors and should not be
31 31
# interpreted as representing official policies, either expressed
......
48 48
def render_fault(request, fault):
49 49
    if isinstance(fault, InternalServerError) and settings.DEBUG:
50 50
        fault.details = format_exc(fault)
51
    
51

  
52 52
    request.serialization = 'text'
53 53
    data = fault.message + '\n'
54 54
    if fault.details:
......
68 68
        x_auth_token = request.META.get('HTTP_X_AUTH_TOKEN')
69 69
        if not x_auth_token:
70 70
            return render_fault(request, BadRequest('Missing X-Auth-Token'))
71
        
71

  
72 72
        try:
73 73
            user = AstakosUser.objects.get(auth_token=x_auth_token)
74 74
        except AstakosUser.DoesNotExist, e:
75
            return render_fault(request, Unauthorized('Invalid X-Auth-Token')) 
76
        
75
            return render_fault(request, Unauthorized('Invalid X-Auth-Token'))
76

  
77 77
        # Check if the is active.
78 78
        if not user.is_active:
79 79
            return render_fault(request, Unauthorized('User inactive'))
80
        
80

  
81 81
        # Check if the token has expired.
82 82
        if (time() - mktime(user.auth_token_expires.timetuple())) > 0:
83 83
            return render_fault(request, Unauthorized('Authentication expired'))
84
        
84

  
85 85
        response = HttpResponse()
86 86
        response.status=204
87 87
        user_info = {'username':user.username,
......
100 100
def get_services(request):
101 101
    if request.method != 'GET':
102 102
        raise BadRequest('Method not allowed.')
103

  
104
    callback = request.GET.get('callback', None)
103 105
    data = json.dumps(CLOUD_SERVICES)
104
    return HttpResponse(content=data, mimetype="application/json")
106
    mimetype = 'application/json'
107

  
108
    if callback:
109
        mimetype = 'application/javascript'
110
        data = '%s(%s)' % (callback, data)
111

  
112
    return HttpResponse(content=data, mimetype=mimetype)
105 113

  
106 114
def get_menu(request):
107 115
    if request.method != 'GET':
......
128 136
                  'name': "feedback..." })
129 137
        l.append({ 'url': absolute(reverse('astakos.im.views.logout')),
130 138
                  'name': "logout..."})
139

  
140
    callback = request.GET.get('callback', None)
131 141
    data = json.dumps(tuple(l))
132
    return HttpResponse(content=data, mimetype="application/json")
142
    mimetype = 'application/json'
143

  
144
    if callback:
145
        mimetype = 'application/javascript'
146
        data = '%s(%s)' % (callback, data)
147

  
148
    return HttpResponse(content=data, mimetype=mimetype)

Also available in: Unified diff