nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated API v2 handlers and access URLs

Browse Source
This commit is contained in:
Andrew Williams
2011-05-20 11:46:30 +01:00
parent 94c2e70946
commit e2fb140ce9
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/handlers/v2.py
View File

@@ -69,11 +69,12 @@ class V2EveAPIProxyHandler(BaseHandler):
params[key.lower()] = value params[key.lower()] = value
try: try:
userid = request.GET.get('userid', None) obj = EVEAccount.objects.get(pk=request.GET.get('userid', None))
obj = EVEAccount.objects.get(pk=userid)
params['apikey'] = obj.api_key params['apikey'] = obj.api_key
except EVEAccount.DoesNotExist: except EVEAccount.DoesNotExist:
pass resp = rc.NOT_FOUND
resp.write({'user': 'notfound'})
return resp
try: try:
cached_doc = CachedDocument.objects.api_query(url_path, params) cached_doc = CachedDocument.objects.api_query(url_path, params)
@@ -96,7 +97,7 @@ class V2UserHandler(BaseHandler):
for acc in u.eveaccount_set.all(): for acc in u.eveaccount_set.all():
for char in acc.characters.all().select_related('characters').values('id', 'name', 'corporation', 'corporation_date', 'corporation__name'): for char in acc.characters.all().select_related('characters').values('id', 'name', 'corporation', 'corporation_date', 'corporation__name'):
d = dict(char) d = dict(char)
d['eveaccount'] = acc.id d['eveaccount'] = acc.pk
charlist.append(d) charlist.append(d)
d = {'id': u.id, d = {'id': u.id,

17
app/api/urls.py
View File

@@ -29,13 +29,24 @@ urlpatterns = patterns('',
url(r'^announce/$', announce_resource), url(r'^announce/$', announce_resource),
) )
urlpatterns += patterns('',
url(r'^1.0/user/$', user_resource),
url(r'^1.0/login/$', login_resource),
url(r'^1.0/eveapi/$', eveapi_resource),
url(r'^1.0/eveapi/', eveapiproxy_resource, name='api-eveapiproxy'),
url(r'^1.0/character/$', characters_resource),
url(r'^1.0/optimer/$', optimer_resource),
url(r'^1.0/blacklist/$', blacklist_resource),
url(r'^1.0/announce/$', announce_resource),
)
# v2 APIs # v2 APIs
v2_authenticate_resource = Resource(handler=V2AuthenticationHandler, **noauth) v2_authenticate_resource = Resource(handler=V2AuthenticationHandler, **noauth)
v2_eveapiproxy_resource = Resource(handler=V2EveAPIProxyHandler, **apikeyauth) v2_eveapiproxy_resource = Resource(handler=V2EveAPIProxyHandler, **apikeyauth)
v2_user_resource = Resource(handler=V2UserHandler, **apikeyauth) v2_user_resource = Resource(handler=V2UserHandler, **apikeyauth)
urlpatterns += patterns('', urlpatterns += patterns('',
url(r'^v2/authenticate/$', v2_authenticate_resource), url(r'^2.0/authenticate/$', v2_authenticate_resource, name='v2-api-authenticate'),
url(r'^v2/proxy/', v2_eveapiproxy_resource, name='v2-api-eveapiproxy'), url(r'^2.0/proxy/', v2_eveapiproxy_resource, name='v2-api-eveapiproxy'),
url(r'^v2/user/(?P<userid>\d+)/$', v2_user_resource), url(r'^2.0/user/(?P<userid>\d+)/$', v2_user_resource, name='v2-api-user'),
) )