dn-react-router-toolkit 0.9.0 → 0.9.2

package/dist/api/default_api_handler.d.mts

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

package/dist/api/default_api_handler.d.ts

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

package/dist/api/{create_handler.js → default_api_handler.js}

@@ -17,14 +17,13 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/api/create_handler.ts
-var create_handler_exports = {};
-__export(create_handler_exports, {
-  createAPIHandler: () => createAPIHandler
+// src/api/default_api_handler.ts
+var default_api_handler_exports = {};
+__export(default_api_handler_exports, {
+  defaultAPIHandler: () => defaultAPIHandler
 });
-module.exports = __toCommonJS(create_handler_exports);
-var import_http = require("dn-react-toolkit/http");
-var import_server = require("dn-react-toolkit/auth/server");
+module.exports = __toCommonJS(default_api_handler_exports);
+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);
     };
@@ -85,13 +84,14 @@ function createWithStrictAuthHandler({ authService }) {
 // src/auth/cookie_manager.ts
 var import_react_router = require("react-router");
 
-// src/api/create_handler.ts
-var import_server2 = require("dn-react-toolkit/file/server");
-var createAPIHandler = ({
+// src/api/default_api_handler.ts
+var import_server2 = require("gw-file/server");
+var import_gw_response = require("gw-response");
+var defaultAPIHandler = ({
   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."
+        });
       }
     }
   };
@@ -244,5 +241,5 @@ var createAPIHandler = ({
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createAPIHandler
+  defaultAPIHandler
 });

package/dist/api/{create_handler.mjs → default_api_handler.mjs}

@@ -1,5 +1,4 @@
-// src/api/create_handler.ts
-import { NOT_FOUND } from "dn-react-toolkit/http";
+// src/api/default_api_handler.ts
 import {
   findAuthHandler,
   loginHandler,
@@ -11,7 +10,7 @@ import {
   signupHandler,
   signUpWithThirdpartyHandler,
   thirdpartyAuthCallbackHandler
-} from "dn-react-toolkit/auth/server";
+} from "gw-auth/server";
 
 // src/auth/with_auth.ts
 var toResponse = (result) => {
@@ -37,31 +36,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);
     };
@@ -72,16 +71,17 @@ function createWithStrictAuthHandler({ authService }) {
 // src/auth/cookie_manager.ts
 import { createCookie } from "react-router";
 
-// src/api/create_handler.ts
+// src/api/default_api_handler.ts
 import {
   deleteFileHandler,
   uploadFileHandler
-} from "dn-react-toolkit/file/server";
-var createAPIHandler = ({
+} from "gw-file/server";
+import { httpNotFound } from "gw-response";
+var defaultAPIHandler = ({
   authService,
   fileService,
   passwordRecoveryService,
-  getThirdPartyAuth,
+  authProviders,
   signupTokenManager
 }) => {
   const handler = async (args) => {
@@ -96,7 +96,7 @@ var createAPIHandler = ({
             switch (method) {
               case "GET": {
                 return withAuth(
-                  (auth) => ({ request: request2 }) => findAuthHandler(auth)(request2)
+                  (auth) => ({ request: request2 }) => findAuthHandler(auth)()
                 );
               }
             }
@@ -116,13 +116,10 @@ var createAPIHandler = ({
                 const provider = slug[2];
                 switch (method) {
                   case "POST": {
-                    return loginWithThirdPartyHandler(
-                      request,
-                      {
-                        provider,
-                        getThirdPartyAuth
-                      }
-                    );
+                    return loginWithThirdPartyHandler(request, {
+                      provider,
+                      authProviders
+                    });
                   }
                 }
               }
@@ -161,14 +158,11 @@ var createAPIHandler = ({
               default: {
                 switch (method) {
                   case "POST": {
-                    return signUpWithThirdpartyHandler(
-                      request,
-                      {
-                        authService,
-                        fileService,
-                        signupTokenManager
-                      }
-                    );
+                    return signUpWithThirdpartyHandler(request, {
+                      authService,
+                      fileService,
+                      signupTokenManager
+                    });
                   }
                 }
               }
@@ -181,7 +175,7 @@ var createAPIHandler = ({
                 return thirdpartyAuthCallbackHandler(request, {
                   provider,
                   authService,
-                  getThirdPartyAuth
+                  authProviders
                 });
               }
             }
@@ -204,9 +198,9 @@ var createAPIHandler = ({
             switch (method) {
               case "POST": {
                 return withAuth(
-                  (auth) => ({ request: request2 }) => uploadFileHandler({ fileService })(
-                    auth
-                  )(request2)
+                  (auth) => ({ request: request2 }) => uploadFileHandler({ fileService })(request2, {
+                    userId: auth?.userId
+                  })
                 )(args);
               }
             }
@@ -218,7 +212,7 @@ var createAPIHandler = ({
                 return withAuth(
                   (auth) => () => deleteFileHandler({
                     fileRepository: fileService.fileRepository
-                  })({ fileId })(auth)()
+                  })({ fileId, userId: auth?.userId })()
                 );
               }
             }
@@ -226,12 +220,15 @@ var createAPIHandler = ({
         }
       }
       default: {
-        return NOT_FOUND();
+        return httpNotFound({
+          code: "RESOURCE_NOT_FOUND",
+          message: "\uB9AC\uC18C\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."
+        });
       }
     }
   };
   return handler;
 };
 export {
-  createAPIHandler
+  defaultAPIHandler
 };

package/dist/api/index.d.mts

@@ -1,12 +1,13 @@
-export { createAPIHandler } from './create_handler.mjs';
-export { APIHandlerOptions, apiHandler } from './create_api_handler.mjs';
-export { ItemAPIHandlerOptions, itemApiHandler } from './item_api_handler.mjs';
+export { defaultAPIHandler } from './default_api_handler.mjs';
+export { APIHandlerOptions, resourceHandler } from './resource_handler.mjs';
+export { PutResourceExistingConditions, PutResourceHandlerOptions, PutResourceValidators, putResourceHandler } from './put_resource_handler.mjs';
 import 'react-router';
-import 'dn-react-toolkit/auth/server';
-import 'dn-react-toolkit/file/server';
-import 'drizzle-orm';
+import 'gw-auth/server';
+import 'gw-file/server';
+import 'gw-result';
 import '../table/repository.mjs';
+import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
 import 'drizzle-orm/pg-core';
 import '../auth/with_auth.mjs';
-import 'dn-react-toolkit/auth';
+import 'gw-auth';

package/dist/api/index.d.ts

@@ -1,12 +1,13 @@
-export { createAPIHandler } from './create_handler.js';
-export { APIHandlerOptions, apiHandler } from './create_api_handler.js';
-export { ItemAPIHandlerOptions, itemApiHandler } from './item_api_handler.js';
+export { defaultAPIHandler } from './default_api_handler.js';
+export { APIHandlerOptions, resourceHandler } from './resource_handler.js';
+export { PutResourceExistingConditions, PutResourceHandlerOptions, PutResourceValidators, putResourceHandler } from './put_resource_handler.js';
 import 'react-router';
-import 'dn-react-toolkit/auth/server';
-import 'dn-react-toolkit/file/server';
-import 'drizzle-orm';
+import 'gw-auth/server';
+import 'gw-file/server';
+import 'gw-result';
 import '../table/repository.js';
+import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
 import 'drizzle-orm/pg-core';
 import '../auth/with_auth.js';
-import 'dn-react-toolkit/auth';
+import 'gw-auth';