dn-react-router-toolkit 0.1.2 → 0.1.4
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.
- package/dist/auth-kit/auth_service.js +5 -5
- package/dist/auth-kit/auth_service.mjs +5 -5
- package/dist/auth-kit/client/logout.d.mts +3 -0
- package/dist/auth-kit/client/logout.d.ts +3 -0
- package/dist/auth-kit/client/logout.js +49 -0
- package/dist/auth-kit/client/logout.mjs +24 -0
- package/dist/auth-kit/with_auth.js +11 -13
- package/dist/auth-kit/with_auth.mjs +11 -13
- package/package.json +3 -3
|
@@ -81,16 +81,16 @@ var AuthService = class {
|
|
|
81
81
|
return this.refresh(request);
|
|
82
82
|
}
|
|
83
83
|
async getAccessTokenFromCookies(request) {
|
|
84
|
-
const
|
|
84
|
+
const accessToken = await ACCESS_TOKEN_COOKIE.parse(
|
|
85
85
|
request.headers.get("cookie")
|
|
86
86
|
);
|
|
87
|
-
return
|
|
87
|
+
return accessToken;
|
|
88
88
|
}
|
|
89
89
|
async getRefreshTokenFromCookies(request) {
|
|
90
|
-
const
|
|
90
|
+
const refreshToken = await REFRESH_TOKEN_COOKIE.parse(
|
|
91
91
|
request.headers.get("cookie")
|
|
92
92
|
);
|
|
93
|
-
return
|
|
93
|
+
return refreshToken;
|
|
94
94
|
}
|
|
95
95
|
async refresh(request) {
|
|
96
96
|
const refreshToken = await this.getRefreshTokenFromCookies(request);
|
|
@@ -157,7 +157,7 @@ var AuthService = class {
|
|
|
157
157
|
}
|
|
158
158
|
const { userId } = payload;
|
|
159
159
|
if (typeof userId !== "string") {
|
|
160
|
-
throw new Error("\uD1A0\uD070\uC774 \
|
|
160
|
+
throw new Error("\uD1A0\uD070\uC774 \uC704\uC870\uB418\uC5C8\uC2B5\uB2C8\uB2E4.");
|
|
161
161
|
}
|
|
162
162
|
const user = await this.repository.findUserById(userId);
|
|
163
163
|
if (!user) {
|
|
@@ -43,16 +43,16 @@ var AuthService = class {
|
|
|
43
43
|
return this.refresh(request);
|
|
44
44
|
}
|
|
45
45
|
async getAccessTokenFromCookies(request) {
|
|
46
|
-
const
|
|
46
|
+
const accessToken = await ACCESS_TOKEN_COOKIE.parse(
|
|
47
47
|
request.headers.get("cookie")
|
|
48
48
|
);
|
|
49
|
-
return
|
|
49
|
+
return accessToken;
|
|
50
50
|
}
|
|
51
51
|
async getRefreshTokenFromCookies(request) {
|
|
52
|
-
const
|
|
52
|
+
const refreshToken = await REFRESH_TOKEN_COOKIE.parse(
|
|
53
53
|
request.headers.get("cookie")
|
|
54
54
|
);
|
|
55
|
-
return
|
|
55
|
+
return refreshToken;
|
|
56
56
|
}
|
|
57
57
|
async refresh(request) {
|
|
58
58
|
const refreshToken = await this.getRefreshTokenFromCookies(request);
|
|
@@ -119,7 +119,7 @@ var AuthService = class {
|
|
|
119
119
|
}
|
|
120
120
|
const { userId } = payload;
|
|
121
121
|
if (typeof userId !== "string") {
|
|
122
|
-
throw new Error("\uD1A0\uD070\uC774 \
|
|
122
|
+
throw new Error("\uD1A0\uD070\uC774 \uC704\uC870\uB418\uC5C8\uC2B5\uB2C8\uB2E4.");
|
|
123
123
|
}
|
|
124
124
|
const user = await this.repository.findUserById(userId);
|
|
125
125
|
if (!user) {
|
|
@@ -0,0 +1,49 @@
|
|
|
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/auth-kit/client/logout.ts
|
|
21
|
+
var logout_exports = {};
|
|
22
|
+
__export(logout_exports, {
|
|
23
|
+
useLogout: () => useLogout
|
|
24
|
+
});
|
|
25
|
+
module.exports = __toCommonJS(logout_exports);
|
|
26
|
+
var import_react_router = require("react-router");
|
|
27
|
+
function useLogout() {
|
|
28
|
+
const navigate = (0, import_react_router.useNavigate)();
|
|
29
|
+
const logout = async () => {
|
|
30
|
+
const ok = confirm("\uC815\uB9D0 \uB85C\uADF8\uC544\uC6C3 \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?");
|
|
31
|
+
if (!ok) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const res = await fetch("/api/auth/logout", {
|
|
35
|
+
method: "POST"
|
|
36
|
+
});
|
|
37
|
+
if (res.ok) {
|
|
38
|
+
navigate("/");
|
|
39
|
+
} else {
|
|
40
|
+
const { message } = await res.json();
|
|
41
|
+
alert(message);
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
return logout;
|
|
45
|
+
}
|
|
46
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
47
|
+
0 && (module.exports = {
|
|
48
|
+
useLogout
|
|
49
|
+
});
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
// src/auth-kit/client/logout.ts
|
|
2
|
+
import { useNavigate } from "react-router";
|
|
3
|
+
function useLogout() {
|
|
4
|
+
const navigate = useNavigate();
|
|
5
|
+
const logout = async () => {
|
|
6
|
+
const ok = confirm("\uC815\uB9D0 \uB85C\uADF8\uC544\uC6C3 \uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?");
|
|
7
|
+
if (!ok) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
const res = await fetch("/api/auth/logout", {
|
|
11
|
+
method: "POST"
|
|
12
|
+
});
|
|
13
|
+
if (res.ok) {
|
|
14
|
+
navigate("/");
|
|
15
|
+
} else {
|
|
16
|
+
const { message } = await res.json();
|
|
17
|
+
alert(message);
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
return logout;
|
|
21
|
+
}
|
|
22
|
+
export {
|
|
23
|
+
useLogout
|
|
24
|
+
};
|
|
@@ -71,30 +71,28 @@ function createWithAuthHandler({
|
|
|
71
71
|
const refreshToken = await REFRESH_TOKEN_COOKIE.parse(cookie);
|
|
72
72
|
if (refreshToken) {
|
|
73
73
|
try {
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
const setCookieHeader = await AUTH.getRefreshTokenSetCookie(
|
|
78
|
-
refreshedAccessToken
|
|
74
|
+
const newAccessToken = await AUTH.refreshAccessToken(refreshToken);
|
|
75
|
+
const setCookieHeader = await AUTH.getAccessTokenSetCookie(
|
|
76
|
+
newAccessToken
|
|
79
77
|
);
|
|
78
|
+
const headers = new Headers();
|
|
79
|
+
headers.append("Set-Cookie", setCookieHeader);
|
|
80
|
+
headers.append("Location", arg.request.url);
|
|
80
81
|
return new Response("Temporary Redirect", {
|
|
81
82
|
status: 307,
|
|
82
|
-
headers
|
|
83
|
-
"Set-Cookie": setCookieHeader,
|
|
84
|
-
Location: arg.request.url
|
|
85
|
-
}
|
|
83
|
+
headers
|
|
86
84
|
});
|
|
87
85
|
} catch (e) {
|
|
88
86
|
if (e instanceof Error) {
|
|
89
87
|
console.log(e.message);
|
|
90
88
|
}
|
|
91
89
|
const setCookieHeader = await AUTH.getRefreshTokenSetCookie(null);
|
|
90
|
+
const headers = new Headers();
|
|
91
|
+
headers.append("Set-Cookie", setCookieHeader);
|
|
92
|
+
headers.append("Location", arg.request.url);
|
|
92
93
|
return new Response("Temporary Redirect", {
|
|
93
94
|
status: 307,
|
|
94
|
-
headers
|
|
95
|
-
"Set-Cookie": setCookieHeader,
|
|
96
|
-
Location: arg.request.url
|
|
97
|
-
}
|
|
95
|
+
headers
|
|
98
96
|
});
|
|
99
97
|
}
|
|
100
98
|
}
|
|
@@ -35,30 +35,28 @@ function createWithAuthHandler({
|
|
|
35
35
|
const refreshToken = await REFRESH_TOKEN_COOKIE.parse(cookie);
|
|
36
36
|
if (refreshToken) {
|
|
37
37
|
try {
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
const setCookieHeader = await AUTH.getRefreshTokenSetCookie(
|
|
42
|
-
refreshedAccessToken
|
|
38
|
+
const newAccessToken = await AUTH.refreshAccessToken(refreshToken);
|
|
39
|
+
const setCookieHeader = await AUTH.getAccessTokenSetCookie(
|
|
40
|
+
newAccessToken
|
|
43
41
|
);
|
|
42
|
+
const headers = new Headers();
|
|
43
|
+
headers.append("Set-Cookie", setCookieHeader);
|
|
44
|
+
headers.append("Location", arg.request.url);
|
|
44
45
|
return new Response("Temporary Redirect", {
|
|
45
46
|
status: 307,
|
|
46
|
-
headers
|
|
47
|
-
"Set-Cookie": setCookieHeader,
|
|
48
|
-
Location: arg.request.url
|
|
49
|
-
}
|
|
47
|
+
headers
|
|
50
48
|
});
|
|
51
49
|
} catch (e) {
|
|
52
50
|
if (e instanceof Error) {
|
|
53
51
|
console.log(e.message);
|
|
54
52
|
}
|
|
55
53
|
const setCookieHeader = await AUTH.getRefreshTokenSetCookie(null);
|
|
54
|
+
const headers = new Headers();
|
|
55
|
+
headers.append("Set-Cookie", setCookieHeader);
|
|
56
|
+
headers.append("Location", arg.request.url);
|
|
56
57
|
return new Response("Temporary Redirect", {
|
|
57
58
|
status: 307,
|
|
58
|
-
headers
|
|
59
|
-
"Set-Cookie": setCookieHeader,
|
|
60
|
-
Location: arg.request.url
|
|
61
|
-
}
|
|
59
|
+
headers
|
|
62
60
|
});
|
|
63
61
|
}
|
|
64
62
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dn-react-router-toolkit",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"types": "./dist/index.d.ts",
|
|
5
5
|
"main": "./dist/index.mjs",
|
|
6
6
|
"module": "./dist/index.js",
|
|
@@ -76,8 +76,8 @@
|
|
|
76
76
|
},
|
|
77
77
|
"peerDependencies": {
|
|
78
78
|
"drizzle-orm": "^0.44",
|
|
79
|
-
"react": "^
|
|
80
|
-
"react-dom": "^
|
|
79
|
+
"react": "^18.2.0",
|
|
80
|
+
"react-dom": "^18.2.0",
|
|
81
81
|
"react-router": "^7"
|
|
82
82
|
}
|
|
83
83
|
}
|