Skip to content

Commit 5e801cc

Browse files
committed
fix: add posibility to query flux via V1 approach (#74)
1 parent 9bc5739 commit 5e801cc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/InfluxDbClient.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ void InfluxDBClient::setUrls() {
295295
auth += "&p=";
296296
auth += _password;
297297
_writeUrl += auth;
298+
_queryUrl += "?";
298299
_queryUrl += auth;
299300
}
300301
INFLUXDB_CLIENT_DEBUG(" writeUrl: %s\n", _writeUrl.c_str());

test/server/server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ function parsePoints(data) {
338338
const AuthToken = "Token 1234567890";
339339
function handleAuthentication(req, res) {
340340
var auth = req.get('Authorization');
341-
if(auth != AuthToken) {
341+
if(auth && auth != AuthToken) {
342342
res.status(401).send(`{"code":"unauthorized","message":"unauthorized access"}`);
343343
return false;
344344
} else {
@@ -382,7 +382,7 @@ function checkWriteParamsV1(req, res) {
382382

383383
function checkQueryParams(req, res) {
384384
var org = req.query['org'];
385-
if(org != 'my-org') {
385+
if(org && org !== 'my-org') {
386386
res.status(404).send(`{"code":"not found","message":"organization name \"${org}\" not found"}`);
387387
return false;
388388
} else {

test/test.ino

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,6 @@ void testV1() {
789789

790790
TEST_INIT("testV1");
791791
InfluxDBClient client(INFLUXDB_CLIENT_TESTING_URL, INFLUXDB_CLIENT_TESTING_DB);
792-
InfluxDBClient queryClient(INFLUXDB_CLIENT_TESTING_URL, INFLUXDB_CLIENT_TESTING_ORG, INFLUXDB_CLIENT_TESTING_BUC, INFLUXDB_CLIENT_TESTING_TOK);
793792

794793
TEST_ASSERTM(client.validateConnection(), client.getLastErrorMessage());
795794
//test with no batching
@@ -800,7 +799,7 @@ void testV1() {
800799
delete p;
801800
}
802801
String query = "select";
803-
FluxQueryResult q = queryClient.query(query);
802+
FluxQueryResult q = client.query(query);
804803
std::vector<String> lines = getLines(q);
805804
TEST_ASSERTM(q.getError()=="", q.getError());
806805
TEST_ASSERTM(lines.size() == 20, String(lines.size()) + " vs 20");
@@ -815,7 +814,7 @@ void testV1() {
815814
TEST_ASSERTM(client.writePoint(*p), String("i=") + i + client.getLastErrorMessage());
816815
delete p;
817816
}
818-
q = queryClient.query(query);
817+
q = client.query(query);
819818
lines = getLines(q);
820819
TEST_ASSERTM(q.getError()=="", q.getError());
821820
TEST_ASSERT(lines.size() == 15);

0 commit comments

Comments
 (0)