Revision 78c3a39c

b/snf-astakos-app/astakos/api/quotas.py
51 51

  
52 52
@api.api_method(http_method='GET', token_required=True, user_required=False)
53 53
@user_from_token
54
def quotas(request, user=None):
55
    result = get_user_quotas(user)
54
def quotas(request):
55
    result = get_user_quotas(request.user)
56 56
    return json_response(result)
57 57

  
58 58

  
b/snf-astakos-app/astakos/api/user.py
57 57
@api.api_method(http_method="GET", token_required=True, user_required=False,
58 58
                logger=logger)
59 59
@user_from_token  # Authenticate user!!
60
def authenticate(request, user=None):
60
def authenticate(request):
61 61
    # Normal Response Codes: 200
62 62
    # Error Response Codes: internalServerError (500)
63 63
    #                       badRequest (400)
64 64
    #                       unauthorised (401)
65
    user = request.user
65 66
    if not user:
66 67
        raise faults.BadRequest('No user')
67 68

  
......
108 109
@api.api_method(http_method="POST", token_required=True, user_required=False,
109 110
                logger=logger)
110 111
@user_from_token  # Authenticate user!!
111
def get_uuid_displayname_catalogs(request, user=None):
112
def get_uuid_displayname_catalogs(request):
112 113
    # Normal Response Codes: 200
113 114
    # Error Response Codes: internalServerError (500)
114 115
    #                       badRequest (400)
......
121 122
@api.api_method(http_method="POST", token_required=True, user_required=False,
122 123
                logger=logger)
123 124
@user_from_token  # Authenticate user!!
124
def send_feedback(request, email_template_name='im/feedback_mail.txt',
125
                  user=None):
125
def send_feedback(request, email_template_name='im/feedback_mail.txt'):
126 126
    # Normal Response Codes: 200
127 127
    # Error Response Codes: internalServerError (500)
128 128
    #                       badRequest (400)
129 129
    #                       unauthorised (401)
130 130

  
131
    return send_feedback_util(request, email_template_name, user)
131
    return send_feedback_util(request, email_template_name)

Also available in: Unified diff