🐛 fix: user client info in oauth flow

src/helpers/http/userHeader/getUserHeaderInformation/index.ts

@@ -1,25 +1,36 @@
 import { Context } from "elysia";
-import { UAParser } from "ua-parser-js";
 import { UserHeaderInformation } from "./types";
 
-export const getUserHeaderInformation = (
-  ctx: Context
-): UserHeaderInformation => {
-  const headers = ctx.request.headers;
-  const userAgentHeader = headers.get("user-agent") || "desktop";
-  const userAgent = new UAParser(userAgentHeader);
+export interface ClientInfoHeader {
+  os: string;
+  osVersion: string;
+  browser: string;
+  browserVersion: string;
+  deviceType: string;
+  ip: string;
+}
 
-  const userIP =
-    headers.get("cf-connecting-ip") ||
-    headers.get("x-real-ip") ||
-    headers.get("x-forwarded-for")?.split(",")[0] ||
-    "Unknown IP";
+export const getUserHeaderInformation = (
+  ctx: Context,
+): UserHeaderInformation => {
+  const clientInfoHeader = JSON.parse(
+    (ctx.request.headers.get("x-client-info") as string) ??
+      ("unknown" as string),
+  ) as ClientInfoHeader;
+
+  console.log("Client Info Header:", clientInfoHeader);
 
   const userHeaderInformation = {
-    ip: userIP,
-    deviceType: userAgent.getDevice().type || "desktop",
-    deviceOS: userAgent.getOS().name + " " + userAgent.getOS().version,
-    browser: userAgent.getBrowser().name + " " + userAgent.getBrowser().version,
+    ip: clientInfoHeader.ip ?? "unknown",
+    deviceType: clientInfoHeader.deviceType ?? "unknown",
+    deviceOS:
+      (clientInfoHeader.os ?? "unknown") +
+      " " +
+      (clientInfoHeader.osVersion ?? "unknown"),
+    browser:
+      (clientInfoHeader.browser ?? "unknown") +
+      " " +
+      (clientInfoHeader.browserVersion ?? "unknown"),
   };
 
   return userHeaderInformation;

src/index.ts

@@ -14,5 +14,5 @@ const app = new Elysia()
   .listen(process.env.APP_PORT || 3000);
 
 console.log(
-  `🦊 Elysia is running at ${app.server?.hostname}:${app.server?.port}`
+  `🦊 Elysia is running at ${app.server?.hostname}:${app.server?.port}`,
 );

src/middleware/index.ts

@@ -2,5 +2,5 @@ import Elysia from "elysia";
 import { appAccessTokenMiddleware } from "./global/appAccessToken.middleware";
 
 export const middleware = new Elysia({ name: "middlewareModule" }).use(
-  appAccessTokenMiddleware
+  appAccessTokenMiddleware,
 );

src/modules/auth/providers/google.provider.ts

@@ -1,11 +1,14 @@
 import { Google } from "arctic";
+import { getOauthProviders } from "../../../config/oauthProvider";
 
 export const googleProvider = (
-  callbackURI = `${process.env.APP_PROTOCOL}://${process.env.APP_DOMAIN}${process.env.GOOGLE_DEFAULT_CALLBACK}`
+  callbackURI = `${process.env.APP_PROTOCOL}://${process.env.APP_DOMAIN}:${
+    process.env.APP_PORT
+  }/${getOauthProviders().find((p) => p.name === "google")?.client_callback}`,
 ) => {
   return new Google(
     process.env.GOOGLE_CLIENT_ID!,
     process.env.GOOGLE_CLIENT_SECRET!,
-    callbackURI
+    callbackURI,
   );
 };

src/modules/userSession/repositories/createUserSession.repository.ts

@@ -23,14 +23,13 @@ type CreateUserSessionResponse = Prisma.UserSessionGetPayload<{
 }>;
 
 export const createUserSessionRepository = async (
-  data: Prisma.UserSessionUncheckedCreateInput
+  data: Prisma.UserSessionUncheckedCreateInput,
 ) => {
   try {
     return await userSessionModel.create({
       data,
       select: {
         id: true,
-        deviceType: true,
         isAuthenticated: true,
         validUntil: true,
         user: {
@@ -42,6 +41,12 @@ export const createUserSessionRepository = async (
             avatar: true,
             birthDate: true,
             bioProfile: true,
+            preference: {
+              omit: {
+                updatedAt: true,
+                createdAt: true,
+              },
+            },
           },
         },
       },