Revision 276f454e snf-astakos-app/astakos/api/util.py
b/snf-astakos-app/astakos/api/util.py | ||
---|---|---|
80 | 80 |
raise faults.Unauthorized("Invalid X-Auth-Token") |
81 | 81 |
|
82 | 82 |
try: |
83 |
user = AstakosUser.objects.get(auth_token=token) |
|
83 |
request.user = AstakosUser.objects.get(auth_token=token)
|
|
84 | 84 |
except AstakosUser.DoesNotExist: |
85 | 85 |
raise faults.Unauthorized('Invalid X-Auth-Token') |
86 | 86 |
|
87 |
return func(request, user, *args, **kwargs)
|
|
87 |
return func(request, *args, **kwargs) |
|
88 | 88 |
return wrapper |
89 | 89 |
|
90 | 90 |
|
... | ... | |
148 | 148 |
return response |
149 | 149 |
|
150 | 150 |
|
151 |
def __send_feedback(request, email_template_name='im/feedback_mail.txt', |
|
152 |
user=None): |
|
153 |
if not user: |
|
154 |
auth_token = request.POST.get('auth', '') |
|
155 |
if not auth_token: |
|
156 |
raise faults.BadRequest('Missing user authentication') |
|
157 |
|
|
158 |
try: |
|
159 |
user = AstakosUser.objects.get(auth_token=auth_token) |
|
160 |
except AstakosUser.DoesNotExist: |
|
161 |
raise faults.BadRequest('Invalid user authentication') |
|
162 |
|
|
151 |
def send_feedback(request, email_template_name='im/feedback_mail.txt'): |
|
163 | 152 |
form = FeedbackForm(request.POST) |
164 | 153 |
if not form.is_valid(): |
165 | 154 |
logger.error("Invalid feedback request: %r", form.errors) |
... | ... | |
168 | 157 |
msg = form.cleaned_data['feedback_msg'] |
169 | 158 |
data = form.cleaned_data['feedback_data'] |
170 | 159 |
try: |
171 |
send_feedback_func(msg, data, user, email_template_name) |
|
160 |
send_feedback_func(msg, data, request.user, email_template_name)
|
|
172 | 161 |
except: |
173 | 162 |
return HttpResponse(status=502) |
174 | 163 |
return HttpResponse(status=200) |
Also available in: Unified diff