chore(shared): export page and user endpoints as resource endpoints (#1560)

ascariandrea · web-flow · commit ee868b6f3667 · 2024-10-16T19:53:59.000+02:00
diff --git a/packages/@liexp/shared/src/endpoints/User.endpoints.ts b/packages/@liexp/shared/src/endpoints/User.endpoints.ts
@@ -12,16 +12,7 @@ import {
 } from "../io/http/User.js";
 import { ResourceEndpoints } from "./types.js";
 
-export const UserLogin = Endpoint({
-  Method: "POST",
-  getPath: () => "/users/login",
-  Input: {
-    Body: t.strict({ username: t.string, password: t.string }),
-  },
-  Output: t.strict({ data: t.strict({ token: t.string }) }),
-});
-
-export const UserCreate = Endpoint({
+const UserCreate = Endpoint({
   Method: "POST",
   getPath: () => "/users",
   Input: {
@@ -38,7 +29,7 @@ export const UserCreate = Endpoint({
   }),
 });
 
-export const UserEdit = Endpoint({
+const UserEdit = Endpoint({
   Method: "PUT",
   getPath: ({ id }) => `/users/${id}`,
   Input: {
@@ -50,7 +41,7 @@ export const UserEdit = Endpoint({
   }),
 });
 
-export const SignUpUser = Endpoint({
+const SignUpUser = Endpoint({
   Method: "POST",
   getPath: () => "/users/signup",
   Input: {
@@ -61,7 +52,7 @@ export const SignUpUser = Endpoint({
   }),
 });
 
-export const UserGet = Endpoint({
+const UserGet = Endpoint({
   Method: "GET",
   getPath: ({ id }) => `/users/${id}`,
   Input: {
@@ -71,7 +62,7 @@ export const UserGet = Endpoint({
   Output: t.strict({ data: User }),
 });
 
-export const GetUserMe = Endpoint({
+const GetUserMe = Endpoint({
   Method: "GET",
   getPath: () => `/users/me`,
   Input: {
@@ -80,7 +71,7 @@ export const GetUserMe = Endpoint({
   Output: Output(User, "user"),
 });
 
-export const EditUserMe = Endpoint({
+const EditUserMe = Endpoint({
   Method: "PUT",
   getPath: () => `/users/me`,
   Input: {
@@ -89,7 +80,7 @@ export const EditUserMe = Endpoint({
   Output: Output(User, "user"),
 });
 
-export const UserList = Endpoint({
+const UserList = Endpoint({
   Method: "GET",
   getPath: () => "/users",
   Input: {
@@ -101,22 +92,33 @@ export const UserList = Endpoint({
   Output: t.strict({ data: t.array(User), total: t.number }),
 });
 
-const UserTGTokenGenerate = Endpoint({
+const UserDelete = Endpoint({
+  Method: "DELETE",
+  getPath: ({ id }) => `/users/${id}`,
+  Input: {
+    Params: t.type({ id: UUID }),
+  },
+  Output: t.undefined,
+});
+
+// custom
+
+const UserLogin = Endpoint({
   Method: "POST",
-  getPath: () => "/users/tg/token",
+  getPath: () => "/users/login",
   Input: {
-    Body: t.strict({}),
+    Body: t.strict({ username: t.string, password: t.string }),
   },
   Output: t.strict({ data: t.strict({ token: t.string }) }),
 });
 
-const UserDelete = Endpoint({
-  Method: "DELETE",
-  getPath: ({ id }) => `/users/${id}`,
+const UserTGTokenGenerate = Endpoint({
+  Method: "POST",
+  getPath: () => "/users/tg/token",
   Input: {
-    Params: t.type({ id: UUID }),
+    Body: t.strict({}),
   },
-  Output: t.undefined,
+  Output: t.strict({ data: t.strict({ token: t.string }) }),
 });
 
 export const users = ResourceEndpoints({
@@ -130,5 +132,6 @@ export const users = ResourceEndpoints({
     EditUserMe,
     SignUpUser,
     UserTGTokenGenerate,
+    UserLogin,
   },
 });
diff --git a/packages/@liexp/shared/src/endpoints/index.ts b/packages/@liexp/shared/src/endpoints/index.ts
@@ -119,6 +119,4 @@ const AddEndpoint = GetEndpointSubscriber((e): IOError => {
   };
 });
 
-export const UserLogin = User.UserLogin;
-export const PageDeleteMany = Page.DeleteManyPage;
 export { AddEndpoint, Endpoints, Uploads };
diff --git a/packages/@liexp/shared/src/endpoints/page.endpoints.ts b/packages/@liexp/shared/src/endpoints/page.endpoints.ts
@@ -6,7 +6,7 @@ import { GetListQuery } from "../io/http/Query/index.js";
 import { Page } from "../io/http/index.js";
 import { ResourceEndpoints } from "./types.js";
 
-export const ListPages = Endpoint({
+const ListPages = Endpoint({
   Method: "GET",
   getPath: () => "/pages",
   Input: {
@@ -18,7 +18,7 @@ export const ListPages = Endpoint({
   Output: t.strict({ data: t.array(Page.Page) }),
 });
 
-export const GetPage = Endpoint({
+const GetPage = Endpoint({
   Method: "GET",
   getPath: ({ id }) => `/pages/${id}`,
   Input: {
@@ -27,7 +27,7 @@ export const GetPage = Endpoint({
   Output: t.strict({ data: Page.Page }),
 });
 
-export const CreatePage = Endpoint({
+const CreatePage = Endpoint({
   Method: "POST",
   getPath: () => `/pages`,
   Input: {
@@ -36,7 +36,7 @@ export const CreatePage = Endpoint({
   Output: t.strict({ data: Page.Page }),
 });
 
-export const EditPage = Endpoint({
+const EditPage = Endpoint({
   Method: "PUT",
   getPath: ({ id }) => `/pages/${id}`,
   Input: {
@@ -46,7 +46,7 @@ export const EditPage = Endpoint({
   Output: t.strict({ data: Page.Page }),
 });
 
-export const DeletePage = Endpoint({
+const DeletePage = Endpoint({
   Method: "DELETE",
   getPath: ({ id }) => `/pages/${id}`,
   Input: {
@@ -55,7 +55,7 @@ export const DeletePage = Endpoint({
   Output: t.strict({ data: Page.Page }),
 });
 
-export const DeleteManyPage = Endpoint({
+const DeleteManyPage = Endpoint({
   Method: "DELETE",
   getPath: () => `/pages`,
   Input: {
@@ -70,5 +70,7 @@ export const pages = ResourceEndpoints({
   List: ListPages,
   Edit: EditPage,
   Delete: DeletePage,
-  Custom: {},
+  Custom: {
+    DeleteMany: DeleteManyPage,
+  },
 });
diff --git a/services/api/src/routes/pages/deleteManyPage.controller.ts b/services/api/src/routes/pages/deleteManyPage.controller.ts
@@ -1,8 +1,5 @@
 import { pipe } from "@liexp/core/lib/fp/index.js";
-import {
-  PageDeleteMany,
-  AddEndpoint,
-} from "@liexp/shared/lib/endpoints/index.js";
+import { Endpoints, AddEndpoint } from "@liexp/shared/lib/endpoints/index.js";
 import { type Router } from "express";
 import * as TE from "fp-ts/lib/TaskEither.js";
 import { In } from "typeorm";
@@ -12,7 +9,7 @@ import { authenticationHandler } from "#utils/authenticationHandler.js";
 
 export const MakeDeleteManyPageRoute = (r: Router, ctx: RouteContext): void => {
   AddEndpoint(r, authenticationHandler(["admin:delete"])(ctx))(
-    PageDeleteMany,
+    Endpoints.Page.Custom.DeleteMany,
     ({ query: { ids } }) => {
       return pipe(
         ctx.db.find(PageEntity, { where: { id: In(ids) } }),
diff --git a/services/api/src/routes/users/userLogin.controller.ts b/services/api/src/routes/users/userLogin.controller.ts
@@ -1,5 +1,5 @@
 import { pipe } from "@liexp/core/lib/fp/index.js";
-import { AddEndpoint, UserLogin } from "@liexp/shared/lib/endpoints/index.js";
+import { AddEndpoint, Endpoints } from "@liexp/shared/lib/endpoints/index.js";
 import { UserStatusApproved } from "@liexp/shared/lib/io/http/User.js";
 import { type Router } from "express";
 import * as TE from "fp-ts/lib/TaskEither.js";
@@ -14,46 +14,49 @@ import { type RouteContext } from "#routes/route.types.js";
 import * as passwordUtils from "#utils/password.utils.js";
 
 export const MakeUserLoginRoute = (r: Router, ctx: RouteContext): void => {
-  AddEndpoint(r)(UserLogin, ({ body: { username, password } }) => {
-    ctx.logger.debug.log("Login user with username or email %s", username);
-    // void pipe(
-    //   passwordUtils.hash(password),
-    //   ctx.logger.debug.logInTaskEither('Password hash %s')
-    // )()
-    return pipe(
-      ctx.db.findOneOrFail(UserEntity, {
-        where: [{ username }, { email: username }],
-      }),
-      TE.mapLeft(() => NotFoundError("User")),
-      LoggerService.TE.debug(ctx, "User %O"),
-      TE.filterOrElse(
-        (e) => e.status === UserStatusApproved.value,
-        () => ServerError(["User not approved"]),
-      ),
-      TE.chainFirst((user) =>
-        pipe(
-          passwordUtils.verify(password, user.passwordHash),
-          TE.chain((isEqual) => {
-            if (!isEqual) {
-              return TE.left(BadRequestError("Password is wrong"));
-            }
-            return TE.right(isEqual);
-          }),
+  AddEndpoint(r)(
+    Endpoints.User.Custom.UserLogin,
+    ({ body: { username, password } }) => {
+      ctx.logger.debug.log("Login user with username or email %s", username);
+      // void pipe(
+      //   passwordUtils.hash(password),
+      //   ctx.logger.debug.logInTaskEither('Password hash %s')
+      // )()
+      return pipe(
+        ctx.db.findOneOrFail(UserEntity, {
+          where: [{ username }, { email: username }],
+        }),
+        TE.mapLeft(() => NotFoundError("User")),
+        LoggerService.TE.debug(ctx, "User %O"),
+        TE.filterOrElse(
+          (e) => e.status === UserStatusApproved.value,
+          () => ServerError(["User not approved"]),
         ),
-      ),
-      TE.chain(({ passwordHash, ...user }) =>
-        TE.fromIO(
-          ctx.jwt.signUser({
-            ...user,
-            createdAt: user.createdAt.toISOString(),
-            updatedAt: user.updatedAt.toISOString(),
-          }),
+        TE.chainFirst((user) =>
+          pipe(
+            passwordUtils.verify(password, user.passwordHash),
+            TE.chain((isEqual) => {
+              if (!isEqual) {
+                return TE.left(BadRequestError("Password is wrong"));
+              }
+              return TE.right(isEqual);
+            }),
+          ),
         ),
-      ),
-      TE.map((token) => ({
-        body: { data: { token } },
-        statusCode: 201,
-      })),
-    );
-  });
+        TE.chain(({ passwordHash, ...user }) =>
+          TE.fromIO(
+            ctx.jwt.signUser({
+              ...user,
+              createdAt: user.createdAt.toISOString(),
+              updatedAt: user.updatedAt.toISOString(),
+            }),
+          ),
+        ),
+        TE.map((token) => ({
+          body: { data: { token } },
+          statusCode: 201,
+        })),
+      );
+    },
+  );
 };
