starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: allow the token to be submitted either in the request header or as part of the query string

This commit is contained in:
Bart Van Der Meerssche 2010-04-27 23:14:30 +02:00
parent ea9f713f90
commit 606efd7c79
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/api/flukso/src/flukso_resource.erl
View File

@ -24,7 +24,7 @@ malformed_request(ReqData, _State) ->
{RrdSensor, ValidSensor} = rrd_sensor(wrq:path_info(sensor, ReqData)), {RrdSensor, ValidSensor} = rrd_sensor(wrq:path_info(sensor, ReqData)),
{RrdTime, ValidInterval} = rrd_time(wrq:get_qs_value("interval", ReqData)), {RrdTime, ValidInterval} = rrd_time(wrq:get_qs_value("interval", ReqData)),
{RrdFactor, ValidUnit} = rrd_factor(wrq:get_qs_value("unit", ReqData)), {RrdFactor, ValidUnit} = rrd_factor(wrq:get_qs_value("unit", ReqData)),
{Token, ValidToken} = rrd_sensor(wrq:get_req_header("X-Token", ReqData)), {Token, ValidToken} = token(wrq:get_req_header("X-Token", ReqData), wrq:get_qs_value("token", ReqData)),
{JsonpCallback, ValidJsonpCallback} = jsonp_callback(wrq:get_qs_value("jsonp_callback", ReqData)), {JsonpCallback, ValidJsonpCallback} = jsonp_callback(wrq:get_qs_value("jsonp_callback", ReqData)),
State = #state{rrdSensor = RrdSensor, rrdTime = RrdTime, rrdFactor = RrdFactor, token = Token, jsonpCallback = JsonpCallback}, State = #state{rrdSensor = RrdSensor, rrdTime = RrdTime, rrdFactor = RrdFactor, token = Token, jsonpCallback = JsonpCallback},
@ -98,9 +98,17 @@ rrd_factor(Unit) ->
{_Unit, RrdFactor} -> {RrdFactor, true} {_Unit, RrdFactor} -> {RrdFactor, true}
end. end.
token(undefined, undefined) ->
{false, false};
token(Token, undefined) ->
rrd_sensor(Token);
token(undefined, Token) ->
rrd_sensor(Token);
token(_, _) ->
{false, false}.
jsonp_callback(undefined) -> jsonp_callback(undefined) ->
{undefined, true}; {undefined, true};
jsonp_callback(JsonpCallback) -> jsonp_callback(JsonpCallback) ->
Length = string:len(JsonpCallback), Length = string:len(JsonpCallback),