dn-react-router-toolkit 0.3.7 → 0.3.9

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 (17) hide show
  1. package/dist/api/create_handler.d.mts +1 -2
  2. package/dist/api/create_handler.d.ts +1 -2
  3. package/dist/api/create_handler.js +18 -53
  4. package/dist/api/create_handler.mjs +18 -53
  5. package/dist/api/index.js +18 -53
  6. package/dist/api/index.mjs +18 -53
  7. package/dist/auth/index.js +17 -51
  8. package/dist/auth/index.mjs +17 -51
  9. package/dist/auth/with_auth.d.mts +1 -2
  10. package/dist/auth/with_auth.d.ts +1 -2
  11. package/dist/auth/with_auth.js +17 -51
  12. package/dist/auth/with_auth.mjs +17 -51
  13. package/dist/seo/index.js +12 -0
  14. package/dist/seo/index.mjs +35 -0
  15. package/dist/seo/seo.js +12 -0
  16. package/dist/seo/seo.mjs +35 -0
  17. package/package.json +1 -1
package/dist/api/create_handler.d.mts CHANGED
@@ -2,8 +2,7 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
2
2
  import { AuthService, PasswordRecoveryService, ThirdpartyAuth } from 'dn-react-toolkit/auth/server';
3
3
  import { FileService } from 'dn-react-toolkit/file/server';
4
4
 
5
- declare const createAPIHandler: <TFile>({ siteOrigin, authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
6
- siteOrigin: string;
5
+ declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
7
6
  authService: AuthService<TFile>;
8
7
  fileService: FileService<TFile>;
9
8
  passwordRecoveryService: PasswordRecoveryService;
package/dist/api/create_handler.d.ts CHANGED
@@ -2,8 +2,7 @@ import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
2
2
  import { AuthService, PasswordRecoveryService, ThirdpartyAuth } from 'dn-react-toolkit/auth/server';
3
3
  import { FileService } from 'dn-react-toolkit/file/server';
4
4
 
5
- declare const createAPIHandler: <TFile>({ siteOrigin, authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
6
- siteOrigin: string;
5
+ declare const createAPIHandler: <TFile>({ authService, fileService, passwordRecoveryService, getThirdPartyAuth, signupTokenSecret, }: {
7
6
  authService: AuthService<TFile>;
8
7
  fileService: FileService<TFile>;
9
8
  passwordRecoveryService: PasswordRecoveryService;
package/dist/api/create_handler.js CHANGED
@@ -41,54 +41,24 @@ __export(auth_exports, {
41
41
  __reExport(auth_exports, require("dn-react-toolkit/auth"));
42
42
 
43
43
  // src/auth/with_auth.ts
44
- function createWithAuthHandler({
45
- siteOrigin,
46
- authService
47
- }) {
44
+ var toResponse = (result) => {
45
+ if (result instanceof Response) {
46
+ return result;
47
+ }
48
+ return Response.json(result);
49
+ };
50
+ function createWithAuthHandler({ authService }) {
48
51
  return function(fn) {
49
52
  const handler = async function(arg) {
50
- const respond = async (auth, headers) => {
51
- const userAgent = arg.request.headers.get("User-Agent") || "";
52
- const res = await fn(auth)(arg);
53
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
54
- if (res instanceof Response) {
55
- const mergedHeaders = new Headers(res.headers);
56
- if (headers) {
57
- headers.forEach((value, key) => {
58
- mergedHeaders.set(key, value);
59
- });
60
- }
61
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
62
- const data = await res.json();
63
- return new Response(
64
- JSON.stringify({
65
- AUTH: auth,
66
- userAgent,
67
- ...data
68
- }),
69
- {
70
- status: res.status,
71
- headers: mergedHeaders
72
- }
73
- );
74
- }
75
- return new Response(res.body, {
76
- status: res.status,
77
- headers: mergedHeaders
78
- });
79
- }
80
- headers?.set("Content-Type", "application/json");
81
- return new Response(
82
- JSON.stringify({
83
- AUTH: auth,
84
- userAgent,
85
- ...res
86
- }),
87
- { status: 200, headers }
88
- );
89
- }
90
- headers?.set("Content-Type", "application/json");
91
- return new Response(JSON.stringify(res), { status: 200, headers });
53
+ const respond = async (auth, headers = new Headers()) => {
54
+ const result = await fn(auth)(arg);
55
+ return setHeader(toResponse(result), headers);
56
+ };
57
+ const setHeader = (res, headers) => {
58
+ headers.forEach((value, key) => {
59
+ res.headers.set(key, value);
60
+ });
61
+ return res;
92
62
  };
93
63
  const accessToken = await authService.getAccessTokenFromRequest(
94
64
  arg.request
@@ -114,21 +84,17 @@ function createWithAuthHandler({
114
84
  );
115
85
  const headers = new Headers();
116
86
  headers.append("Set-Cookie", setCookieHeader);
117
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
118
87
  const payload = authService.jwtManager.decode(
119
88
  newAccessToken
120
89
  );
121
90
  return respond(payload, headers);
122
91
  } catch (e) {
123
- if (e instanceof Error) {
124
- console.log(e.message);
125
- }
92
+ console.log(e);
126
93
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
127
94
  null
128
95
  );
129
96
  const headers = new Headers();
130
97
  headers.append("Set-Cookie", setCookieHeader);
131
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
132
98
  return respond(void 0, headers);
133
99
  }
134
100
  }
@@ -162,7 +128,6 @@ var ReactRouterCookieStore = class {
162
128
  // src/api/create_handler.ts
163
129
  var import_server2 = require("dn-react-toolkit/file/server");
164
130
  var createAPIHandler = ({
165
- siteOrigin,
166
131
  authService,
167
132
  fileService,
168
133
  passwordRecoveryService,
@@ -173,7 +138,7 @@ var createAPIHandler = ({
173
138
  const { request, params } = args;
174
139
  const method = request.method.toUpperCase();
175
140
  const slug = params["*"] ? params["*"].split("/") : [];
176
- const withAuth = createWithAuthHandler({ siteOrigin, authService });
141
+ const withAuth = createWithAuthHandler({ authService });
177
142
  switch (slug[0]) {
178
143
  case "auth": {
179
144
  switch (slug[1]) {
package/dist/api/create_handler.mjs CHANGED
@@ -45,54 +45,24 @@ __reExport(auth_exports, auth_star);
45
45
  import * as auth_star from "dn-react-toolkit/auth";
46
46
 
47
47
  // src/auth/with_auth.ts
48
- function createWithAuthHandler({
49
- siteOrigin,
50
- authService
51
- }) {
48
+ var toResponse = (result) => {
49
+ if (result instanceof Response) {
50
+ return result;
51
+ }
52
+ return Response.json(result);
53
+ };
54
+ function createWithAuthHandler({ authService }) {
52
55
  return function(fn) {
53
56
  const handler = async function(arg) {
54
- const respond = async (auth, headers) => {
55
- const userAgent = arg.request.headers.get("User-Agent") || "";
56
- const res = await fn(auth)(arg);
57
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
58
- if (res instanceof Response) {
59
- const mergedHeaders = new Headers(res.headers);
60
- if (headers) {
61
- headers.forEach((value, key) => {
62
- mergedHeaders.set(key, value);
63
- });
64
- }
65
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
66
- const data = await res.json();
67
- return new Response(
68
- JSON.stringify({
69
- AUTH: auth,
70
- userAgent,
71
- ...data
72
- }),
73
- {
74
- status: res.status,
75
- headers: mergedHeaders
76
- }
77
- );
78
- }
79
- return new Response(res.body, {
80
- status: res.status,
81
- headers: mergedHeaders
82
- });
83
- }
84
- headers?.set("Content-Type", "application/json");
85
- return new Response(
86
- JSON.stringify({
87
- AUTH: auth,
88
- userAgent,
89
- ...res
90
- }),
91
- { status: 200, headers }
92
- );
93
- }
94
- headers?.set("Content-Type", "application/json");
95
- return new Response(JSON.stringify(res), { status: 200, headers });
57
+ const respond = async (auth, headers = new Headers()) => {
58
+ const result = await fn(auth)(arg);
59
+ return setHeader(toResponse(result), headers);
60
+ };
61
+ const setHeader = (res, headers) => {
62
+ headers.forEach((value, key) => {
63
+ res.headers.set(key, value);
64
+ });
65
+ return res;
96
66
  };
97
67
  const accessToken = await authService.getAccessTokenFromRequest(
98
68
  arg.request
@@ -118,21 +88,17 @@ function createWithAuthHandler({
118
88
  );
119
89
  const headers = new Headers();
120
90
  headers.append("Set-Cookie", setCookieHeader);
121
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
122
91
  const payload = authService.jwtManager.decode(
123
92
  newAccessToken
124
93
  );
125
94
  return respond(payload, headers);
126
95
  } catch (e) {
127
- if (e instanceof Error) {
128
- console.log(e.message);
129
- }
96
+ console.log(e);
130
97
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
131
98
  null
132
99
  );
133
100
  const headers = new Headers();
134
101
  headers.append("Set-Cookie", setCookieHeader);
135
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
136
102
  return respond(void 0, headers);
137
103
  }
138
104
  }
@@ -169,7 +135,6 @@ import {
169
135
  uploadFileHandler
170
136
  } from "dn-react-toolkit/file/server";
171
137
  var createAPIHandler = ({
172
- siteOrigin,
173
138
  authService,
174
139
  fileService,
175
140
  passwordRecoveryService,
@@ -180,7 +145,7 @@ var createAPIHandler = ({
180
145
  const { request, params } = args;
181
146
  const method = request.method.toUpperCase();
182
147
  const slug = params["*"] ? params["*"].split("/") : [];
183
- const withAuth = createWithAuthHandler({ siteOrigin, authService });
148
+ const withAuth = createWithAuthHandler({ authService });
184
149
  switch (slug[0]) {
185
150
  case "auth": {
186
151
  switch (slug[1]) {
package/dist/api/index.js CHANGED
@@ -41,54 +41,24 @@ __export(auth_exports, {
41
41
  __reExport(auth_exports, require("dn-react-toolkit/auth"));
42
42
 
43
43
  // src/auth/with_auth.ts
44
- function createWithAuthHandler({
45
- siteOrigin,
46
- authService
47
- }) {
44
+ var toResponse = (result) => {
45
+ if (result instanceof Response) {
46
+ return result;
47
+ }
48
+ return Response.json(result);
49
+ };
50
+ function createWithAuthHandler({ authService }) {
48
51
  return function(fn) {
49
52
  const handler = async function(arg) {
50
- const respond = async (auth, headers) => {
51
- const userAgent = arg.request.headers.get("User-Agent") || "";
52
- const res = await fn(auth)(arg);
53
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
54
- if (res instanceof Response) {
55
- const mergedHeaders = new Headers(res.headers);
56
- if (headers) {
57
- headers.forEach((value, key) => {
58
- mergedHeaders.set(key, value);
59
- });
60
- }
61
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
62
- const data = await res.json();
63
- return new Response(
64
- JSON.stringify({
65
- AUTH: auth,
66
- userAgent,
67
- ...data
68
- }),
69
- {
70
- status: res.status,
71
- headers: mergedHeaders
72
- }
73
- );
74
- }
75
- return new Response(res.body, {
76
- status: res.status,
77
- headers: mergedHeaders
78
- });
79
- }
80
- headers?.set("Content-Type", "application/json");
81
- return new Response(
82
- JSON.stringify({
83
- AUTH: auth,
84
- userAgent,
85
- ...res
86
- }),
87
- { status: 200, headers }
88
- );
89
- }
90
- headers?.set("Content-Type", "application/json");
91
- return new Response(JSON.stringify(res), { status: 200, headers });
53
+ const respond = async (auth, headers = new Headers()) => {
54
+ const result = await fn(auth)(arg);
55
+ return setHeader(toResponse(result), headers);
56
+ };
57
+ const setHeader = (res, headers) => {
58
+ headers.forEach((value, key) => {
59
+ res.headers.set(key, value);
60
+ });
61
+ return res;
92
62
  };
93
63
  const accessToken = await authService.getAccessTokenFromRequest(
94
64
  arg.request
@@ -114,21 +84,17 @@ function createWithAuthHandler({
114
84
  );
115
85
  const headers = new Headers();
116
86
  headers.append("Set-Cookie", setCookieHeader);
117
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
118
87
  const payload = authService.jwtManager.decode(
119
88
  newAccessToken
120
89
  );
121
90
  return respond(payload, headers);
122
91
  } catch (e) {
123
- if (e instanceof Error) {
124
- console.log(e.message);
125
- }
92
+ console.log(e);
126
93
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
127
94
  null
128
95
  );
129
96
  const headers = new Headers();
130
97
  headers.append("Set-Cookie", setCookieHeader);
131
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
132
98
  return respond(void 0, headers);
133
99
  }
134
100
  }
@@ -162,7 +128,6 @@ var ReactRouterCookieStore = class {
162
128
  // src/api/create_handler.ts
163
129
  var import_server2 = require("dn-react-toolkit/file/server");
164
130
  var createAPIHandler = ({
165
- siteOrigin,
166
131
  authService,
167
132
  fileService,
168
133
  passwordRecoveryService,
@@ -173,7 +138,7 @@ var createAPIHandler = ({
173
138
  const { request, params } = args;
174
139
  const method = request.method.toUpperCase();
175
140
  const slug = params["*"] ? params["*"].split("/") : [];
176
- const withAuth = createWithAuthHandler({ siteOrigin, authService });
141
+ const withAuth = createWithAuthHandler({ authService });
177
142
  switch (slug[0]) {
178
143
  case "auth": {
179
144
  switch (slug[1]) {
package/dist/api/index.mjs CHANGED
@@ -45,54 +45,24 @@ __reExport(auth_exports, auth_star);
45
45
  import * as auth_star from "dn-react-toolkit/auth";
46
46
 
47
47
  // src/auth/with_auth.ts
48
- function createWithAuthHandler({
49
- siteOrigin,
50
- authService
51
- }) {
48
+ var toResponse = (result) => {
49
+ if (result instanceof Response) {
50
+ return result;
51
+ }
52
+ return Response.json(result);
53
+ };
54
+ function createWithAuthHandler({ authService }) {
52
55
  return function(fn) {
53
56
  const handler = async function(arg) {
54
- const respond = async (auth, headers) => {
55
- const userAgent = arg.request.headers.get("User-Agent") || "";
56
- const res = await fn(auth)(arg);
57
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
58
- if (res instanceof Response) {
59
- const mergedHeaders = new Headers(res.headers);
60
- if (headers) {
61
- headers.forEach((value, key) => {
62
- mergedHeaders.set(key, value);
63
- });
64
- }
65
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
66
- const data = await res.json();
67
- return new Response(
68
- JSON.stringify({
69
- AUTH: auth,
70
- userAgent,
71
- ...data
72
- }),
73
- {
74
- status: res.status,
75
- headers: mergedHeaders
76
- }
77
- );
78
- }
79
- return new Response(res.body, {
80
- status: res.status,
81
- headers: mergedHeaders
82
- });
83
- }
84
- headers?.set("Content-Type", "application/json");
85
- return new Response(
86
- JSON.stringify({
87
- AUTH: auth,
88
- userAgent,
89
- ...res
90
- }),
91
- { status: 200, headers }
92
- );
93
- }
94
- headers?.set("Content-Type", "application/json");
95
- return new Response(JSON.stringify(res), { status: 200, headers });
57
+ const respond = async (auth, headers = new Headers()) => {
58
+ const result = await fn(auth)(arg);
59
+ return setHeader(toResponse(result), headers);
60
+ };
61
+ const setHeader = (res, headers) => {
62
+ headers.forEach((value, key) => {
63
+ res.headers.set(key, value);
64
+ });
65
+ return res;
96
66
  };
97
67
  const accessToken = await authService.getAccessTokenFromRequest(
98
68
  arg.request
@@ -118,21 +88,17 @@ function createWithAuthHandler({
118
88
  );
119
89
  const headers = new Headers();
120
90
  headers.append("Set-Cookie", setCookieHeader);
121
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
122
91
  const payload = authService.jwtManager.decode(
123
92
  newAccessToken
124
93
  );
125
94
  return respond(payload, headers);
126
95
  } catch (e) {
127
- if (e instanceof Error) {
128
- console.log(e.message);
129
- }
96
+ console.log(e);
130
97
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
131
98
  null
132
99
  );
133
100
  const headers = new Headers();
134
101
  headers.append("Set-Cookie", setCookieHeader);
135
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
136
102
  return respond(void 0, headers);
137
103
  }
138
104
  }
@@ -169,7 +135,6 @@ import {
169
135
  uploadFileHandler
170
136
  } from "dn-react-toolkit/file/server";
171
137
  var createAPIHandler = ({
172
- siteOrigin,
173
138
  authService,
174
139
  fileService,
175
140
  passwordRecoveryService,
@@ -180,7 +145,7 @@ var createAPIHandler = ({
180
145
  const { request, params } = args;
181
146
  const method = request.method.toUpperCase();
182
147
  const slug = params["*"] ? params["*"].split("/") : [];
183
- const withAuth = createWithAuthHandler({ siteOrigin, authService });
148
+ const withAuth = createWithAuthHandler({ authService });
184
149
  switch (slug[0]) {
185
150
  case "auth": {
186
151
  switch (slug[1]) {
package/dist/auth/index.js CHANGED
@@ -28,54 +28,24 @@ module.exports = __toCommonJS(auth_exports);
28
28
  __reExport(auth_exports, require("dn-react-toolkit/auth"), module.exports);
29
29
 
30
30
  // src/auth/with_auth.ts
31
- function createWithAuthHandler({
32
- siteOrigin,
33
- authService
34
- }) {
31
+ var toResponse = (result) => {
32
+ if (result instanceof Response) {
33
+ return result;
34
+ }
35
+ return Response.json(result);
36
+ };
37
+ function createWithAuthHandler({ authService }) {
35
38
  return function(fn) {
36
39
  const handler = async function(arg) {
37
- const respond = async (auth, headers) => {
38
- const userAgent = arg.request.headers.get("User-Agent") || "";
39
- const res = await fn(auth)(arg);
40
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
41
- if (res instanceof Response) {
42
- const mergedHeaders = new Headers(res.headers);
43
- if (headers) {
44
- headers.forEach((value, key) => {
45
- mergedHeaders.set(key, value);
46
- });
47
- }
48
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
49
- const data = await res.json();
50
- return new Response(
51
- JSON.stringify({
52
- AUTH: auth,
53
- userAgent,
54
- ...data
55
- }),
56
- {
57
- status: res.status,
58
- headers: mergedHeaders
59
- }
60
- );
61
- }
62
- return new Response(res.body, {
63
- status: res.status,
64
- headers: mergedHeaders
65
- });
66
- }
67
- headers?.set("Content-Type", "application/json");
68
- return new Response(
69
- JSON.stringify({
70
- AUTH: auth,
71
- userAgent,
72
- ...res
73
- }),
74
- { status: 200, headers }
75
- );
76
- }
77
- headers?.set("Content-Type", "application/json");
78
- return new Response(JSON.stringify(res), { status: 200, headers });
40
+ const respond = async (auth, headers = new Headers()) => {
41
+ const result = await fn(auth)(arg);
42
+ return setHeader(toResponse(result), headers);
43
+ };
44
+ const setHeader = (res, headers) => {
45
+ headers.forEach((value, key) => {
46
+ res.headers.set(key, value);
47
+ });
48
+ return res;
79
49
  };
80
50
  const accessToken = await authService.getAccessTokenFromRequest(
81
51
  arg.request
@@ -101,21 +71,17 @@ function createWithAuthHandler({
101
71
  );
102
72
  const headers = new Headers();
103
73
  headers.append("Set-Cookie", setCookieHeader);
104
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
105
74
  const payload = authService.jwtManager.decode(
106
75
  newAccessToken
107
76
  );
108
77
  return respond(payload, headers);
109
78
  } catch (e) {
110
- if (e instanceof Error) {
111
- console.log(e.message);
112
- }
79
+ console.log(e);
113
80
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
114
81
  null
115
82
  );
116
83
  const headers = new Headers();
117
84
  headers.append("Set-Cookie", setCookieHeader);
118
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
119
85
  return respond(void 0, headers);
120
86
  }
121
87
  }
package/dist/auth/index.mjs CHANGED
@@ -2,54 +2,24 @@
2
2
  export * from "dn-react-toolkit/auth";
3
3
 
4
4
  // src/auth/with_auth.ts
5
- function createWithAuthHandler({
6
- siteOrigin,
7
- authService
8
- }) {
5
+ var toResponse = (result) => {
6
+ if (result instanceof Response) {
7
+ return result;
8
+ }
9
+ return Response.json(result);
10
+ };
11
+ function createWithAuthHandler({ authService }) {
9
12
  return function(fn) {
10
13
  const handler = async function(arg) {
11
- const respond = async (auth, headers) => {
12
- const userAgent = arg.request.headers.get("User-Agent") || "";
13
- const res = await fn(auth)(arg);
14
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
15
- if (res instanceof Response) {
16
- const mergedHeaders = new Headers(res.headers);
17
- if (headers) {
18
- headers.forEach((value, key) => {
19
- mergedHeaders.set(key, value);
20
- });
21
- }
22
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
23
- const data = await res.json();
24
- return new Response(
25
- JSON.stringify({
26
- AUTH: auth,
27
- userAgent,
28
- ...data
29
- }),
30
- {
31
- status: res.status,
32
- headers: mergedHeaders
33
- }
34
- );
35
- }
36
- return new Response(res.body, {
37
- status: res.status,
38
- headers: mergedHeaders
39
- });
40
- }
41
- headers?.set("Content-Type", "application/json");
42
- return new Response(
43
- JSON.stringify({
44
- AUTH: auth,
45
- userAgent,
46
- ...res
47
- }),
48
- { status: 200, headers }
49
- );
50
- }
51
- headers?.set("Content-Type", "application/json");
52
- return new Response(JSON.stringify(res), { status: 200, headers });
14
+ const respond = async (auth, headers = new Headers()) => {
15
+ const result = await fn(auth)(arg);
16
+ return setHeader(toResponse(result), headers);
17
+ };
18
+ const setHeader = (res, headers) => {
19
+ headers.forEach((value, key) => {
20
+ res.headers.set(key, value);
21
+ });
22
+ return res;
53
23
  };
54
24
  const accessToken = await authService.getAccessTokenFromRequest(
55
25
  arg.request
@@ -75,21 +45,17 @@ function createWithAuthHandler({
75
45
  );
76
46
  const headers = new Headers();
77
47
  headers.append("Set-Cookie", setCookieHeader);
78
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
79
48
  const payload = authService.jwtManager.decode(
80
49
  newAccessToken
81
50
  );
82
51
  return respond(payload, headers);
83
52
  } catch (e) {
84
- if (e instanceof Error) {
85
- console.log(e.message);
86
- }
53
+ console.log(e);
87
54
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
88
55
  null
89
56
  );
90
57
  const headers = new Headers();
91
58
  headers.append("Set-Cookie", setCookieHeader);
92
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
93
59
  return respond(void 0, headers);
94
60
  }
95
61
  }
package/dist/auth/with_auth.d.mts CHANGED
@@ -5,8 +5,7 @@ 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>({ siteOrigin, authService, }: {
9
- siteOrigin: string;
8
+ declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
10
9
  authService: AuthService;
11
10
  }): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
12
11
 
package/dist/auth/with_auth.d.ts CHANGED
@@ -5,8 +5,7 @@ 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>({ siteOrigin, authService, }: {
9
- siteOrigin: string;
8
+ declare function createWithAuthHandler<T extends LoaderFunctionArgs | ActionFunctionArgs>({ authService }: {
10
9
  authService: AuthService;
11
10
  }): <THandler extends Handler<T>>(fn: (auth?: AccessTokenPayload) => THandler) => THandler;
12
11
 
package/dist/auth/with_auth.js CHANGED
@@ -23,54 +23,24 @@ __export(with_auth_exports, {
23
23
  createWithAuthHandler: () => createWithAuthHandler
24
24
  });
25
25
  module.exports = __toCommonJS(with_auth_exports);
26
- function createWithAuthHandler({
27
- siteOrigin,
28
- authService
29
- }) {
26
+ var toResponse = (result) => {
27
+ if (result instanceof Response) {
28
+ return result;
29
+ }
30
+ return Response.json(result);
31
+ };
32
+ function createWithAuthHandler({ authService }) {
30
33
  return function(fn) {
31
34
  const handler = async function(arg) {
32
- const respond = async (auth, headers) => {
33
- const userAgent = arg.request.headers.get("User-Agent") || "";
34
- const res = await fn(auth)(arg);
35
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
36
- if (res instanceof Response) {
37
- const mergedHeaders = new Headers(res.headers);
38
- if (headers) {
39
- headers.forEach((value, key) => {
40
- mergedHeaders.set(key, value);
41
- });
42
- }
43
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
44
- const data = await res.json();
45
- return new Response(
46
- JSON.stringify({
47
- AUTH: auth,
48
- userAgent,
49
- ...data
50
- }),
51
- {
52
- status: res.status,
53
- headers: mergedHeaders
54
- }
55
- );
56
- }
57
- return new Response(res.body, {
58
- status: res.status,
59
- headers: mergedHeaders
60
- });
61
- }
62
- headers?.set("Content-Type", "application/json");
63
- return new Response(
64
- JSON.stringify({
65
- AUTH: auth,
66
- userAgent,
67
- ...res
68
- }),
69
- { status: 200, headers }
70
- );
71
- }
72
- headers?.set("Content-Type", "application/json");
73
- return new Response(JSON.stringify(res), { status: 200, headers });
35
+ const respond = async (auth, headers = new Headers()) => {
36
+ const result = await fn(auth)(arg);
37
+ return setHeader(toResponse(result), headers);
38
+ };
39
+ const setHeader = (res, headers) => {
40
+ headers.forEach((value, key) => {
41
+ res.headers.set(key, value);
42
+ });
43
+ return res;
74
44
  };
75
45
  const accessToken = await authService.getAccessTokenFromRequest(
76
46
  arg.request
@@ -96,21 +66,17 @@ function createWithAuthHandler({
96
66
  );
97
67
  const headers = new Headers();
98
68
  headers.append("Set-Cookie", setCookieHeader);
99
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
100
69
  const payload = authService.jwtManager.decode(
101
70
  newAccessToken
102
71
  );
103
72
  return respond(payload, headers);
104
73
  } catch (e) {
105
- if (e instanceof Error) {
106
- console.log(e.message);
107
- }
74
+ console.log(e);
108
75
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
109
76
  null
110
77
  );
111
78
  const headers = new Headers();
112
79
  headers.append("Set-Cookie", setCookieHeader);
113
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
114
80
  return respond(void 0, headers);
115
81
  }
116
82
  }
package/dist/auth/with_auth.mjs CHANGED
@@ -1,52 +1,22 @@
1
1
  // src/auth/with_auth.ts
2
- function createWithAuthHandler({
3
- siteOrigin,
4
- authService
5
- }) {
2
+ var toResponse = (result) => {
3
+ if (result instanceof Response) {
4
+ return result;
5
+ }
6
+ return Response.json(result);
7
+ };
8
+ function createWithAuthHandler({ authService }) {
6
9
  return function(fn) {
7
10
  const handler = async function(arg) {
8
- const respond = async (auth, headers) => {
9
- const userAgent = arg.request.headers.get("User-Agent") || "";
10
- const res = await fn(auth)(arg);
11
- if (typeof res === "object" && res !== null && !Array.isArray(res)) {
12
- if (res instanceof Response) {
13
- const mergedHeaders = new Headers(res.headers);
14
- if (headers) {
15
- headers.forEach((value, key) => {
16
- mergedHeaders.set(key, value);
17
- });
18
- }
19
- if (res.status < 300 && res.headers.get("Content-Type")?.includes("application/json")) {
20
- const data = await res.json();
21
- return new Response(
22
- JSON.stringify({
23
- AUTH: auth,
24
- userAgent,
25
- ...data
26
- }),
27
- {
28
- status: res.status,
29
- headers: mergedHeaders
30
- }
31
- );
32
- }
33
- return new Response(res.body, {
34
- status: res.status,
35
- headers: mergedHeaders
36
- });
37
- }
38
- headers?.set("Content-Type", "application/json");
39
- return new Response(
40
- JSON.stringify({
41
- AUTH: auth,
42
- userAgent,
43
- ...res
44
- }),
45
- { status: 200, headers }
46
- );
47
- }
48
- headers?.set("Content-Type", "application/json");
49
- return new Response(JSON.stringify(res), { status: 200, headers });
11
+ const respond = async (auth, headers = new Headers()) => {
12
+ const result = await fn(auth)(arg);
13
+ return setHeader(toResponse(result), headers);
14
+ };
15
+ const setHeader = (res, headers) => {
16
+ headers.forEach((value, key) => {
17
+ res.headers.set(key, value);
18
+ });
19
+ return res;
50
20
  };
51
21
  const accessToken = await authService.getAccessTokenFromRequest(
52
22
  arg.request
@@ -72,21 +42,17 @@ function createWithAuthHandler({
72
42
  );
73
43
  const headers = new Headers();
74
44
  headers.append("Set-Cookie", setCookieHeader);
75
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
76
45
  const payload = authService.jwtManager.decode(
77
46
  newAccessToken
78
47
  );
79
48
  return respond(payload, headers);
80
49
  } catch (e) {
81
- if (e instanceof Error) {
82
- console.log(e.message);
83
- }
50
+ console.log(e);
84
51
  const setCookieHeader = await authService.getRefreshTokenSetCookie(
85
52
  null
86
53
  );
87
54
  const headers = new Headers();
88
55
  headers.append("Set-Cookie", setCookieHeader);
89
- headers.append("Location", new URL(arg.request.url, siteOrigin).href);
90
56
  return respond(void 0, headers);
91
57
  }
92
58
  }
package/dist/seo/index.js CHANGED
@@ -5,6 +5,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
6
  var __getProtoOf = Object.getPrototypeOf;
7
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __commonJS = (cb, mod) => function __require() {
9
+ return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
10
+ };
8
11
  var __export = (target, all) => {
9
12
  for (var name in all)
10
13
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -27,6 +30,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
27
30
  ));
28
31
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
32
 
33
+ // node_modules/schema-dts/dist/schema.js
34
+ var require_schema = __commonJS({
35
+ "node_modules/schema-dts/dist/schema.js"(exports2) {
36
+ "use strict";
37
+ Object.defineProperty(exports2, "__esModule", { value: true });
38
+ }
39
+ });
40
+
30
41
  // src/seo/index.ts
31
42
  var seo_exports = {};
32
43
  __export(seo_exports, {
@@ -36,6 +47,7 @@ module.exports = __toCommonJS(seo_exports);
36
47
 
37
48
  // src/seo/seo.tsx
38
49
  var import_react = __toESM(require("react"));
50
+ var Schema = __toESM(require_schema());
39
51
  var import_react_router = require("react-router");
40
52
  function configSEO(config) {
41
53
  function init(props) {
package/dist/seo/index.mjs CHANGED
@@ -1,4 +1,39 @@
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getProtoOf = Object.getPrototypeOf;
6
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
7
+ var __commonJS = (cb, mod) => function __require() {
8
+ return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
19
+ // If the importer is in node compatibility mode or this is not an ESM
20
+ // file that has been converted to a CommonJS file using a Babel-
21
+ // compatible transform (i.e. "__esModule" has not been set), then set
22
+ // "default" to the CommonJS "module.exports" for node compatibility.
23
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
24
+ mod
25
+ ));
26
+
27
+ // node_modules/schema-dts/dist/schema.js
28
+ var require_schema = __commonJS({
29
+ "node_modules/schema-dts/dist/schema.js"(exports) {
30
+ "use strict";
31
+ Object.defineProperty(exports, "__esModule", { value: true });
32
+ }
33
+ });
34
+
1
35
  // src/seo/seo.tsx
36
+ var Schema = __toESM(require_schema());
2
37
  import React from "react";
3
38
  import { useMatches } from "react-router";
4
39
  function configSEO(config) {
package/dist/seo/seo.js CHANGED
@@ -5,6 +5,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
5
  var __getOwnPropNames = Object.getOwnPropertyNames;
6
6
  var __getProtoOf = Object.getPrototypeOf;
7
7
  var __hasOwnProp = Object.prototype.hasOwnProperty;
8
+ var __commonJS = (cb, mod) => function __require() {
9
+ return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
10
+ };
8
11
  var __export = (target, all) => {
9
12
  for (var name in all)
10
13
  __defProp(target, name, { get: all[name], enumerable: true });
@@ -27,6 +30,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
27
30
  ));
28
31
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
29
32
 
33
+ // node_modules/schema-dts/dist/schema.js
34
+ var require_schema = __commonJS({
35
+ "node_modules/schema-dts/dist/schema.js"(exports2) {
36
+ "use strict";
37
+ Object.defineProperty(exports2, "__esModule", { value: true });
38
+ }
39
+ });
40
+
30
41
  // src/seo/seo.tsx
31
42
  var seo_exports = {};
32
43
  __export(seo_exports, {
@@ -34,6 +45,7 @@ __export(seo_exports, {
34
45
  });
35
46
  module.exports = __toCommonJS(seo_exports);
36
47
  var import_react = __toESM(require("react"));
48
+ var Schema = __toESM(require_schema());
37
49
  var import_react_router = require("react-router");
38
50
  function configSEO(config) {
39
51
  function init(props) {
package/dist/seo/seo.mjs CHANGED
@@ -1,4 +1,39 @@
1
+ var __create = Object.create;
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __getProtoOf = Object.getPrototypeOf;
6
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
7
+ var __commonJS = (cb, mod) => function __require() {
8
+ return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
19
+ // If the importer is in node compatibility mode or this is not an ESM
20
+ // file that has been converted to a CommonJS file using a Babel-
21
+ // compatible transform (i.e. "__esModule" has not been set), then set
22
+ // "default" to the CommonJS "module.exports" for node compatibility.
23
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
24
+ mod
25
+ ));
26
+
27
+ // node_modules/schema-dts/dist/schema.js
28
+ var require_schema = __commonJS({
29
+ "node_modules/schema-dts/dist/schema.js"(exports) {
30
+ "use strict";
31
+ Object.defineProperty(exports, "__esModule", { value: true });
32
+ }
33
+ });
34
+
1
35
  // src/seo/seo.tsx
36
+ var Schema = __toESM(require_schema());
2
37
  import React from "react";
3
38
  import { useMatches } from "react-router";
4
39
  function configSEO(config) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dn-react-router-toolkit",
3
- "version": "0.3.7",
3
+ "version": "0.3.9",
4
4
  "types": "./dist/index.d.ts",
5
5
  "main": "./dist/index.mjs",
6
6
  "module": "./dist/index.js",