cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Authorization type moved to function

Browse Source
This commit is contained in:
Juan Ignacio Sánchez Lara
2015-08-17 12:55:42 +02:00
parent df531e9e37
commit 99641b827c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts-available/CDB_Groups_API.sql
+3 -3
View File
@@ -15,7 +15,7 @@ $$
client = httplib.HTTPConnection(params['host'], params['port'], False, params['timeout']) client = httplib.HTTPConnection(params['host'], params['port'], False, params['timeout'])
body = '{ "name": "%s", "database_role": "%s" }' % (group_name, group_role) body = '{ "name": "%s", "database_role": "%s" }' % (group_name, group_role)
headers = { 'Authorization': ('Basic %s' % params['auth']), 'Content-Type': 'application/json' } headers = { 'Authorization': params['auth'], 'Content-Type': 'application/json' }
client.request('POST', '/api/v1/databases/%s/groups' % database_name, body, headers) client.request('POST', '/api/v1/databases/%s/groups' % database_name, body, headers)
response = client.getresponse() response = client.getresponse()
assert response.status == 200 assert response.status == 200
@@ -37,7 +37,7 @@ $$
return return
client = httplib.HTTPConnection(params['host'], params['port'], False, params['timeout']) client = httplib.HTTPConnection(params['host'], params['port'], False, params['timeout'])
headers = { 'Authorization': ('Basic %s' % params['auth']), 'Content-Type': 'application/json' } headers = { 'Authorization': params['auth'], 'Content-Type': 'application/json' }
client.request('DELETE', '/api/v1/databases/%s/groups/%s' % (database_name, group_name), '', headers) client.request('DELETE', '/api/v1/databases/%s/groups/%s' % (database_name, group_name), '', headers)
response = client.getresponse() response = client.getresponse()
assert response.status == 200 assert response.status == 200
@@ -72,7 +72,7 @@ $$
else: else:
import json import json
params = json.loads(conf) params = json.loads(conf)
auth = plpy.execute("SELECT cartodb._CDB_Group_API_Auth('%s', '%s') as auth" % (params['username'], params['password']))[0]['auth'] auth = 'Basic %s' % plpy.execute("SELECT cartodb._CDB_Group_API_Auth('%s', '%s') as auth" % (params['username'], params['password']))[0]['auth']
return { "host": params['host'], "port": params['port'], 'timeout': params['timeout'], 'auth': auth } return { "host": params['host'], "port": params['port'], 'timeout': params['timeout'], 'auth': auth }
# return params # return params
$$ LANGUAGE 'plpythonu' VOLATILE; $$ LANGUAGE 'plpythonu' VOLATILE;