Merge pull request #467 from MrBrax/develop-ts

2023-10-09

.vscode/settings.json

@@ -2,5 +2,10 @@
     "search.exclude": {
         "**/*.lock": true,
         "build/**": true,
-    }
+    },
+    "eslint.workingDirectories": [
+        "./server",
+        "./twitch-chat-dumper",
+        "./client-vue"
+    ],
 }

client-vue/.yarnrc.yml

@@ -19,4 +19,4 @@ supportedArchitectures:
     - win32
     - linux-arm64
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-3.6.4.cjs

client-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livestreamdvr-client",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "private": true,
   "homepage": "https://github.com/MrBrax/LiveStreamDVR",
   "scripts": {
@@ -64,7 +64,7 @@
     "vitest": "^0.33.0",
     "vue-tsc": "^1.8.5"
   },
-  "packageManager": "yarn@3.6.1",
+  "packageManager": "yarn@3.6.4",
   "engines": {
     "node": ">=18"
   }

client-vue/src/components/SideMenu.vue

@@ -21,7 +21,7 @@
         </div>
 
         <div v-if="store.streamerList && store.streamerList.length > 0" class="menu-middle">
-            <side-menu-streamer v-for="streamer in sortedStreamers" :key="streamer.login" ref="streamer" :streamer="streamer" />
+            <side-menu-streamer v-for="streamer in sortedStreamers" :key="streamer.internalName" ref="streamer" :streamer="streamer" />
         </div>
 
         <!-- what was the point of this divider? -->

client-vue/src/components/SideMenuStreamer.vue

@@ -6,12 +6,12 @@
             'is-live': streamer.is_live,
             'is-capturing': streamer.is_capturing,
             'is-animated': store.clientCfg('animationsEnabled'),
-            'is-active': route.query.channel == streamer.login,
+            'is-active': route.query.channel == streamer.internalName,
             'is-converting': streamer.is_converting,
             'no-capture': streamer.no_capture,
             streamer: true,
         }"
-        :data-streamer="streamer.login"
+        :data-streamer="streamer.internalName"
     >
         <!-- :style="{
             'background-image': 'url(' + bannerUrl + ')',

client-vue/src/components/SideMenuStreamerVod.vue

@@ -138,8 +138,8 @@
         <!-- tooltip -->
         <div :class="{ tooltip: true, 'is-static': store.clientCfg('tooltipStatic') }">
             <div class="stream-channel">
-                {{ streamer.display_name }}
-                <template v-if="streamer.login.toLowerCase() != streamer.display_name.toLowerCase()"> ({{ streamer.login }}) </template>
+                {{ streamer.displayName }}
+                <template v-if="streamer.internalName.toLowerCase() != streamer.internalName.toLowerCase()"> ({{ streamer.displayName }}) </template>
             </div>
             <div class="stream-name">
                 {{ vod.basename }}

client-vue/src/components/streamer/VideoDownloadModal.vue

@@ -65,7 +65,7 @@ async function fetchTwitchVods() {
     let response;
 
     try {
-        response = await axios.get<ApiResponse>(`/api/v0/twitchapi/videos/${props.streamer.login}`);
+        response = await axios.get<ApiResponse>(`/api/v0/twitchapi/videos/${props.streamer.internalName}`);
     } catch (error) {
         if (axios.isAxiosError(error)) {
             console.error("fetchTwitchVods error", error.response);

client-vue/src/core/Providers/Base/BaseChannel.ts

@@ -10,9 +10,9 @@ import type { Providers } from "@common/Defs";
 
 export default class BaseChannel {
     provider: Providers = "base";
-    userid = "";
-    display_name = "";
-    login = "";
+    // userid = "";
+    // display_name = "";
+    // login = "";
     description = "";
     quality: VideoQuality[] = [];
     no_capture = false;

server/.eslintrc.js

@@ -40,7 +40,7 @@ module.exports = {
         "no-var": "error",
         "prefer-const": "error",
         "@typescript-eslint/consistent-type-imports": "error",
-        "log-module": "warn",
+        // "log-module": "warn",
         "no-throw-literal": "error",
         // "import/no-relative-parent-imports": "error",
     },

server/.vscode/launch.json

@@ -8,13 +8,10 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
+            "skipFiles": ["<node_internals>/**"],
             "program": "${workspaceFolder}\\src\\index.ts",
-            "outFiles": [
-                "${workspaceFolder}/**/*.js"
-            ]
+            "args": ["--port", "8081"],
+            "outFiles": ["${workspaceFolder}/**/*.js"]
         }
     ]
-}
+}

server/.yarnrc.yml

@@ -11,4 +11,4 @@ supportedArchitectures:
     - win32
     - linux-arm64
 
-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs

server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "livestreamdvr-server",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "description": "",
     "main": "index.ts",
     "scripts": {
@@ -79,7 +79,7 @@
         "winston-daily-rotate-file": "^4.7.1",
         "ws": "^8.13.0"
     },
-    "packageManager": "yarn@3.6.1",
+    "packageManager": "yarn@3.6.3",
     "engines": {
         "node": ">=18"
     },

server/src/Controllers/Auth.test.ts.bak

@@ -0,0 +1,87 @@
+import request from "supertest";
+import { getApp } from "../app";
+
+const app = getApp();
+
+describe("Auth Controller", () => {
+    describe("POST /auth/login", () => {
+        it("should return 400 if already authenticated", async () => {
+            const agent = request.agent(app);
+            await agent.post("/api/v0/auth/login").send({ password: "test" });
+            const response = await agent
+                .post("/api/v0/auth/login")
+                .send({ password: "test" });
+            expect(response.status).toBe(400);
+            expect(response.body.authenticated).toBe(true);
+            expect(response.body.message).toBe(
+                "You are already authenticated."
+            );
+        });
+
+        it("should return 400 if no password set", async () => {
+            const response = await request(app)
+                .post("/api/v0/auth/login")
+                .send({ password: "" });
+            expect(response.status).toBe(400);
+            expect(response.body.authenticated).toBe(false);
+            expect(response.body.message).toBe("No password set.");
+        });
+
+        it("should return 401 if password is incorrect", async () => {
+            const response = await request(app)
+                .post("/api/v0/auth/login")
+                .send({ password: "wrong" });
+            expect(response.status).toBe(401);
+            expect(response.body.authenticated).toBe(false);
+            expect(response.body.message).toBe("Incorrect password.");
+        });
+
+        it("should return 200 if password is correct", async () => {
+            const response = await request(app)
+                .post("/api/v0/auth/login")
+                .send({ password: "test" });
+            expect(response.status).toBe(200);
+            expect(response.body.authenticated).toBe(true);
+            expect(response.body.message).toBe("Login successful.");
+        });
+    });
+
+    describe("POST /auth/logout", () => {
+        it("should return 200 if logged out successfully", async () => {
+            const agent = request.agent(app);
+            await agent.post("/api/v0/auth/login").send({ password: "test" });
+            const response = await agent.post("/api/v0/auth/logout");
+            expect(response.status).toBe(200);
+            expect(response.body.authenticated).toBe(false);
+            expect(response.body.message).toBe("Logout successful.");
+        });
+    });
+
+    describe("GET /auth/check", () => {
+        it("should return 200 if not password protected", async () => {
+            const response = await request(app).get("/api/v0/auth/check");
+            expect(response.status).toBe(200);
+            expect(response.body.authentication).toBe(false);
+            expect(response.body.authenticated).toBe(false);
+            expect(response.body.message).toBe("No password protection.");
+        });
+
+        it("should return 200 if authenticated", async () => {
+            const agent = request.agent(app);
+            await agent.post("/api/v0/auth/login").send({ password: "test" });
+            const response = await agent.get("/api/v0/auth/check");
+            expect(response.status).toBe(200);
+            expect(response.body.authentication).toBe(true);
+            expect(response.body.authenticated).toBe(true);
+            expect(response.body.guest_mode).toBe(false);
+        });
+
+        it("should return 200 if not authenticated", async () => {
+            const response = await request(app).get("/api/v0/auth/check");
+            expect(response.status).toBe(200);
+            expect(response.body.authentication).toBe(true);
+            expect(response.body.authenticated).toBe(false);
+            expect(response.body.guest_mode).toBe(false);
+        });
+    });
+});