lukmangrd/platypush
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed format for HTTP backend requests to something more consistent

Browse source
This commit is contained in:
Fabio Manganiello 2018-01-28 14:49:59 +01:00
parent 6aec6380d8
commit 615573f932
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
platypush/backend/http/__init__.py
View file

@ -14,9 +14,9 @@ from .. import Backend
class HttpBackend(Backend): class HttpBackend(Backend):
""" Example interaction with the HTTP backend to make requests: """ Example interaction with the HTTP backend to make requests:
$ curl -XPOST -d "token=your_configured_token" \ $ curl -XPOST -H 'Content-Type: application/json' -H "X-Token: your_token" \
-d 'msg={"type":"request","target":"volta","action":"tts.say","args": {"phrase":"This is a test"}}' \ -d '{"type":"request","target":"nodename","action":"tts.say","args": {"phrase":"This is a test"}}' \
http://localhost:8008 """ http://localhost:8008/execute """
def __init__(self, port=8008, token=None, **kwargs): def __init__(self, port=8008, token=None, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
@ -41,14 +41,13 @@ class HttpBackend(Backend):
app = Flask(__name__) app = Flask(__name__)
@app.route('/', methods=['POST']) @app.route('/execute', methods=['POST'])
def index(): def index():
args = { k:v for (k,v) in request.form.items() } args = json.loads(request.data.decode('utf-8'))
token = request.headers['X-Token'] if 'X-Token' in request.headers else None
if token != self.token: abort(401)
if self.token and ('token' not in args or args['token'] != self.token): abort(401) msg = Message.build(args)
if 'msg' not in args: abort(400)
msg = Message.build(args['msg'])
logging.info('Received message on the HTTP backend: {}'.format(msg)) logging.info('Received message on the HTTP backend: {}'.format(msg))
if isinstance(msg, Request): if isinstance(msg, Request):