Merge pull request '🐛 fix: access cookie via header on logout' (#16) from feat/logout into main

Reviewed-on: #16

bun.lock

@@ -14,7 +14,7 @@
         "arctic": "^3.7.0",
         "aws-sdk": "^2.1692.0",
         "bcrypt": "^5.1.1",
-        "cookie": "^1.0.2",
+        "cookie": "^1.1.1",
         "elysia": "latest",
         "ioredis": "^5.6.1",
         "joi": "^17.13.3",
@@ -454,7 +454,7 @@
 
     "conventional-commit-types": ["conventional-commit-types@3.0.0", "", {}, "sha512-SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg=="],
 
-    "cookie": ["cookie@1.0.2", "", {}, "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA=="],
+    "cookie": ["cookie@1.1.1", "", {}, "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ=="],
 
     "core-util-is": ["core-util-is@1.0.3", "", {}, "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="],
 
@@ -1384,6 +1384,8 @@
 
     "cz-conventional-changelog/chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="],
 
+    "elysia/cookie": ["cookie@1.0.2", "", {}, "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA=="],
+
     "execa/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],
 
     "external-editor/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],

package.json

@@ -28,7 +28,7 @@
     "arctic": "^3.7.0",
     "aws-sdk": "^2.1692.0",
     "bcrypt": "^5.1.1",
-    "cookie": "^1.0.2",
+    "cookie": "^1.1.1",
     "elysia": "latest",
     "ioredis": "^5.6.1",
     "joi": "^17.13.3",

src/helpers/http/jwt/decode/types.ts

@@ -26,5 +26,5 @@ interface Preference {
   adultAlert: string;
   videoQuality: string;
   serviceDefaultId: null;
-  hideContries: any[];
+  hideContries: string[];
 }

src/modules/auth/controllers/logout.controller.ts

@@ -2,10 +2,12 @@ import { Context } from "elysia";
 import { mainErrorHandler } from "../../../helpers/error/handler";
 import { logoutService } from "../services/http/logout.service";
 import { returnWriteResponse } from "../../../helpers/callback/httpResponse";
+import { parse } from "cookie";
 
 export const logoutController = async (ctx: Context) => {
   try {
-    const jwtToken = ctx.cookie.auth_token?.value;
+    const jwtToken = parse(ctx.request.headers.get("auth_token") || "")
+      .auth_token as string;
     const serviceResponse = await logoutService(jwtToken);
     return returnWriteResponse(
       ctx.set,

src/modules/auth/controllers/tokenValidation.controller.ts

@@ -2,13 +2,12 @@ import { Context } from "elysia";
 import { tokenValidationService } from "../services/http/tokenValidation.service";
 import { returnReadResponse } from "../../../helpers/callback/httpResponse";
 import { mainErrorHandler } from "../../../helpers/error/handler";
+import { parse } from "cookie";
 
-export const tokenValidationController = (
-  ctx: Context & { body: { token: string } },
-) => {
+export const tokenValidationController = (ctx: Context) => {
   try {
-    const { token } = ctx.body;
-    const validationResult = tokenValidationService(token);
+    const { auth_token } = parse(ctx.request.headers.get("cookie") || "");
+    const validationResult = tokenValidationService(auth_token as string);
     return returnReadResponse(
       ctx.set,
       200,

src/modules/auth/services/http/logout.service.ts

@@ -4,7 +4,7 @@ import { jwtDecode } from "../../../../helpers/http/jwt/decode";
 import { redis } from "../../../../utils/databases/redis/connection";
 import { deleteUserSessionRepository } from "../../../userSession/repositories/deleteUserSession.repository";
 
-export const logoutService = async (jwtToken?: any) => {
+export const logoutService = async (jwtToken?: string) => {
   try {
     if (!jwtToken) throw new AppError(403, "No auth token provided");
 

src/modules/auth/services/http/tokenValidation.service.ts

@@ -1,11 +1,12 @@
-import { AppError } from "../../../../helpers/error/instances/app";
+import { ErrorForwarder } from "../../../../helpers/error/instances/forwarder";
 import { jwtDecode } from "../../../../helpers/http/jwt/decode";
 
 export const tokenValidationService = (payload: string) => {
   try {
+    if (!payload) return null;
     const decoded = jwtDecode(payload);
     return decoded;
   } catch (error) {
-    throw new AppError(500, "Token validation failed", error);
+    ErrorForwarder(error);
   }
 };