server/cli: fix login issues

koush · Jan 22, 2024 · 8a64075 · 8a64075
1 parent 9be913a
commit 8a64075
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 47 deletions.
diff --git a/packages/cli/.vscode/launch.json b/packages/cli/.vscode/launch.json
@@ -21,7 +21,7 @@
             ],
             "preLaunchTask": "npm: build",
             "args": [
-                "shell",
+                "login",
             ],
             "sourceMaps": true,
             "resolveSourceMapLocations": [

diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scrypted",
-  "version": "1.3.8",
+  "version": "1.3.10",
   "description": "",
   "main": "./dist/packages/cli/src/main.js",
   "bin": {
@@ -19,7 +19,6 @@
     "@scrypted/client": "^1.3.3",
     "@scrypted/types": "^0.2.99",
     "engine.io-client": "^6.5.3",
-    "http-auth-utils": "^6.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.5.4",
     "tslib": "^2.6.2"

diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts
@@ -7,7 +7,7 @@ import fs from 'fs';
 import path from 'path';
 import readline from 'readline-sync';
 import semver from 'semver';
-import { authHttpFetch } from '../../../common/src/http-auth-fetch';
+import { httpFetch } from '../../../server/src/fetch/http-fetch';
 import { installServe, serveMain } from './service';
 import { connectShell } from './shell';
 
@@ -40,6 +40,12 @@ interface LoginFile {
     [host: string]: Login;
 }
 
+function basicAuthHeaders(username: string, password: string) {
+    const headers = new Headers();
+    headers.set('Authorization', `Basic ${Buffer.from(username + ":" + password).toString('base64')}`);
+    return headers;
+}
+
 async function doLogin(host: string) {
     host = toIpAndPort(host);
 
@@ -49,16 +55,15 @@ async function doLogin(host: string) {
     });
 
     const url = `https://${host}/login`;
-    const response = await authHttpFetch({
+    const response = await httpFetch({
         method: 'GET',
-        credential: {
-            username,
-            password,
-        },
+        headers: basicAuthHeaders(username, password),
         url,
         rejectUnauthorized: false,
         responseType: 'json',
     });
+    if (response.body.error)
+        throw new Error(response.body.error);
 
     fs.mkdirSync(scryptedHome, {
         recursive: true,
@@ -76,13 +81,10 @@ async function doLogin(host: string) {
 
     login[host] = response.body;
     fs.writeFileSync(loginPath, JSON.stringify(login));
-    return login;
+    return login[host];
 }
 
-async function getOrDoLogin(host: string): Promise<{
-    username: string,
-    token: string,
-}> {
+async function getOrDoLogin(host: string): Promise<Login> {
     let login: LoginFile;
     try {
         login = JSON.parse(fs.readFileSync(loginPath).toString());
@@ -91,11 +93,12 @@ async function getOrDoLogin(host: string): Promise<{
 
         if (!login[host].username || !login[host].token)
             throw new Error();
+
+        return login[host];
     }
     catch (e) {
-        login = await doLogin(host);
+        return doLogin(host);
     }
-    return login[host];
 }
 
 async function runCommand() {
@@ -145,8 +148,8 @@ async function main() {
     }
     else if (process.argv[2] === 'login') {
         const ip = process.argv[3] || '127.0.0.1';
-        const token = await doLogin(ip);
-        console.log('login successful. token:', token);
+        const login = await doLogin(ip);
+        console.log('login successful. token:', login.token);
     }
     else if (process.argv[2] === 'command') {
         const { sdk, pendingResult } = await runCommand();
@@ -198,16 +201,15 @@ async function main() {
 
         const login = await getOrDoLogin(ip);
         const url = `https://${ip}/web/component/script/install/${pkg}`;
-        const response = await authHttpFetch({
+        const response = await httpFetch({
             method: 'POST',
-            credential: {
-                username: login.username,
-                password: login.token,
-            },
+            headers: basicAuthHeaders(login.username, login.token),
             url,
             rejectUnauthorized: false,
             responseType: 'json',
         });
+        if (response.body.error)
+            throw new Error(response.body.error);
 
         console.log('install successful. id:', response.body.id);
     }

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/src/scrypted-server-main.ts b/server/src/scrypted-server-main.ts
@@ -149,6 +149,10 @@ async function start(mainFilename: string, options?: {
         realm: 'Scrypted',
     }, async (username, password, callback) => {
         const user = await db.tryGet(ScryptedUser, username);
+        if (!user) {
+            callback(false);
+            return;
+        }
 
         const salted = user.salt + password;
         const hash = crypto.createHash('sha256');