Revision fe7d0186 snf-pithos-app/pithos/api/util.py

b/snf-pithos-app/pithos/api/util.py
67 67
                                 RADOS_POOL_MAPS, TRANSLATE_UUIDS,
68 68
                                 PUBLIC_URL_SECURITY, PUBLIC_URL_ALPHABET,
69 69
                                 BASE_HOST, UPDATE_MD5, VIEW_PREFIX,
70
                                 OA2_CLIENT_CREDENTIALS, SERVE_API_DOMAIN)
70
                                 OAUTH2_CLIENT_CREDENTIALS, SERVE_API_DOMAIN)
71 71

  
72 72
from pithos.api.resources import resources
73 73
from pithos.backends import connect_backend
......
1195 1195
                        raise PermissionDenied
1196 1196
                    return response
1197 1197

  
1198
                client_id, client_secret = OA2_CLIENT_CREDENTIALS
1198
                client_id, client_secret = OAUTH2_CLIENT_CREDENTIALS
1199 1199
                # TODO: check if client credentials are not set
1200 1200
                authorization_code = request.GET.get('code')
1201 1201
                if authorization_code is None:
......
1207 1207
                              'state': '',  # TODO include state for security
1208 1208
                              'scope': request.path.split(VIEW_PREFIX, 2)[-1]}
1209 1209
                    return HttpResponseRedirect('%s?%s' %
1210
                                                (join_urls(astakos.oa2_url,
1210
                                                (join_urls(astakos.oauth2_url,
1211 1211
                                                           'auth'),
1212 1212
                                                 urlencode(params)))
1213 1213
                else:
......
1223 1223

  
1224 1224
                    redirect_uri = '%s%s' % (redirect_host, request.path)
1225 1225
                    data = astakos.get_token('authorization_code',
1226
                                             *OA2_CLIENT_CREDENTIALS,
1226
                                             *OAUTH2_CLIENT_CREDENTIALS,
1227 1227
                                             redirect_uri=redirect_uri,
1228 1228
                                             scope=requested_resource,
1229 1229
                                             code=authorization_code)

Also available in: Unified diff