From c30a86876181c6a0f3b080162e6b5b14d7049986 Mon Sep 17 00:00:00 2001
From: inmake <inmake.ru@gmail.com>
Date: Sat, 22 Mar 2025 11:50:44 +0500
Subject: [PATCH] upd

---
 src/controllers/authController.ts  |  2 ++
 src/controllers/usersController.ts | 14 +-------------
 src/services/apps/create.ts        |  8 ++++++--
 src/services/{user => auth}/me.ts  |  5 +++--
 4 files changed, 12 insertions(+), 17 deletions(-)
 rename src/services/{user => auth}/me.ts (71%)

diff --git a/src/controllers/authController.ts b/src/controllers/authController.ts
index b7708bb..7eb0b9c 100644
--- a/src/controllers/authController.ts
+++ b/src/controllers/authController.ts
@@ -2,6 +2,7 @@ import { Elysia, t } from "elysia";
 import login from "../services/auth/login";
 import authMiddleware from "../middlewares/auth";
 import logout from "../services/auth/logout";
+import me from "../services/auth/me";
 
 const authController = new Elysia({ prefix: "/auth" })
   .post("/login", async ({ body }) => await login(body), {
@@ -17,6 +18,7 @@ const authController = new Elysia({ prefix: "/auth" })
   //   }),
   // })
   .use(authMiddleware)
+  .get("/me", async ({ auth }) => await me(auth))
   .get(
     "/logout",
     async ({ headers }) => {
diff --git a/src/controllers/usersController.ts b/src/controllers/usersController.ts
index 6220764..a5bd2ad 100644
--- a/src/controllers/usersController.ts
+++ b/src/controllers/usersController.ts
@@ -1,18 +1,6 @@
 import Elysia from "elysia";
 import authMiddleware from "../middlewares/auth";
-import me from "../services/user/me";
 
-type AuthContext = {
-  auth: {
-    userId: string;
-  };
-};
-
-const usersController = new Elysia({ prefix: "/users" })
-  .use(authMiddleware)
-  .get("/me", async (context) => {
-    const userId = (context as AuthContext).auth.userId;
-    return await me(userId);
-  });
+const usersController = new Elysia({ prefix: "/users" }).use(authMiddleware);
 
 export default usersController;
diff --git a/src/services/apps/create.ts b/src/services/apps/create.ts
index f074397..434fb2e 100644
--- a/src/services/apps/create.ts
+++ b/src/services/apps/create.ts
@@ -13,7 +13,9 @@ export default async function createApp(
   }
 ) {
   if (auth.userId !== "hmac-user") {
-    return error(403, "Forbidden");
+    return error(403, {
+      error: "Forbidden",
+    });
   }
 
   try {
@@ -22,7 +24,9 @@ export default async function createApp(
     });
 
     if (existingApp.length) {
-      return error(400, "App with this name already exists");
+      return error(400, {
+        error: "App with this name already exists",
+      });
     }
 
     const apps = await db
diff --git a/src/services/user/me.ts b/src/services/auth/me.ts
similarity index 71%
rename from src/services/user/me.ts
rename to src/services/auth/me.ts
index f15d9f3..a4c2927 100644
--- a/src/services/user/me.ts
+++ b/src/services/auth/me.ts
@@ -2,11 +2,12 @@ import { eq } from "drizzle-orm";
 import db from "../../db";
 import { usersTable } from "../../db/schema";
 import { error } from "elysia";
+import type { AuthContext } from "../../middlewares/auth";
 
-export default async function me(userId: string) {
+export default async function me(auth: AuthContext) {
   try {
     const user = await db.query.usersTable.findFirst({
-      where: eq(usersTable.id, userId),
+      where: eq(usersTable.id, auth.userId),
       columns: {
         id: true,
         email: true,