Revision 890c2065 snf-astakos-app/astakos/im/api/user.py

b/snf-astakos-app/astakos/im/api/user.py
38 38

  
39 39
from django.http import HttpResponse
40 40
from django.utils import simplejson as json
41
from django.views.decorators.csrf import csrf_exempt
41 42

  
42 43
from .faults import (
43 44
    Fault, Unauthorized, InternalServerError, BadRequest, Forbidden)
44
from . import render_fault
45
from . import render_fault, __get_uuid_displayname_catalogs, __send_feedback
46

  
45 47
from astakos.im.models import AstakosUser
46 48
from astakos.im.util import epoch
47 49

  
......
115 117
        'email': [user.email],
116 118
        'name': user.realname,
117 119
        'auth_token_created': epoch(user.auth_token_created),
118
        'auth_token_expires': epoch(user.auth_token_expires),
119
        'has_credits': user.has_credits}
120
        'auth_token_expires': epoch(user.auth_token_expires)}
120 121

  
121 122
    # append usage data if requested
122 123
    if request.REQUEST.get('usage', None):
......
132 133
    response['Content-Type'] = 'application/json; charset=UTF-8'
133 134
    response['Content-Length'] = len(response.content)
134 135
    return response
136

  
137
@csrf_exempt
138
@api_method(http_method='POST', token_required=True)
139
def get_uuid_displayname_catalogs(request, user=None):
140
    # Normal Response Codes: 200
141
    # Error Response Codes: internalServerError (500)
142
    #                       badRequest (400)
143
    #                       unauthorised (401)
144

  
145
    return __get_uuid_displayname_catalogs(request)
146

  
147
@csrf_exempt
148
@api_method(http_method='POST', token_required=True)
149
def send_feedback(request, email_template_name='im/feedback_mail.txt', user=None):
150
    # Normal Response Codes: 200
151
    # Error Response Codes: internalServerError (500)
152
    #                       badRequest (400)
153
    #                       unauthorised (401)
154

  
155
    return __send_feedback(request, email_template_name, user)

Also available in: Unified diff