dn-react-router-toolkit 0.4.4 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/dist/api/create_api_handler.d.mts +28 -0
  2. package/dist/api/create_api_handler.d.ts +28 -0
  3. package/dist/api/create_api_handler.js +148 -0
  4. package/dist/api/create_api_handler.mjs +132 -0
  5. package/dist/api/create_handler.d.mts +1 -1
  6. package/dist/api/create_handler.d.ts +1 -1
  7. package/dist/api/create_handler.js +27 -25
  8. package/dist/api/create_handler.mjs +27 -25
  9. package/dist/api/index.js +27 -25
  10. package/dist/api/index.mjs +27 -25
  11. package/dist/api/item_api_handler.d.mts +18 -0
  12. package/dist/api/item_api_handler.d.ts +18 -0
  13. package/dist/api/item_api_handler.js +55 -0
  14. package/dist/api/item_api_handler.mjs +30 -0
  15. package/dist/auth/index.d.mts +1 -2
  16. package/dist/auth/index.d.ts +1 -2
  17. package/dist/auth/index.js +13 -21
  18. package/dist/auth/index.mjs +12 -20
  19. package/dist/auth/with_auth.d.mts +3 -3
  20. package/dist/auth/with_auth.d.ts +3 -3
  21. package/dist/auth/with_auth.js +13 -21
  22. package/dist/auth/with_auth.mjs +12 -20
  23. package/dist/crud/crud_form.d.mts +13 -0
  24. package/dist/crud/crud_form.d.ts +13 -0
  25. package/dist/crud/crud_form.js +88 -0
  26. package/dist/crud/crud_form.mjs +55 -0
  27. package/dist/crud/crud_form_provider.d.mts +34 -0
  28. package/dist/crud/crud_form_provider.d.ts +34 -0
  29. package/dist/crud/crud_form_provider.js +160 -0
  30. package/dist/crud/crud_form_provider.mjs +124 -0
  31. package/dist/crud/crud_loader.d.mts +21 -0
  32. package/dist/crud/crud_loader.d.ts +21 -0
  33. package/dist/crud/crud_loader.js +288 -0
  34. package/dist/crud/crud_loader.mjs +273 -0
  35. package/dist/crud/crud_page.d.mts +25 -0
  36. package/dist/crud/crud_page.d.ts +25 -0
  37. package/dist/crud/crud_page.js +645 -0
  38. package/dist/crud/crud_page.mjs +616 -0
  39. package/dist/crud/generate_handlers.d.mts +15 -0
  40. package/dist/crud/generate_handlers.d.ts +15 -0
  41. package/dist/crud/generate_handlers.js +39 -0
  42. package/dist/crud/generate_handlers.mjs +14 -0
  43. package/dist/crud/generate_pages.d.mts +11 -0
  44. package/dist/crud/generate_pages.d.ts +11 -0
  45. package/dist/crud/generate_pages.js +52 -0
  46. package/dist/crud/generate_pages.mjs +17 -0
  47. package/dist/crud/generate_routes.d.mts +5 -0
  48. package/dist/crud/generate_routes.d.ts +5 -0
  49. package/dist/crud/generate_routes.js +62 -0
  50. package/dist/crud/generate_routes.mjs +27 -0
  51. package/dist/crud/index.d.mts +21 -0
  52. package/dist/crud/index.d.ts +21 -0
  53. package/dist/crud/index.js +970 -0
  54. package/dist/crud/index.mjs +945 -0
  55. package/dist/db/index.d.mts +4 -0
  56. package/dist/db/index.d.ts +4 -0
  57. package/dist/db/index.js +46 -0
  58. package/dist/db/index.mjs +8 -0
  59. package/dist/index.d.mts +3 -2
  60. package/dist/index.d.ts +3 -2
  61. package/dist/table/buttons.d.mts +10 -0
  62. package/dist/table/buttons.d.ts +10 -0
  63. package/dist/table/buttons.js +102 -0
  64. package/dist/table/buttons.mjs +71 -0
  65. package/dist/table/index.d.mts +9 -0
  66. package/dist/table/index.d.ts +9 -0
  67. package/dist/table/index.js +570 -0
  68. package/dist/table/index.mjs +543 -0
  69. package/dist/table/item_loader.d.mts +12 -0
  70. package/dist/table/item_loader.d.ts +12 -0
  71. package/dist/table/item_loader.js +51 -0
  72. package/dist/table/item_loader.mjs +26 -0
  73. package/dist/table/loader.d.mts +28 -0
  74. package/dist/table/loader.d.ts +28 -0
  75. package/dist/table/loader.js +70 -0
  76. package/dist/table/loader.mjs +48 -0
  77. package/dist/table/page.d.mts +27 -0
  78. package/dist/table/page.d.ts +27 -0
  79. package/dist/table/page.js +444 -0
  80. package/dist/table/page.mjs +415 -0
  81. package/dist/table/repository.d.mts +38 -0
  82. package/dist/table/repository.d.ts +38 -0
  83. package/dist/table/repository.js +76 -0
  84. package/dist/table/repository.mjs +56 -0
  85. package/dist/table/table.d.mts +27 -0
  86. package/dist/table/table.d.ts +27 -0
  87. package/dist/table/table.js +290 -0
  88. package/dist/table/table.mjs +255 -0
  89. package/package.json +21 -3
  90. package/dist/auth/temp_user.d.mts +0 -5
  91. package/dist/auth/temp_user.d.ts +0 -5
  92. package/dist/auth/temp_user.js +0 -18
  93. package/dist/auth/temp_user.mjs +0 -0
package/dist/api/index.js CHANGED
@@ -36,7 +36,7 @@ var toResponse = (result) => {
36
36
  }
37
37
  return Response.json(result);
38
38
  };
39
- function createWithAuthHandler({ authService }) {
39
+ function createWithStrictAuthHandler({ authService }) {
40
40
  return function(fn) {
41
41
  const handler = async function(arg) {
42
42
  const respond = async (auth, headers = new Headers()) => {
@@ -53,9 +53,7 @@ function createWithAuthHandler({ authService }) {
53
53
  arg.request
54
54
  );
55
55
  if (accessToken) {
56
- const payload = await authService.accessTokenManager.verify(
57
- accessToken
58
- );
56
+ const payload = await authService.accessTokenManager.verify(accessToken);
59
57
  if (payload) {
60
58
  return respond(payload);
61
59
  }
@@ -65,23 +63,17 @@ function createWithAuthHandler({ authService }) {
65
63
  );
66
64
  if (refreshToken) {
67
65
  try {
68
- const newAccessToken = await authService.refreshAccessToken(
69
- refreshToken
70
- );
66
+ const newAccessToken = await authService.refreshAccessToken(refreshToken);
71
67
  const setCookieHeader = await authService.getAccessTokenSetCookie(
72
68
  newAccessToken
73
69
  );
74
70
  const headers = new Headers();
75
71
  headers.append("Set-Cookie", setCookieHeader);
76
- const payload = authService.accessTokenManager.decode(
77
- newAccessToken
78
- );
72
+ const payload = authService.accessTokenManager.decode(newAccessToken);
79
73
  return respond(payload, headers);
80
74
  } catch (e) {
81
75
  console.log(e);
82
- const setCookieHeader = await authService.getRefreshTokenSetCookie(
83
- null
84
- );
76
+ const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
85
77
  const headers = new Headers();
86
78
  headers.append("Set-Cookie", setCookieHeader);
87
79
  return respond(void 0, headers);
@@ -109,7 +101,7 @@ var createAPIHandler = ({
109
101
  const { request, params } = args;
110
102
  const method = request.method.toUpperCase();
111
103
  const slug = params["*"] ? params["*"].split("/") : [];
112
- const withAuth = createWithAuthHandler({ authService });
104
+ const withAuth = createWithStrictAuthHandler({ authService });
113
105
  switch (slug[0]) {
114
106
  case "auth": {
115
107
  switch (slug[1]) {
@@ -137,10 +129,13 @@ var createAPIHandler = ({
137
129
  const provider = slug[2];
138
130
  switch (method) {
139
131
  case "POST": {
140
- return (0, import_server.loginWithThirdPartyHandler)(request, {
141
- provider,
142
- getThirdPartyAuth
143
- });
132
+ return (0, import_server.loginWithThirdPartyHandler)(
133
+ request,
134
+ {
135
+ provider,
136
+ getThirdPartyAuth
137
+ }
138
+ );
144
139
  }
145
140
  }
146
141
  }
@@ -179,11 +174,14 @@ var createAPIHandler = ({
179
174
  default: {
180
175
  switch (method) {
181
176
  case "POST": {
182
- return (0, import_server.signUpWithThirdpartyHandler)(request, {
183
- authService,
184
- fileService,
185
- signupTokenManager
186
- });
177
+ return (0, import_server.signUpWithThirdpartyHandler)(
178
+ request,
179
+ {
180
+ authService,
181
+ fileService,
182
+ signupTokenManager
183
+ }
184
+ );
187
185
  }
188
186
  }
189
187
  }
@@ -207,7 +205,9 @@ var createAPIHandler = ({
207
205
  });
208
206
  }
209
207
  case "reset-password": {
210
- return (0, import_server.resetPasswordHandler)(request, { passwordRecoveryService });
208
+ return (0, import_server.resetPasswordHandler)(request, {
209
+ passwordRecoveryService
210
+ });
211
211
  }
212
212
  }
213
213
  }
@@ -217,7 +217,9 @@ var createAPIHandler = ({
217
217
  switch (method) {
218
218
  case "POST": {
219
219
  return withAuth(
220
- (auth) => ({ request: request2 }) => (0, import_server2.uploadFileHandler)({ fileService })(auth)(request2)
220
+ (auth) => ({ request: request2 }) => (0, import_server2.uploadFileHandler)({ fileService })(
221
+ auth
222
+ )(request2)
221
223
  )(args);
222
224
  }
223
225
  }
@@ -21,7 +21,7 @@ var toResponse = (result) => {
21
21
  }
22
22
  return Response.json(result);
23
23
  };
24
- function createWithAuthHandler({ authService }) {
24
+ function createWithStrictAuthHandler({ authService }) {
25
25
  return function(fn) {
26
26
  const handler = async function(arg) {
27
27
  const respond = async (auth, headers = new Headers()) => {
@@ -38,9 +38,7 @@ function createWithAuthHandler({ authService }) {
38
38
  arg.request
39
39
  );
40
40
  if (accessToken) {
41
- const payload = await authService.accessTokenManager.verify(
42
- accessToken
43
- );
41
+ const payload = await authService.accessTokenManager.verify(accessToken);
44
42
  if (payload) {
45
43
  return respond(payload);
46
44
  }
@@ -50,23 +48,17 @@ function createWithAuthHandler({ authService }) {
50
48
  );
51
49
  if (refreshToken) {
52
50
  try {
53
- const newAccessToken = await authService.refreshAccessToken(
54
- refreshToken
55
- );
51
+ const newAccessToken = await authService.refreshAccessToken(refreshToken);
56
52
  const setCookieHeader = await authService.getAccessTokenSetCookie(
57
53
  newAccessToken
58
54
  );
59
55
  const headers = new Headers();
60
56
  headers.append("Set-Cookie", setCookieHeader);
61
- const payload = authService.accessTokenManager.decode(
62
- newAccessToken
63
- );
57
+ const payload = authService.accessTokenManager.decode(newAccessToken);
64
58
  return respond(payload, headers);
65
59
  } catch (e) {
66
60
  console.log(e);
67
- const setCookieHeader = await authService.getRefreshTokenSetCookie(
68
- null
69
- );
61
+ const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
70
62
  const headers = new Headers();
71
63
  headers.append("Set-Cookie", setCookieHeader);
72
64
  return respond(void 0, headers);
@@ -97,7 +89,7 @@ var createAPIHandler = ({
97
89
  const { request, params } = args;
98
90
  const method = request.method.toUpperCase();
99
91
  const slug = params["*"] ? params["*"].split("/") : [];
100
- const withAuth = createWithAuthHandler({ authService });
92
+ const withAuth = createWithStrictAuthHandler({ authService });
101
93
  switch (slug[0]) {
102
94
  case "auth": {
103
95
  switch (slug[1]) {
@@ -125,10 +117,13 @@ var createAPIHandler = ({
125
117
  const provider = slug[2];
126
118
  switch (method) {
127
119
  case "POST": {
128
- return loginWithThirdPartyHandler(request, {
129
- provider,
130
- getThirdPartyAuth
131
- });
120
+ return loginWithThirdPartyHandler(
121
+ request,
122
+ {
123
+ provider,
124
+ getThirdPartyAuth
125
+ }
126
+ );
132
127
  }
133
128
  }
134
129
  }
@@ -167,11 +162,14 @@ var createAPIHandler = ({
167
162
  default: {
168
163
  switch (method) {
169
164
  case "POST": {
170
- return signUpWithThirdpartyHandler(request, {
171
- authService,
172
- fileService,
173
- signupTokenManager
174
- });
165
+ return signUpWithThirdpartyHandler(
166
+ request,
167
+ {
168
+ authService,
169
+ fileService,
170
+ signupTokenManager
171
+ }
172
+ );
175
173
  }
176
174
  }
177
175
  }
@@ -195,7 +193,9 @@ var createAPIHandler = ({
195
193
  });
196
194
  }
197
195
  case "reset-password": {
198
- return resetPasswordHandler(request, { passwordRecoveryService });
196
+ return resetPasswordHandler(request, {
197
+ passwordRecoveryService
198
+ });
199
199
  }
200
200
  }
201
201
  }
@@ -205,7 +205,9 @@ var createAPIHandler = ({
205
205
  switch (method) {
206
206
  case "POST": {
207
207
  return withAuth(
208
- (auth) => ({ request: request2 }) => uploadFileHandler({ fileService })(auth)(request2)
208
+ (auth) => ({ request: request2 }) => uploadFileHandler({ fileService })(
209
+ auth
210
+ )(request2)
209
211
  )(args);
210
212
  }
211
213
  }
@@ -0,0 +1,18 @@
1
+ import { Table } from 'drizzle-orm';
2
+ import { LoaderFunctionArgs } from 'react-router';
3
+ import { TableRepository } from '../table/repository.mjs';
4
+ import { WithAuthHandler } from '../auth/with_auth.mjs';
5
+ import 'drizzle-orm/pg-core';
6
+ import 'dn-react-toolkit/auth';
7
+ import 'dn-react-toolkit/auth/server';
8
+
9
+ type ItemAPIHandlerOptions<T extends Table, TSelect> = {
10
+ withAuthAction: WithAuthHandler<LoaderFunctionArgs>;
11
+ repository: TableRepository<T, TSelect>;
12
+ };
13
+ declare function itemApiHandler<T extends Table, TSelect>({ withAuthAction, repository, }: ItemAPIHandlerOptions<T, TSelect>): {
14
+ loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
15
+ action: (arg: LoaderFunctionArgs<any>) => Promise<unknown> | unknown;
16
+ };
17
+
18
+ export { type ItemAPIHandlerOptions, itemApiHandler };
@@ -0,0 +1,18 @@
1
+ import { Table } from 'drizzle-orm';
2
+ import { LoaderFunctionArgs } from 'react-router';
3
+ import { TableRepository } from '../table/repository.js';
4
+ import { WithAuthHandler } from '../auth/with_auth.js';
5
+ import 'drizzle-orm/pg-core';
6
+ import 'dn-react-toolkit/auth';
7
+ import 'dn-react-toolkit/auth/server';
8
+
9
+ type ItemAPIHandlerOptions<T extends Table, TSelect> = {
10
+ withAuthAction: WithAuthHandler<LoaderFunctionArgs>;
11
+ repository: TableRepository<T, TSelect>;
12
+ };
13
+ declare function itemApiHandler<T extends Table, TSelect>({ withAuthAction, repository, }: ItemAPIHandlerOptions<T, TSelect>): {
14
+ loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
15
+ action: (arg: LoaderFunctionArgs<any>) => Promise<unknown> | unknown;
16
+ };
17
+
18
+ export { type ItemAPIHandlerOptions, itemApiHandler };
@@ -0,0 +1,55 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+
20
+ // src/api/item_api_handler.ts
21
+ var item_api_handler_exports = {};
22
+ __export(item_api_handler_exports, {
23
+ itemApiHandler: () => itemApiHandler
24
+ });
25
+ module.exports = __toCommonJS(item_api_handler_exports);
26
+ var import_http = require("dn-react-toolkit/http");
27
+ var import_react_router = require("react-router");
28
+ function itemApiHandler({
29
+ withAuthAction,
30
+ repository
31
+ }) {
32
+ const loader = async ({ request }) => {
33
+ return {};
34
+ };
35
+ const action = withAuthAction((auth) => async ({ params, request }) => {
36
+ if (!auth || auth.role !== "admin") {
37
+ return (0, import_http.UNAUTHORIZED)();
38
+ }
39
+ switch (request.method) {
40
+ case "DELETE": {
41
+ const itemId = params.itemId;
42
+ await repository.delete(itemId);
43
+ return {};
44
+ }
45
+ }
46
+ });
47
+ return {
48
+ loader,
49
+ action
50
+ };
51
+ }
52
+ // Annotate the CommonJS export names for ESM import in node:
53
+ 0 && (module.exports = {
54
+ itemApiHandler
55
+ });
@@ -0,0 +1,30 @@
1
+ // src/api/item_api_handler.ts
2
+ import { UNAUTHORIZED } from "dn-react-toolkit/http";
3
+ import "react-router";
4
+ function itemApiHandler({
5
+ withAuthAction,
6
+ repository
7
+ }) {
8
+ const loader = async ({ request }) => {
9
+ return {};
10
+ };
11
+ const action = withAuthAction((auth) => async ({ params, request }) => {
12
+ if (!auth || auth.role !== "admin") {
13
+ return UNAUTHORIZED();
14
+ }
15
+ switch (request.method) {
16
+ case "DELETE": {
17
+ const itemId = params.itemId;
18
+ await repository.delete(itemId);
19
+ return {};
20
+ }
21
+ }
22
+ });
23
+ return {
24
+ loader,
25
+ action
26
+ };
27
+ }
28
+ export {
29
+ itemApiHandler
30
+ };
@@ -1,6 +1,5 @@
1
- export { WithAuthHandler, createWithAuthHandler, createWithTempAuthHandler } from './with_auth.mjs';
1
+ export { WithAuthHandler, createWithAuthHandler, createWithStrictAuthHandler } from './with_auth.mjs';
2
2
  export { ReactRouterCookieManager } from './cookie_store.mjs';
3
- export { TempUserPayload } from './temp_user.mjs';
4
3
  import 'dn-react-toolkit/auth';
5
4
  import 'dn-react-toolkit/auth/server';
6
5
  import 'react-router';
@@ -1,6 +1,5 @@
1
- export { WithAuthHandler, createWithAuthHandler, createWithTempAuthHandler } from './with_auth.js';
1
+ export { WithAuthHandler, createWithAuthHandler, createWithStrictAuthHandler } from './with_auth.js';
2
2
  export { ReactRouterCookieManager } from './cookie_store.js';
3
- export { TempUserPayload } from './temp_user.js';
4
3
  import 'dn-react-toolkit/auth';
5
4
  import 'dn-react-toolkit/auth/server';
6
5
  import 'react-router';
@@ -22,7 +22,7 @@ var auth_exports = {};
22
22
  __export(auth_exports, {
23
23
  ReactRouterCookieManager: () => ReactRouterCookieManager,
24
24
  createWithAuthHandler: () => createWithAuthHandler,
25
- createWithTempAuthHandler: () => createWithTempAuthHandler
25
+ createWithStrictAuthHandler: () => createWithStrictAuthHandler
26
26
  });
27
27
  module.exports = __toCommonJS(auth_exports);
28
28
 
@@ -34,7 +34,7 @@ var toResponse = (result) => {
34
34
  }
35
35
  return Response.json(result);
36
36
  };
37
- function createWithAuthHandler({ authService }) {
37
+ function createWithStrictAuthHandler({ authService }) {
38
38
  return function(fn) {
39
39
  const handler = async function(arg) {
40
40
  const respond = async (auth, headers = new Headers()) => {
@@ -51,9 +51,7 @@ function createWithAuthHandler({ authService }) {
51
51
  arg.request
52
52
  );
53
53
  if (accessToken) {
54
- const payload = await authService.accessTokenManager.verify(
55
- accessToken
56
- );
54
+ const payload = await authService.accessTokenManager.verify(accessToken);
57
55
  if (payload) {
58
56
  return respond(payload);
59
57
  }
@@ -63,23 +61,17 @@ function createWithAuthHandler({ authService }) {
63
61
  );
64
62
  if (refreshToken) {
65
63
  try {
66
- const newAccessToken = await authService.refreshAccessToken(
67
- refreshToken
68
- );
64
+ const newAccessToken = await authService.refreshAccessToken(refreshToken);
69
65
  const setCookieHeader = await authService.getAccessTokenSetCookie(
70
66
  newAccessToken
71
67
  );
72
68
  const headers = new Headers();
73
69
  headers.append("Set-Cookie", setCookieHeader);
74
- const payload = authService.accessTokenManager.decode(
75
- newAccessToken
76
- );
70
+ const payload = authService.accessTokenManager.decode(newAccessToken);
77
71
  return respond(payload, headers);
78
72
  } catch (e) {
79
73
  console.log(e);
80
- const setCookieHeader = await authService.getRefreshTokenSetCookie(
81
- null
82
- );
74
+ const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
83
75
  const headers = new Headers();
84
76
  headers.append("Set-Cookie", setCookieHeader);
85
77
  return respond(void 0, headers);
@@ -90,13 +82,13 @@ function createWithAuthHandler({ authService }) {
90
82
  return handler;
91
83
  };
92
84
  }
93
- function createWithTempAuthHandler({
85
+ function createWithAuthHandler({
94
86
  authService,
95
87
  tempUserTokenManager,
96
88
  tempUserCookieManager
97
89
  }) {
98
90
  return function(fn) {
99
- const withAuthHandler = createWithAuthHandler({
91
+ const withAuthHandler = createWithStrictAuthHandler({
100
92
  authService
101
93
  });
102
94
  const handler = withAuthHandler((auth) => async (args) => {
@@ -113,7 +105,9 @@ function createWithTempAuthHandler({
113
105
  });
114
106
  return res;
115
107
  };
116
- const tempUserToken = await tempUserCookieManager.parse(args.request);
108
+ const tempUserToken = await tempUserCookieManager.parse(
109
+ args.request
110
+ );
117
111
  if (tempUserToken) {
118
112
  const tempUserPayload = await tempUserTokenManager.verify(tempUserToken);
119
113
  if (tempUserPayload) {
@@ -131,9 +125,7 @@ function createWithTempAuthHandler({
131
125
  role: user.role
132
126
  });
133
127
  const headers = new Headers();
134
- const setCookie = await tempUserCookieManager.serialize(
135
- newTempUserToken
136
- );
128
+ const setCookie = await tempUserCookieManager.serialize(newTempUserToken);
137
129
  headers.append("Set-Cookie", setCookie);
138
130
  const newTempUserPayload = tempUserTokenManager.decode(newTempUserToken);
139
131
  return respond(newTempUserPayload, headers);
@@ -174,5 +166,5 @@ var ReactRouterCookieManager = class {
174
166
  0 && (module.exports = {
175
167
  ReactRouterCookieManager,
176
168
  createWithAuthHandler,
177
- createWithTempAuthHandler
169
+ createWithStrictAuthHandler
178
170
  });
@@ -6,7 +6,7 @@ var toResponse = (result) => {
6
6
  }
7
7
  return Response.json(result);
8
8
  };
9
- function createWithAuthHandler({ authService }) {
9
+ function createWithStrictAuthHandler({ authService }) {
10
10
  return function(fn) {
11
11
  const handler = async function(arg) {
12
12
  const respond = async (auth, headers = new Headers()) => {
@@ -23,9 +23,7 @@ function createWithAuthHandler({ authService }) {
23
23
  arg.request
24
24
  );
25
25
  if (accessToken) {
26
- const payload = await authService.accessTokenManager.verify(
27
- accessToken
28
- );
26
+ const payload = await authService.accessTokenManager.verify(accessToken);
29
27
  if (payload) {
30
28
  return respond(payload);
31
29
  }
@@ -35,23 +33,17 @@ function createWithAuthHandler({ authService }) {
35
33
  );
36
34
  if (refreshToken) {
37
35
  try {
38
- const newAccessToken = await authService.refreshAccessToken(
39
- refreshToken
40
- );
36
+ const newAccessToken = await authService.refreshAccessToken(refreshToken);
41
37
  const setCookieHeader = await authService.getAccessTokenSetCookie(
42
38
  newAccessToken
43
39
  );
44
40
  const headers = new Headers();
45
41
  headers.append("Set-Cookie", setCookieHeader);
46
- const payload = authService.accessTokenManager.decode(
47
- newAccessToken
48
- );
42
+ const payload = authService.accessTokenManager.decode(newAccessToken);
49
43
  return respond(payload, headers);
50
44
  } catch (e) {
51
45
  console.log(e);
52
- const setCookieHeader = await authService.getRefreshTokenSetCookie(
53
- null
54
- );
46
+ const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
55
47
  const headers = new Headers();
56
48
  headers.append("Set-Cookie", setCookieHeader);
57
49
  return respond(void 0, headers);
@@ -62,13 +54,13 @@ function createWithAuthHandler({ authService }) {
62
54
  return handler;
63
55
  };
64
56
  }
65
- function createWithTempAuthHandler({
57
+ function createWithAuthHandler({
66
58
  authService,
67
59
  tempUserTokenManager,
68
60
  tempUserCookieManager
69
61
  }) {
70
62
  return function(fn) {
71
- const withAuthHandler = createWithAuthHandler({
63
+ const withAuthHandler = createWithStrictAuthHandler({
72
64
  authService
73
65
  });
74
66
  const handler = withAuthHandler((auth) => async (args) => {
@@ -85,7 +77,9 @@ function createWithTempAuthHandler({
85
77
  });
86
78
  return res;
87
79
  };
88
- const tempUserToken = await tempUserCookieManager.parse(args.request);
80
+ const tempUserToken = await tempUserCookieManager.parse(
81
+ args.request
82
+ );
89
83
  if (tempUserToken) {
90
84
  const tempUserPayload = await tempUserTokenManager.verify(tempUserToken);
91
85
  if (tempUserPayload) {
@@ -103,9 +97,7 @@ function createWithTempAuthHandler({
103
97
  role: user.role
104
98
  });
105
99
  const headers = new Headers();
106
- const setCookie = await tempUserCookieManager.serialize(
107
- newTempUserToken
108
- );
100
+ const setCookie = await tempUserCookieManager.serialize(newTempUserToken);
109
101
  headers.append("Set-Cookie", setCookie);
110
102
  const newTempUserPayload = tempUserTokenManager.decode(newTempUserToken);
111
103
  return respond(newTempUserPayload, headers);
@@ -145,5 +137,5 @@ var ReactRouterCookieManager = class {
145
137
  export {
146
138
  ReactRouterCookieManager,
147
139
  createWithAuthHandler,
148
- createWithTempAuthHandler
140
+ createWithStrictAuthHandler
149
141
  };
@@ -5,13 +5,13 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
5
5
  type Handler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (arg: T) => Promise<unknown> | unknown;
6
6
  type InputFN = (auth?: AccessTokenPayload) => Handler<LoaderFunctionArgs> | Handler<ActionFunctionArgs>;
7
7
  type WithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (fn: InputFN) => Handler<T>;
8
- declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
8
+ declare function createWithStrictAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
9
9
  authService: AuthService;
10
10
  }): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
11
- declare function createWithTempAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService, tempUserTokenManager, tempUserCookieManager, }: {
11
+ declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService, tempUserTokenManager, tempUserCookieManager, }: {
12
12
  authService: AuthService;
13
13
  tempUserTokenManager: JWTManager<AccessTokenPayload>;
14
14
  tempUserCookieManager: CookieManager;
15
15
  }): <THandler extends Handler<T>>(fn: (auth: AccessTokenPayload) => THandler) => THandler;
16
16
 
17
- export { type WithAuthHandler, createWithAuthHandler, createWithTempAuthHandler };
17
+ export { type WithAuthHandler, createWithAuthHandler, createWithStrictAuthHandler };
@@ -5,13 +5,13 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
5
5
  type Handler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (arg: T) => Promise<unknown> | unknown;
6
6
  type InputFN = (auth?: AccessTokenPayload) => Handler<LoaderFunctionArgs> | Handler<ActionFunctionArgs>;
7
7
  type WithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs> = (fn: InputFN) => Handler<T>;
8
- declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
8
+ declare function createWithStrictAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
9
9
  authService: AuthService;
10
10
  }): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
11
- declare function createWithTempAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService, tempUserTokenManager, tempUserCookieManager, }: {
11
+ declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService, tempUserTokenManager, tempUserCookieManager, }: {
12
12
  authService: AuthService;
13
13
  tempUserTokenManager: JWTManager<AccessTokenPayload>;
14
14
  tempUserCookieManager: CookieManager;
15
15
  }): <THandler extends Handler<T>>(fn: (auth: AccessTokenPayload) => THandler) => THandler;
16
16
 
17
- export { type WithAuthHandler, createWithAuthHandler, createWithTempAuthHandler };
17
+ export { type WithAuthHandler, createWithAuthHandler, createWithStrictAuthHandler };