From 4878b78d9a8a686910b7a5f1b4e8c068956044a3 Mon Sep 17 00:00:00 2001 From: Superwhiskers Date: Fri, 8 Jun 2018 14:41:15 -0500 Subject: [PATCH 1/3] fix the user check endpoint up --- helpers.js | 4 ++-- package-lock.json | 34 +++++++++++++++++----------------- routes/people/index.js | 13 +++++++++++-- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/helpers.js b/helpers.js index 34eaa51..17fc748 100644 --- a/helpers.js +++ b/helpers.js @@ -94,10 +94,10 @@ function bufferToHex(buff) { async function doesUserExist(username) { const user = await database.user_collection.findOne({ - username: username.toLowerCase() + user_id_flat: username.toLowerCase() }); - if (user) { + if (user !== null) { return true; } diff --git a/package-lock.json b/package-lock.json index 55f91bf..27b967d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1419,15 +1419,6 @@ "util-deprecate": "1.0.2" } }, - "require_optional": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", - "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", - "requires": { - "resolve-from": "2.0.0", - "semver": "5.4.1" - } - }, "require-uncached": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", @@ -1444,6 +1435,15 @@ } } }, + "require_optional": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", + "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", + "requires": { + "resolve-from": "2.0.0", + "semver": "5.4.1" + } + }, "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", @@ -1584,14 +1584,6 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -1601,6 +1593,14 @@ "strip-ansi": "4.0.0" } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", diff --git a/routes/people/index.js b/routes/people/index.js index 9e6be23..668f7bc 100644 --- a/routes/people/index.js +++ b/routes/people/index.js @@ -245,10 +245,19 @@ routes.get('/:username', async (request, response) => { } const user_exists = await helpers.doesUserExist(username); - if (user_exists) { response.status(400); - response.send(); + + const error = { + errors: { + error: { + code: '0100', + message: 'Account ID already exists' + } + } + }; + + response.send(json2xml(error)); } response.status(200); From aa3e0131d21748c95b93d679de35383a9514e4d3 Mon Sep 17 00:00:00 2001 From: Pika <15848969+ThatNerdyPikachu@users.noreply.github.com> Date: Sat, 9 Jun 2018 10:20:37 -0400 Subject: [PATCH 2/3] make a JSON endpoint actually send JSON --- routes/root/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/root/index.js b/routes/root/index.js index a7228db..dd66e85 100644 --- a/routes/root/index.js +++ b/routes/root/index.js @@ -10,7 +10,7 @@ route_debugger.log('Loading \'root/misc\' API routes'); * Description: tests the validity of this server by returning a predefined message */ routes.get('/isthisworking', async (req, res) => { - return res.send('{"server": "account.nintendo.net"}'); + return res.json({"server": "account.nintendo.net"}); }); module.exports = routes; From 799289ce12a348e860c65a0e2335b8a0764315a6 Mon Sep 17 00:00:00 2001 From: Pika <15848969+ThatNerdyPikachu@users.noreply.github.com> Date: Sat, 9 Jun 2018 10:27:35 -0400 Subject: [PATCH 3/3] kys eslint --- routes/root/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/root/index.js b/routes/root/index.js index dd66e85..5e647e6 100644 --- a/routes/root/index.js +++ b/routes/root/index.js @@ -10,7 +10,7 @@ route_debugger.log('Loading \'root/misc\' API routes'); * Description: tests the validity of this server by returning a predefined message */ routes.get('/isthisworking', async (req, res) => { - return res.json({"server": "account.nintendo.net"}); + return res.json({'server': 'account.nintendo.net'}); }); module.exports = routes;