dn-react-router-toolkit 0.1.2 → 0.1.3

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.
@@ -81,16 +81,16 @@ var AuthService = class {
81
81
  return this.refresh(request);
82
82
  }
83
83
  async getAccessTokenFromCookies(request) {
84
- const cookieStore = await ACCESS_TOKEN_COOKIE.parse(
84
+ const accessToken = await ACCESS_TOKEN_COOKIE.parse(
85
85
  request.headers.get("cookie")
86
86
  );
87
- return cookieStore.get(ACCESS_TOKEN_KEY)?.value;
87
+ return accessToken;
88
88
  }
89
89
  async getRefreshTokenFromCookies(request) {
90
- const cookieStore = await REFRESH_TOKEN_COOKIE.parse(
90
+ const refreshToken = await REFRESH_TOKEN_COOKIE.parse(
91
91
  request.headers.get("cookie")
92
92
  );
93
- return cookieStore.get(REFRESH_TOKEN_KEY)?.value;
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 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.");
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 cookieStore = await ACCESS_TOKEN_COOKIE.parse(
46
+ const accessToken = await ACCESS_TOKEN_COOKIE.parse(
47
47
  request.headers.get("cookie")
48
48
  );
49
- return cookieStore.get(ACCESS_TOKEN_KEY)?.value;
49
+ return accessToken;
50
50
  }
51
51
  async getRefreshTokenFromCookies(request) {
52
- const cookieStore = await REFRESH_TOKEN_COOKIE.parse(
52
+ const refreshToken = await REFRESH_TOKEN_COOKIE.parse(
53
53
  request.headers.get("cookie")
54
54
  );
55
- return cookieStore.get(REFRESH_TOKEN_KEY)?.value;
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 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.");
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) {
@@ -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 refreshedAccessToken = await AUTH.refreshAccessToken(
75
- refreshToken
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 refreshedAccessToken = await AUTH.refreshAccessToken(
39
- refreshToken
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.2",
3
+ "version": "0.1.3",
4
4
  "types": "./dist/index.d.ts",
5
5
  "main": "./dist/index.mjs",
6
6
  "module": "./dist/index.js",