Merge pull request #33 from ckcr4lyf/patch/fix-http-login

Patch/fix http login
ckcr4lyf · May 26, 2023 · 1d6c722 · 1d6c722
2 parents 9ec6faf + 73c8665
commit 1d6c722
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 30 deletions.
diff --git a/__tests__/qbittorrent/auth.test.ts b/__tests__/qbittorrent/auth.test.ts
@@ -12,9 +12,9 @@ test('loginV2', async t => {
         password: 'adminadmin'
     }
 
-    const scope = nock(fakeSettings.url).get('/api/v2/auth/login').query({
+    const scope = nock(fakeSettings.url).post('/api/v2/auth/login', {
         username: 'admin',
-        password: 'adminadmin',
+        password: 'adminadmin'
     }).reply(200, {}, {
         'set-cookie': 'SID=1234'
     });

diff --git a/bin/index.mjs b/bin/index.mjs
@@ -10,7 +10,6 @@ import { tagErroredTorrents } from '../build/src/racing/tag.js'
 import { postRaceResumeV2 } from '../build/src/racing/completed.js'
 import { startMetricsServer } from '../build/src/server/appFactory.js';
 import { addTorrentToRace } from '../build/src/racing/add.js';
-import data from '../package.json' assert { type: 'json' };
 
 // This should take care of having a base config
 makeConfigIfNotExist();
@@ -70,8 +69,4 @@ program.command('metrics').description('Start a prometheus metrics server').acti
     startMetricsServer(config, api);
 })
 
-program.option('-v, --version', 'Display the version').action(() => {
-    console.log(`\n\nqbit-race version ${data.version}\n\n`);
-})
-
 program.parse();
diff --git a/build/src/qbittorrent/api.js b/build/src/qbittorrent/api.js
diff --git a/build/src/qbittorrent/auth.js b/build/src/qbittorrent/auth.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qbit-race",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.8",
   "description": "Qbit utilities for racing",
   "main": "./bin/index.js",
   "type": "module",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@ckcr4lyf/bencode-esm": "^0.0.2",
     "@ckcr4lyf/logger": "^0.0.5",
-    "axios": "^0.21.1",
+    "axios": "^1.4.0",
     "commander": "^9.4.0",
     "fastify": "^3.19.0",
     "form-data": "^3.0.1"

diff --git a/src/qbittorrent/api.ts b/src/qbittorrent/api.ts
@@ -158,10 +158,12 @@ enum ApiEndpoints {
 }
 
 export const login = (qbittorrentSettings: QBITTORRENT_SETTINGS): Promise<AxiosResponse> => {
-    return axios.get(`${qbittorrentSettings.url}${ApiEndpoints.login}`, {
-        params: {
-            username: qbittorrentSettings.username,
-            password: qbittorrentSettings.password,
+    return axios.post(`${qbittorrentSettings.url}${ApiEndpoints.login}`, {
+        username: qbittorrentSettings.username,
+        password: qbittorrentSettings.password
+    }, {
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
         }
     });
 }

diff --git a/src/qbittorrent/auth.ts b/src/qbittorrent/auth.ts
@@ -10,7 +10,7 @@ export const loginV2 = async (qbittorrentSettings: QBITTORRENT_SETTINGS): Promis
     const response = await apiLogin(qbittorrentSettings);
 
     // TODO: Differentiate between wrong credentials vs. qbit is not listening (wrong URL / port etc.)
-    if (Array.isArray(response.headers['set-cookie']) === false || response.headers['set-cookie'].length === 0) {
+    if (response.headers['set-cookie'] === undefined || Array.isArray(response.headers['set-cookie']) === false || response.headers['set-cookie'].length === 0) {
         throw new Error(`Failed to authenticate`);
     }