dn-react-router-toolkit 0.8.1 → 0.9.1

package/dist/api/create_api_handler.d.mts

@@ -4,8 +4,8 @@ import { TableRepository } from '../table/repository.mjs';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import { WithAuthHandler } from '../auth/with_auth.mjs';
 import 'drizzle-orm/node-postgres';
-import 'dn-react-toolkit/auth';
-import 'dn-react-toolkit/auth/server';
+import 'gw-auth';
+import 'gw-auth/server';
 
 type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
     withAuthAction: WithAuthHandler<ActionFunctionArgs>;

package/dist/api/create_api_handler.d.ts

@@ -4,8 +4,8 @@ import { TableRepository } from '../table/repository.js';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import { WithAuthHandler } from '../auth/with_auth.js';
 import 'drizzle-orm/node-postgres';
-import 'dn-react-toolkit/auth';
-import 'dn-react-toolkit/auth/server';
+import 'gw-auth';
+import 'gw-auth/server';
 
 type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
     withAuthAction: WithAuthHandler<ActionFunctionArgs>;

package/dist/api/create_api_handler.js

@@ -23,7 +23,6 @@ __export(create_api_handler_exports, {
   apiHandler: () => apiHandler
 });
 module.exports = __toCommonJS(create_api_handler_exports);
-var import_http = require("dn-react-toolkit/http");
 var import_drizzle_orm = require("drizzle-orm");
 var import_uuid = require("uuid");
 
@@ -65,6 +64,7 @@ function deserialize(data) {
 }
 
 // src/api/create_api_handler.ts
+var import_gw_response = require("gw-response");
 function apiHandler({
   withAuthAction,
   repository,
@@ -78,70 +78,73 @@ function apiHandler({
   };
   const action = withAuthAction((auth) => async ({ request }) => {
     if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
-      throw (0, import_http.UNAUTHORIZED)();
+      throw (0, import_gw_response.httpUnauthorized)({
+        code: "UNAUTHORIZED",
+        message: "\uC778\uC99D\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."
+      });
     }
     switch (request.method) {
       case "POST":
       case "PUT": {
-        try {
-          const serilaizedParams = await request.json();
-          const params = deserialize(serilaizedParams);
-          if (validators) {
-            const paramsForValidation = Object.keys(validators).filter(
-              (key) => Object.prototype.hasOwnProperty.call(validators, key)
-            );
-            for (const paramKey of paramsForValidation) {
-              const value = params[paramKey];
-              const validator = validators[paramKey];
-              if (validator?.validate && !validator.validate(value)) {
-                throw (0, import_http.BAD_REQUEST)(
-                  validator.message ? validator.message(value) : void 0
-                );
-              }
+        const serilaizedParams = await request.json();
+        const params = deserialize(serilaizedParams);
+        if (validators) {
+          const paramsForValidation = Object.keys(validators).filter(
+            (key) => Object.prototype.hasOwnProperty.call(validators, key)
+          );
+          for (const paramKey of paramsForValidation) {
+            const value = params[paramKey];
+            const validator = validators[paramKey];
+            if (validator?.validate && !validator.validate(value)) {
+              throw (0, import_gw_response.httpBadRequest)({
+                code: "BAD_REQUEST",
+                message: validator.message ? validator.message(value) : "\uC798\uBABB\uB41C \uC694\uCCAD\uC785\uB2C8\uB2E4."
+              });
             }
           }
-          const itemId = params.id || (0, import_uuid.v4)();
-          if (!params.id && existingConditions) {
-            const paramsForExistenceCheck = Object.keys(
-              existingConditions
-            ).filter(
-              (key) => Object.prototype.hasOwnProperty.call(params, key)
+        }
+        const itemId = params.id || (0, import_uuid.v4)();
+        if (!params.id && existingConditions) {
+          const paramsForExistenceCheck = Object.keys(
+            existingConditions
+          ).filter(
+            (key) => Object.prototype.hasOwnProperty.call(params, key)
+          );
+          if (paramsForExistenceCheck.length > 0) {
+            const where = (0, import_drizzle_orm.and)(
+              ...paramsForExistenceCheck.reduce((acc, key) => {
+                const condition = existingConditions[key];
+                if (condition) {
+                  acc.push(condition(params[key]));
+                }
+                return acc;
+              }, [])
             );
-            if (paramsForExistenceCheck.length > 0) {
-              const where = (0, import_drizzle_orm.and)(
-                ...paramsForExistenceCheck.reduce((acc, key) => {
-                  const condition = existingConditions[key];
-                  if (condition) {
-                    acc.push(condition(params[key]));
-                  }
-                  return acc;
-                }, [])
-              );
-              const existing = await repository.findAll({
-                limit: 1,
-                where
+            const existing = await repository.findAll({
+              limit: 1,
+              where
+            });
+            if (existing.length > 0) {
+              return (0, import_gw_response.httpConflict)({
+                code: "CONFLICT",
+                message: "\uC790\uB8CC\uAC00 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4."
               });
-              if (existing.length > 0) {
-                throw (0, import_http.CONFLICT)("\uC790\uB8CC\uAC00 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4.");
-              }
             }
           }
-          const values = {
-            id: itemId,
-            userId: injectUserId ? auth?.userId : void 0,
-            ...params
-          };
-          const item = await repository.save(values);
-          return (0, import_http.CREATED)(item);
-        } catch (error) {
-          if (error instanceof Error) {
-            throw (0, import_http.INTERNAL_SERVER_ERROR)(error.message);
-          }
-          throw error;
         }
+        const values = {
+          id: itemId,
+          userId: injectUserId ? auth?.userId : void 0,
+          ...params
+        };
+        const item = await repository.save(values);
+        return (0, import_gw_response.httpCreated)(item);
       }
       default:
-        throw (0, import_http.METHOD_NOT_ALLOWED)();
+        throw (0, import_gw_response.httpMethodNotAllowed)({
+          code: "METHOD_NOT_ALLOWED",
+          message: "\uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC740 \uBA54\uC11C\uB4DC\uC785\uB2C8\uB2E4."
+        });
     }
   });
   return {

package/dist/api/create_api_handler.mjs

@@ -1,12 +1,4 @@
 // src/api/create_api_handler.ts
-import {
-  BAD_REQUEST,
-  CONFLICT,
-  CREATED,
-  INTERNAL_SERVER_ERROR,
-  METHOD_NOT_ALLOWED,
-  UNAUTHORIZED
-} from "dn-react-toolkit/http";
 import {
   and
 } from "drizzle-orm";
@@ -50,6 +42,13 @@ function deserialize(data) {
 }
 
 // src/api/create_api_handler.ts
+import {
+  httpBadRequest,
+  httpConflict,
+  httpCreated,
+  httpMethodNotAllowed,
+  httpUnauthorized
+} from "gw-response";
 function apiHandler({
   withAuthAction,
   repository,
@@ -63,70 +62,73 @@ function apiHandler({
   };
   const action = withAuthAction((auth) => async ({ request }) => {
     if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
-      throw UNAUTHORIZED();
+      throw httpUnauthorized({
+        code: "UNAUTHORIZED",
+        message: "\uC778\uC99D\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."
+      });
     }
     switch (request.method) {
       case "POST":
       case "PUT": {
-        try {
-          const serilaizedParams = await request.json();
-          const params = deserialize(serilaizedParams);
-          if (validators) {
-            const paramsForValidation = Object.keys(validators).filter(
-              (key) => Object.prototype.hasOwnProperty.call(validators, key)
-            );
-            for (const paramKey of paramsForValidation) {
-              const value = params[paramKey];
-              const validator = validators[paramKey];
-              if (validator?.validate && !validator.validate(value)) {
-                throw BAD_REQUEST(
-                  validator.message ? validator.message(value) : void 0
-                );
-              }
+        const serilaizedParams = await request.json();
+        const params = deserialize(serilaizedParams);
+        if (validators) {
+          const paramsForValidation = Object.keys(validators).filter(
+            (key) => Object.prototype.hasOwnProperty.call(validators, key)
+          );
+          for (const paramKey of paramsForValidation) {
+            const value = params[paramKey];
+            const validator = validators[paramKey];
+            if (validator?.validate && !validator.validate(value)) {
+              throw httpBadRequest({
+                code: "BAD_REQUEST",
+                message: validator.message ? validator.message(value) : "\uC798\uBABB\uB41C \uC694\uCCAD\uC785\uB2C8\uB2E4."
+              });
             }
           }
-          const itemId = params.id || v4();
-          if (!params.id && existingConditions) {
-            const paramsForExistenceCheck = Object.keys(
-              existingConditions
-            ).filter(
-              (key) => Object.prototype.hasOwnProperty.call(params, key)
+        }
+        const itemId = params.id || v4();
+        if (!params.id && existingConditions) {
+          const paramsForExistenceCheck = Object.keys(
+            existingConditions
+          ).filter(
+            (key) => Object.prototype.hasOwnProperty.call(params, key)
+          );
+          if (paramsForExistenceCheck.length > 0) {
+            const where = and(
+              ...paramsForExistenceCheck.reduce((acc, key) => {
+                const condition = existingConditions[key];
+                if (condition) {
+                  acc.push(condition(params[key]));
+                }
+                return acc;
+              }, [])
             );
-            if (paramsForExistenceCheck.length > 0) {
-              const where = and(
-                ...paramsForExistenceCheck.reduce((acc, key) => {
-                  const condition = existingConditions[key];
-                  if (condition) {
-                    acc.push(condition(params[key]));
-                  }
-                  return acc;
-                }, [])
-              );
-              const existing = await repository.findAll({
-                limit: 1,
-                where
+            const existing = await repository.findAll({
+              limit: 1,
+              where
+            });
+            if (existing.length > 0) {
+              return httpConflict({
+                code: "CONFLICT",
+                message: "\uC790\uB8CC\uAC00 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4."
               });
-              if (existing.length > 0) {
-                throw CONFLICT("\uC790\uB8CC\uAC00 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4.");
-              }
             }
           }
-          const values = {
-            id: itemId,
-            userId: injectUserId ? auth?.userId : void 0,
-            ...params
-          };
-          const item = await repository.save(values);
-          return CREATED(item);
-        } catch (error) {
-          if (error instanceof Error) {
-            throw INTERNAL_SERVER_ERROR(error.message);
-          }
-          throw error;
         }
+        const values = {
+          id: itemId,
+          userId: injectUserId ? auth?.userId : void 0,
+          ...params
+        };
+        const item = await repository.save(values);
+        return httpCreated(item);
       }
       default:
-        throw METHOD_NOT_ALLOWED();
+        throw httpMethodNotAllowed({
+          code: "METHOD_NOT_ALLOWED",
+          message: "\uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC740 \uBA54\uC11C\uB4DC\uC785\uB2C8\uB2E4."
+        });
     }
   });
   return {

package/dist/api/create_handler.d.mts

@@ -1,13 +1,13 @@
 import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
-import { AuthService, PasswordRecoveryService, ThirdpartyAuth, JWTManager, ThirdpartySignupTokenPayload } from 'dn-react-toolkit/auth/server';
-import { FileService } from 'dn-react-toolkit/file/server';
+import { AuthService, PasswordRecoveryService, AuthProvider, JWTManager, ThirdpartyAuthPayload } from 'gw-auth/server';
+import { FileService } from 'gw-file/server';
 
-declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenManager, }: {
+declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, authProviders, signupTokenManager, }: {
     authService: AuthService<TFile>;
     fileService: FileService<TFile>;
     passwordRecoveryService: PasswordRecoveryService;
-    getThirdPartyAuth: (provider: string) => ThirdpartyAuth;
-    signupTokenManager: JWTManager<ThirdpartySignupTokenPayload>;
+    authProviders: AuthProvider[];
+    signupTokenManager: JWTManager<ThirdpartyAuthPayload>;
 }) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<Response | (({ request }: ActionFunctionArgs<any> | LoaderFunctionArgs<any>) => Promise<Response>)>;
 
 export { createAPIHandler };

package/dist/api/create_handler.d.ts

@@ -1,13 +1,13 @@
 import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
-import { AuthService, PasswordRecoveryService, ThirdpartyAuth, JWTManager, ThirdpartySignupTokenPayload } from 'dn-react-toolkit/auth/server';
-import { FileService } from 'dn-react-toolkit/file/server';
+import { AuthService, PasswordRecoveryService, AuthProvider, JWTManager, ThirdpartyAuthPayload } from 'gw-auth/server';
+import { FileService } from 'gw-file/server';
 
-declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenManager, }: {
+declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, authProviders, signupTokenManager, }: {
     authService: AuthService<TFile>;
     fileService: FileService<TFile>;
     passwordRecoveryService: PasswordRecoveryService;
-    getThirdPartyAuth: (provider: string) => ThirdpartyAuth;
-    signupTokenManager: JWTManager<ThirdpartySignupTokenPayload>;
+    authProviders: AuthProvider[];
+    signupTokenManager: JWTManager<ThirdpartyAuthPayload>;
 }) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<Response | (({ request }: ActionFunctionArgs<any> | LoaderFunctionArgs<any>) => Promise<Response>)>;
 
 export { createAPIHandler };

package/dist/api/create_handler.js

@@ -23,8 +23,7 @@ __export(create_handler_exports, {
   createAPIHandler: () => createAPIHandler
 });
 module.exports = __toCommonJS(create_handler_exports);
-var import_http = require("dn-react-toolkit/http");
-var import_server = require("dn-react-toolkit/auth/server");
+var import_server = require("gw-auth/server");
 
 // src/auth/with_auth.ts
 var toResponse = (result) => {
@@ -50,31 +49,31 @@ function createWithStrictAuthHandler({ authService }) {
         arg.request
       );
       if (accessToken) {
-        const payload = await authService.accessTokenManager.verify(accessToken);
-        if (payload) {
-          return respond(payload);
+        const verifyResult = await authService.accessTokenManager.verify(accessToken);
+        if (verifyResult.isOk) {
+          const payload = verifyResult.value;
+          if (payload) {
+            return respond(payload);
+          }
         }
       }
       const refreshToken = await authService.getRefreshTokenFromCookies(
         arg.request
       );
       if (refreshToken) {
-        try {
-          const newAccessToken = await authService.refreshAccessToken(refreshToken);
-          const setCookieHeader = await authService.getAccessTokenSetCookie(
-            newAccessToken
-          );
-          const headers = new Headers();
-          headers.append("Set-Cookie", setCookieHeader);
-          const payload = authService.accessTokenManager.decode(newAccessToken);
-          return respond(payload, headers);
-        } catch (e) {
-          console.log(e);
-          const setCookieHeader = await authService.getRefreshTokenSetCookie(void 0);
-          const headers = new Headers();
-          headers.append("Set-Cookie", setCookieHeader);
-          return respond(void 0, headers);
+        const refreshResult = await authService.refreshAccessToken(refreshToken);
+        if (refreshResult.isErr) {
+          const setCookieHeader2 = await authService.getRefreshTokenSetCookie(void 0);
+          const headers2 = new Headers();
+          headers2.append("Set-Cookie", setCookieHeader2);
+          return respond(void 0, headers2);
         }
+        const newAccessToken = refreshResult.value;
+        const setCookieHeader = await authService.getAccessTokenSetCookie(newAccessToken);
+        const headers = new Headers();
+        headers.append("Set-Cookie", setCookieHeader);
+        const payload = authService.accessTokenManager.decode(newAccessToken);
+        return respond(payload, headers);
       }
       return respond(void 0);
     };
@@ -86,12 +85,13 @@ function createWithStrictAuthHandler({ authService }) {
 var import_react_router = require("react-router");
 
 // src/api/create_handler.ts
-var import_server2 = require("dn-react-toolkit/file/server");
+var import_server2 = require("gw-file/server");
+var import_gw_response = require("gw-response");
 var createAPIHandler = ({
   authService,
   fileService,
   passwordRecoveryService,
-  getThirdPartyAuth,
+  authProviders,
   signupTokenManager
 }) => {
   const handler = async (args) => {
@@ -106,7 +106,7 @@ var createAPIHandler = ({
             switch (method) {
               case "GET": {
                 return withAuth(
-                  (auth) => ({ request: request2 }) => (0, import_server.findAuthHandler)(auth)(request2)
+                  (auth) => ({ request: request2 }) => (0, import_server.findAuthHandler)(auth)()
                 );
               }
             }
@@ -126,13 +126,10 @@ var createAPIHandler = ({
                 const provider = slug[2];
                 switch (method) {
                   case "POST": {
-                    return (0, import_server.loginWithThirdPartyHandler)(
-                      request,
-                      {
-                        provider,
-                        getThirdPartyAuth
-                      }
-                    );
+                    return (0, import_server.loginWithThirdPartyHandler)(request, {
+                      provider,
+                      authProviders
+                    });
                   }
                 }
               }
@@ -171,14 +168,11 @@ var createAPIHandler = ({
               default: {
                 switch (method) {
                   case "POST": {
-                    return (0, import_server.signUpWithThirdpartyHandler)(
-                      request,
-                      {
-                        authService,
-                        fileService,
-                        signupTokenManager
-                      }
-                    );
+                    return (0, import_server.signUpWithThirdpartyHandler)(request, {
+                      authService,
+                      fileService,
+                      signupTokenManager
+                    });
                   }
                 }
               }
@@ -191,7 +185,7 @@ var createAPIHandler = ({
                 return (0, import_server.thirdpartyAuthCallbackHandler)(request, {
                   provider,
                   authService,
-                  getThirdPartyAuth
+                  authProviders
                 });
               }
             }
@@ -214,9 +208,9 @@ var createAPIHandler = ({
             switch (method) {
               case "POST": {
                 return withAuth(
-                  (auth) => ({ request: request2 }) => (0, import_server2.uploadFileHandler)({ fileService })(
-                    auth
-                  )(request2)
+                  (auth) => ({ request: request2 }) => (0, import_server2.uploadFileHandler)({ fileService })(request2, {
+                    userId: auth?.userId
+                  })
                 )(args);
               }
             }
@@ -228,7 +222,7 @@ var createAPIHandler = ({
                 return withAuth(
                   (auth) => () => (0, import_server2.deleteFileHandler)({
                     fileRepository: fileService.fileRepository
-                  })({ fileId })(auth)()
+                  })({ fileId, userId: auth?.userId })()
                 );
               }
             }
@@ -236,7 +230,10 @@ var createAPIHandler = ({
         }
       }
       default: {
-        return (0, import_http.NOT_FOUND)();
+        return (0, import_gw_response.httpNotFound)({
+          code: "RESOURCE_NOT_FOUND",
+          message: "\uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."
+        });
       }
     }
   };