naystack 1.4.21 → 1.4.26

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.
@@ -117,10 +117,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
117
117
  }
118
118
  return response;
119
119
  }
120
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
120
+ function getUserIdFromRefreshToken(refreshToken) {
121
121
  if (refreshToken)
122
122
  try {
123
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
123
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
124
124
  if (typeof decoded !== "string" && typeof decoded.id === "number")
125
125
  return decoded.id;
126
126
  } catch (e) {
@@ -199,10 +199,7 @@ var getContext = (req) => {
199
199
  const bearer = req.headers.get("authorization");
200
200
  if (!bearer) {
201
201
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
202
- const userId = getUserIdFromRefreshToken(
203
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
204
- refresh
205
- );
202
+ const userId = getUserIdFromRefreshToken(refresh);
206
203
  if (userId) return { userId, isRefreshID: true };
207
204
  return { userId: null };
208
205
  }
@@ -233,10 +230,7 @@ var getDeleteRoute = (options) => async (req) => {
233
230
  // src/auth/email/routes/get.ts
234
231
  var getGetRoute = (options) => async (req) => {
235
232
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
236
- const userID = getUserIdFromRefreshToken(
237
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
238
- refresh
239
- );
233
+ const userID = getUserIdFromRefreshToken(refresh);
240
234
  if (userID) {
241
235
  if (options.onRefresh) {
242
236
  const body = await req.json();
@@ -90,10 +90,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
90
90
  }
91
91
  return response;
92
92
  }
93
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
93
+ function getUserIdFromRefreshToken(refreshToken) {
94
94
  if (refreshToken)
95
95
  try {
96
- const decoded = verify(refreshToken, refreshKey);
96
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
97
97
  if (typeof decoded !== "string" && typeof decoded.id === "number")
98
98
  return decoded.id;
99
99
  } catch (e) {
@@ -172,10 +172,7 @@ var getContext = (req) => {
172
172
  const bearer = req.headers.get("authorization");
173
173
  if (!bearer) {
174
174
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
175
- const userId = getUserIdFromRefreshToken(
176
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
177
- refresh
178
- );
175
+ const userId = getUserIdFromRefreshToken(refresh);
179
176
  if (userId) return { userId, isRefreshID: true };
180
177
  return { userId: null };
181
178
  }
@@ -206,10 +203,7 @@ var getDeleteRoute = (options) => async (req) => {
206
203
  // src/auth/email/routes/get.ts
207
204
  var getGetRoute = (options) => async (req) => {
208
205
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
209
- const userID = getUserIdFromRefreshToken(
210
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
211
- refresh
212
- );
206
+ const userID = getUserIdFromRefreshToken(refresh);
213
207
  if (userID) {
214
208
  if (options.onRefresh) {
215
209
  const body = await req.json();
@@ -105,10 +105,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
105
105
  }
106
106
  return response;
107
107
  }
108
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
108
+ function getUserIdFromRefreshToken(refreshToken) {
109
109
  if (refreshToken)
110
110
  try {
111
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
111
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
112
112
  if (typeof decoded !== "string" && typeof decoded.id === "number")
113
113
  return decoded.id;
114
114
  } catch (e) {
@@ -129,10 +129,7 @@ var getContext = (req) => {
129
129
  const bearer = req.headers.get("authorization");
130
130
  if (!bearer) {
131
131
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
132
- const userId = getUserIdFromRefreshToken(
133
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
134
- refresh
135
- );
132
+ const userId = getUserIdFromRefreshToken(refresh);
136
133
  if (userId) return { userId, isRefreshID: true };
137
134
  return { userId: null };
138
135
  }
@@ -79,10 +79,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
79
79
  }
80
80
  return response;
81
81
  }
82
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
82
+ function getUserIdFromRefreshToken(refreshToken) {
83
83
  if (refreshToken)
84
84
  try {
85
- const decoded = verify(refreshToken, refreshKey);
85
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
86
86
  if (typeof decoded !== "string" && typeof decoded.id === "number")
87
87
  return decoded.id;
88
88
  } catch (e) {
@@ -103,10 +103,7 @@ var getContext = (req) => {
103
103
  const bearer = req.headers.get("authorization");
104
104
  if (!bearer) {
105
105
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
106
- const userId = getUserIdFromRefreshToken(
107
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
108
- refresh
109
- );
106
+ const userId = getUserIdFromRefreshToken(refresh);
110
107
  if (userId) return { userId, isRefreshID: true };
111
108
  return { userId: null };
112
109
  }
@@ -108,10 +108,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
108
108
  }
109
109
  return response;
110
110
  }
111
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
111
+ function getUserIdFromRefreshToken(refreshToken) {
112
112
  if (refreshToken)
113
113
  try {
114
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
114
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
115
115
  if (typeof decoded !== "string" && typeof decoded.id === "number")
116
116
  return decoded.id;
117
117
  } catch (e) {
@@ -124,10 +124,7 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
124
124
  // src/auth/email/routes/get.ts
125
125
  var getGetRoute = (options) => async (req) => {
126
126
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
127
- const userID = getUserIdFromRefreshToken(
128
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
129
- refresh
130
- );
127
+ const userID = getUserIdFromRefreshToken(refresh);
131
128
  if (userID) {
132
129
  if (options.onRefresh) {
133
130
  const body = await req.json();
@@ -82,10 +82,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
82
82
  }
83
83
  return response;
84
84
  }
85
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
85
+ function getUserIdFromRefreshToken(refreshToken) {
86
86
  if (refreshToken)
87
87
  try {
88
- const decoded = verify(refreshToken, refreshKey);
88
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
89
89
  if (typeof decoded !== "string" && typeof decoded.id === "number")
90
90
  return decoded.id;
91
91
  } catch (e) {
@@ -98,10 +98,7 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
98
98
  // src/auth/email/routes/get.ts
99
99
  var getGetRoute = (options) => async (req) => {
100
100
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
101
- const userID = getUserIdFromRefreshToken(
102
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
103
- refresh
104
- );
101
+ const userID = getUserIdFromRefreshToken(refresh);
105
102
  if (userID) {
106
103
  if (options.onRefresh) {
107
104
  const body = await req.json();
@@ -117,10 +117,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
117
117
  }
118
118
  return response;
119
119
  }
120
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
120
+ function getUserIdFromRefreshToken(refreshToken) {
121
121
  if (refreshToken)
122
122
  try {
123
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
123
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
124
124
  if (typeof decoded !== "string" && typeof decoded.id === "number")
125
125
  return decoded.id;
126
126
  } catch (e) {
@@ -7,7 +7,7 @@ declare function getTokenizedResponse(accessToken?: string, refreshToken?: strin
7
7
  accessToken: string | undefined;
8
8
  refreshToken: string | undefined;
9
9
  }>;
10
- declare function getUserIdFromRefreshToken(refreshKey: string, refreshToken?: string): number | null;
10
+ declare function getUserIdFromRefreshToken(refreshToken?: string): number | null;
11
11
  declare function getUserIdFromAccessToken(refreshToken?: string): number | null;
12
12
  declare function verifyUser(user: UserOutput, password: string): false | Promise<boolean>;
13
13
  declare function checkAuthStatus(redirectUnauthorizedURL?: string): Promise<boolean>;
@@ -7,7 +7,7 @@ declare function getTokenizedResponse(accessToken?: string, refreshToken?: strin
7
7
  accessToken: string | undefined;
8
8
  refreshToken: string | undefined;
9
9
  }>;
10
- declare function getUserIdFromRefreshToken(refreshKey: string, refreshToken?: string): number | null;
10
+ declare function getUserIdFromRefreshToken(refreshToken?: string): number | null;
11
11
  declare function getUserIdFromAccessToken(refreshToken?: string): number | null;
12
12
  declare function verifyUser(user: UserOutput, password: string): false | Promise<boolean>;
13
13
  declare function checkAuthStatus(redirectUnauthorizedURL?: string): Promise<boolean>;
@@ -87,10 +87,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
87
87
  }
88
88
  return response;
89
89
  }
90
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
90
+ function getUserIdFromRefreshToken(refreshToken) {
91
91
  if (refreshToken)
92
92
  try {
93
- const decoded = verify(refreshToken, refreshKey);
93
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
94
94
  if (typeof decoded !== "string" && typeof decoded.id === "number")
95
95
  return decoded.id;
96
96
  } catch (e) {
@@ -87,10 +87,10 @@ function getEnv(key, skipCheck) {
87
87
  var REFRESH_COOKIE_NAME = "refresh";
88
88
 
89
89
  // src/auth/email/token.ts
90
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
90
+ function getUserIdFromRefreshToken(refreshToken) {
91
91
  if (refreshToken)
92
92
  try {
93
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
93
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
94
94
  if (typeof decoded !== "string" && typeof decoded.id === "number")
95
95
  return decoded.id;
96
96
  } catch (e) {
@@ -158,10 +158,7 @@ var getContext = (req) => {
158
158
  const bearer = req.headers.get("authorization");
159
159
  if (!bearer) {
160
160
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
161
- const userId = getUserIdFromRefreshToken(
162
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
163
- refresh
164
- );
161
+ const userId = getUserIdFromRefreshToken(refresh);
165
162
  if (userId) return { userId, isRefreshID: true };
166
163
  return { userId: null };
167
164
  }
@@ -61,10 +61,10 @@ function getEnv(key, skipCheck) {
61
61
  var REFRESH_COOKIE_NAME = "refresh";
62
62
 
63
63
  // src/auth/email/token.ts
64
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
64
+ function getUserIdFromRefreshToken(refreshToken) {
65
65
  if (refreshToken)
66
66
  try {
67
- const decoded = verify(refreshToken, refreshKey);
67
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
68
68
  if (typeof decoded !== "string" && typeof decoded.id === "number")
69
69
  return decoded.id;
70
70
  } catch (e) {
@@ -132,10 +132,7 @@ var getContext = (req) => {
132
132
  const bearer = req.headers.get("authorization");
133
133
  if (!bearer) {
134
134
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
135
- const userId = getUserIdFromRefreshToken(
136
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
137
- refresh
138
- );
135
+ const userId = getUserIdFromRefreshToken(refresh);
139
136
  if (userId) return { userId, isRefreshID: true };
140
137
  return { userId: null };
141
138
  }
@@ -22,6 +22,7 @@ var auth_exports = {};
22
22
  __export(auth_exports, {
23
23
  checkAuthStatus: () => checkAuthStatus,
24
24
  getEmailAuthRoutes: () => getEmailAuthRoutes,
25
+ getRefreshToken: () => getRefreshToken,
25
26
  initGoogleAuth: () => initGoogleAuth,
26
27
  initInstagramAuth: () => initInstagramAuth
27
28
  });
@@ -119,10 +120,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
119
120
  }
120
121
  return response;
121
122
  }
122
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
123
+ function getUserIdFromRefreshToken(refreshToken) {
123
124
  if (refreshToken)
124
125
  try {
125
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
126
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
126
127
  if (typeof decoded !== "string" && typeof decoded.id === "number")
127
128
  return decoded.id;
128
129
  } catch (e) {
@@ -213,10 +214,7 @@ var getContext = (req) => {
213
214
  const bearer = req.headers.get("authorization");
214
215
  if (!bearer) {
215
216
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
216
- const userId = getUserIdFromRefreshToken(
217
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
218
- refresh
219
- );
217
+ const userId = getUserIdFromRefreshToken(refresh);
220
218
  if (userId) return { userId, isRefreshID: true };
221
219
  return { userId: null };
222
220
  }
@@ -247,10 +245,7 @@ var getDeleteRoute = (options) => async (req) => {
247
245
  // src/auth/email/routes/get.ts
248
246
  var getGetRoute = (options) => async (req) => {
249
247
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
250
- const userID = getUserIdFromRefreshToken(
251
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
252
- refresh
253
- );
248
+ const userID = getUserIdFromRefreshToken(refresh);
254
249
  if (userID) {
255
250
  if (options.onRefresh) {
256
251
  const body = await req.json();
@@ -518,10 +513,18 @@ function initInstagramAuth(props) {
518
513
  getRefreshedAccessToken
519
514
  };
520
515
  }
516
+
517
+ // src/auth/utils/token.ts
518
+ var import_headers2 = require("next/headers");
519
+ async function getRefreshToken() {
520
+ const Cookie = await (0, import_headers2.cookies)();
521
+ return Cookie.get(REFRESH_COOKIE_NAME)?.value;
522
+ }
521
523
  // Annotate the CommonJS export names for ESM import in node:
522
524
  0 && (module.exports = {
523
525
  checkAuthStatus,
524
526
  getEmailAuthRoutes,
527
+ getRefreshToken,
525
528
  initGoogleAuth,
526
529
  initInstagramAuth
527
530
  });
@@ -1,6 +1,7 @@
1
1
  export { getEmailAuthRoutes } from './email/index.mjs';
2
2
  export { initGoogleAuth } from './google/index.mjs';
3
3
  export { initInstagramAuth } from './instagram/index.mjs';
4
+ export { getRefreshToken } from './utils/token.mjs';
4
5
  export { checkAuthStatus } from './email/token.mjs';
5
6
  import 'next/server';
6
7
  import '../graphql/types.mjs';
@@ -1,6 +1,7 @@
1
1
  export { getEmailAuthRoutes } from './email/index.js';
2
2
  export { initGoogleAuth } from './google/index.js';
3
3
  export { initInstagramAuth } from './instagram/index.js';
4
+ export { getRefreshToken } from './utils/token.js';
4
5
  export { checkAuthStatus } from './email/token.js';
5
6
  import 'next/server';
6
7
  import '../graphql/types.js';
@@ -90,10 +90,10 @@ function getTokenizedResponse(accessToken, refreshToken) {
90
90
  }
91
91
  return response;
92
92
  }
93
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
93
+ function getUserIdFromRefreshToken(refreshToken) {
94
94
  if (refreshToken)
95
95
  try {
96
- const decoded = verify(refreshToken, refreshKey);
96
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
97
97
  if (typeof decoded !== "string" && typeof decoded.id === "number")
98
98
  return decoded.id;
99
99
  } catch (e) {
@@ -184,10 +184,7 @@ var getContext = (req) => {
184
184
  const bearer = req.headers.get("authorization");
185
185
  if (!bearer) {
186
186
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
187
- const userId = getUserIdFromRefreshToken(
188
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
189
- refresh
190
- );
187
+ const userId = getUserIdFromRefreshToken(refresh);
191
188
  if (userId) return { userId, isRefreshID: true };
192
189
  return { userId: null };
193
190
  }
@@ -218,10 +215,7 @@ var getDeleteRoute = (options) => async (req) => {
218
215
  // src/auth/email/routes/get.ts
219
216
  var getGetRoute = (options) => async (req) => {
220
217
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
221
- const userID = getUserIdFromRefreshToken(
222
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
223
- refresh
224
- );
218
+ const userID = getUserIdFromRefreshToken(refresh);
225
219
  if (userID) {
226
220
  if (options.onRefresh) {
227
221
  const body = await req.json();
@@ -489,9 +483,17 @@ function initInstagramAuth(props) {
489
483
  getRefreshedAccessToken
490
484
  };
491
485
  }
486
+
487
+ // src/auth/utils/token.ts
488
+ import { cookies as cookies2 } from "next/headers";
489
+ async function getRefreshToken() {
490
+ const Cookie = await cookies2();
491
+ return Cookie.get(REFRESH_COOKIE_NAME)?.value;
492
+ }
492
493
  export {
493
494
  checkAuthStatus,
494
495
  getEmailAuthRoutes,
496
+ getRefreshToken,
495
497
  initGoogleAuth,
496
498
  initInstagramAuth
497
499
  };
@@ -0,0 +1,39 @@
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/utils/token.ts
21
+ var token_exports = {};
22
+ __export(token_exports, {
23
+ getRefreshToken: () => getRefreshToken
24
+ });
25
+ module.exports = __toCommonJS(token_exports);
26
+ var import_headers = require("next/headers");
27
+
28
+ // src/auth/constants.ts
29
+ var REFRESH_COOKIE_NAME = "refresh";
30
+
31
+ // src/auth/utils/token.ts
32
+ async function getRefreshToken() {
33
+ const Cookie = await (0, import_headers.cookies)();
34
+ return Cookie.get(REFRESH_COOKIE_NAME)?.value;
35
+ }
36
+ // Annotate the CommonJS export names for ESM import in node:
37
+ 0 && (module.exports = {
38
+ getRefreshToken
39
+ });
@@ -0,0 +1,3 @@
1
+ declare function getRefreshToken(): Promise<string | undefined>;
2
+
3
+ export { getRefreshToken };
@@ -0,0 +1,3 @@
1
+ declare function getRefreshToken(): Promise<string | undefined>;
2
+
3
+ export { getRefreshToken };
@@ -0,0 +1,14 @@
1
+ // src/auth/utils/token.ts
2
+ import { cookies } from "next/headers";
3
+
4
+ // src/auth/constants.ts
5
+ var REFRESH_COOKIE_NAME = "refresh";
6
+
7
+ // src/auth/utils/token.ts
8
+ async function getRefreshToken() {
9
+ const Cookie = await cookies();
10
+ return Cookie.get(REFRESH_COOKIE_NAME)?.value;
11
+ }
12
+ export {
13
+ getRefreshToken
14
+ };
@@ -91,10 +91,10 @@ function getEnv(key, skipCheck) {
91
91
  var REFRESH_COOKIE_NAME = "refresh";
92
92
 
93
93
  // src/auth/email/token.ts
94
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
94
+ function getUserIdFromRefreshToken(refreshToken) {
95
95
  if (refreshToken)
96
96
  try {
97
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
97
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
98
98
  if (typeof decoded !== "string" && typeof decoded.id === "number")
99
99
  return decoded.id;
100
100
  } catch (e) {
@@ -112,10 +112,7 @@ var getContext = (req) => {
112
112
  const bearer = req.headers.get("authorization");
113
113
  if (!bearer) {
114
114
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
115
- const userId = getUserIdFromRefreshToken(
116
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
117
- refresh
118
- );
115
+ const userId = getUserIdFromRefreshToken(refresh);
119
116
  if (userId) return { userId, isRefreshID: true };
120
117
  return { userId: null };
121
118
  }
@@ -65,10 +65,10 @@ function getEnv(key, skipCheck) {
65
65
  var REFRESH_COOKIE_NAME = "refresh";
66
66
 
67
67
  // src/auth/email/token.ts
68
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
68
+ function getUserIdFromRefreshToken(refreshToken) {
69
69
  if (refreshToken)
70
70
  try {
71
- const decoded = verify(refreshToken, refreshKey);
71
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
72
72
  if (typeof decoded !== "string" && typeof decoded.id === "number")
73
73
  return decoded.id;
74
74
  } catch (e) {
@@ -86,10 +86,7 @@ var getContext = (req) => {
86
86
  const bearer = req.headers.get("authorization");
87
87
  if (!bearer) {
88
88
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
89
- const userId = getUserIdFromRefreshToken(
90
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
91
- refresh
92
- );
89
+ const userId = getUserIdFromRefreshToken(refresh);
93
90
  if (userId) return { userId, isRefreshID: true };
94
91
  return { userId: null };
95
92
  }
@@ -89,10 +89,10 @@ function getEnv(key, skipCheck) {
89
89
  var REFRESH_COOKIE_NAME = "refresh";
90
90
 
91
91
  // src/auth/email/token.ts
92
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
92
+ function getUserIdFromRefreshToken(refreshToken) {
93
93
  if (refreshToken)
94
94
  try {
95
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
95
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
96
96
  if (typeof decoded !== "string" && typeof decoded.id === "number")
97
97
  return decoded.id;
98
98
  } catch (e) {
@@ -110,10 +110,7 @@ var getContext = (req) => {
110
110
  const bearer = req.headers.get("authorization");
111
111
  if (!bearer) {
112
112
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
113
- const userId = getUserIdFromRefreshToken(
114
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
115
- refresh
116
- );
113
+ const userId = getUserIdFromRefreshToken(refresh);
117
114
  if (userId) return { userId, isRefreshID: true };
118
115
  return { userId: null };
119
116
  }
@@ -65,10 +65,10 @@ function getEnv(key, skipCheck) {
65
65
  var REFRESH_COOKIE_NAME = "refresh";
66
66
 
67
67
  // src/auth/email/token.ts
68
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
68
+ function getUserIdFromRefreshToken(refreshToken) {
69
69
  if (refreshToken)
70
70
  try {
71
- const decoded = verify(refreshToken, refreshKey);
71
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
72
72
  if (typeof decoded !== "string" && typeof decoded.id === "number")
73
73
  return decoded.id;
74
74
  } catch (e) {
@@ -86,10 +86,7 @@ var getContext = (req) => {
86
86
  const bearer = req.headers.get("authorization");
87
87
  if (!bearer) {
88
88
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
89
- const userId = getUserIdFromRefreshToken(
90
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
91
- refresh
92
- );
89
+ const userId = getUserIdFromRefreshToken(refresh);
93
90
  if (userId) return { userId, isRefreshID: true };
94
91
  return { userId: null };
95
92
  }
@@ -91,10 +91,10 @@ function getEnv(key, skipCheck) {
91
91
  var REFRESH_COOKIE_NAME = "refresh";
92
92
 
93
93
  // src/auth/email/token.ts
94
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
94
+ function getUserIdFromRefreshToken(refreshToken) {
95
95
  if (refreshToken)
96
96
  try {
97
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
97
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
98
98
  if (typeof decoded !== "string" && typeof decoded.id === "number")
99
99
  return decoded.id;
100
100
  } catch (e) {
@@ -112,10 +112,7 @@ var getContext = (req) => {
112
112
  const bearer = req.headers.get("authorization");
113
113
  if (!bearer) {
114
114
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
115
- const userId = getUserIdFromRefreshToken(
116
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
117
- refresh
118
- );
115
+ const userId = getUserIdFromRefreshToken(refresh);
119
116
  if (userId) return { userId, isRefreshID: true };
120
117
  return { userId: null };
121
118
  }
@@ -65,10 +65,10 @@ function getEnv(key, skipCheck) {
65
65
  var REFRESH_COOKIE_NAME = "refresh";
66
66
 
67
67
  // src/auth/email/token.ts
68
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
68
+ function getUserIdFromRefreshToken(refreshToken) {
69
69
  if (refreshToken)
70
70
  try {
71
- const decoded = verify(refreshToken, refreshKey);
71
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
72
72
  if (typeof decoded !== "string" && typeof decoded.id === "number")
73
73
  return decoded.id;
74
74
  } catch (e) {
@@ -86,10 +86,7 @@ var getContext = (req) => {
86
86
  const bearer = req.headers.get("authorization");
87
87
  if (!bearer) {
88
88
  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
89
- const userId = getUserIdFromRefreshToken(
90
- getEnv("REFRESH_KEY" /* REFRESH_KEY */),
91
- refresh
92
- );
89
+ const userId = getUserIdFromRefreshToken(refresh);
93
90
  if (userId) return { userId, isRefreshID: true };
94
91
  return { userId: null };
95
92
  }
@@ -663,7 +663,6 @@ async function initGraphQLServer({
663
663
  }
664
664
 
665
665
  // src/graphql/utils.ts
666
- var import_cache = require("next/cache");
667
666
  var import_headers2 = require("next/headers");
668
667
  var import_type_graphql2 = require("type-graphql");
669
668
 
@@ -676,10 +675,10 @@ var import_jsonwebtoken = require("jsonwebtoken");
676
675
  var import_headers = require("next/headers");
677
676
  var import_navigation = require("next/navigation");
678
677
  var import_server2 = require("next/server");
679
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
678
+ function getUserIdFromRefreshToken(refreshToken) {
680
679
  if (refreshToken)
681
680
  try {
682
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
681
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
683
682
  if (typeof decoded !== "string" && typeof decoded.id === "number")
684
683
  return decoded.id;
685
684
  } catch (e) {
@@ -691,30 +690,31 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
691
690
 
692
691
  // src/graphql/utils.ts
693
692
  function query(fn, options) {
694
- return { ...options, fn, call: getCaller(fn, options) };
693
+ return {
694
+ ...options,
695
+ fn,
696
+ authCall: getAuthCaller(fn),
697
+ call: getCaller(fn)
698
+ };
695
699
  }
696
700
  var getUserId = async () => {
697
701
  const Cookie = await (0, import_headers2.cookies)();
698
702
  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
699
703
  return refresh ? getUserIdFromRefreshToken(refresh) : null;
700
704
  };
701
- function getCaller(fn, options) {
702
- return async (data, config) => {
703
- if (config?.revalidate) {
704
- const cachedFn = (data2, config2) => {
705
- "use cache";
706
- if (config2?.revalidate) (0, import_cache.cacheLife)(config2.revalidate);
707
- if (config2?.tags) (0, import_cache.cacheTag)(...config2.tags);
708
- const ctx2 = {
709
- userId: null,
710
- isRefreshID: true
711
- };
712
- return fn(ctx2, data2);
713
- };
714
- return cachedFn(data, config);
715
- }
705
+ function getAuthCaller(fn) {
706
+ return async (data) => {
707
+ const ctx = {
708
+ userId: await getUserId(),
709
+ isRefreshID: true
710
+ };
711
+ return fn(ctx, data);
712
+ };
713
+ }
714
+ function getCaller(fn) {
715
+ return async (data) => {
716
716
  const ctx = {
717
- userId: options.authorized ? await getUserId() : null,
717
+ userId: null,
718
718
  isRefreshID: true
719
719
  };
720
720
  return fn(ctx, data);
@@ -7,4 +7,3 @@ import '@apollo/server';
7
7
  import 'next/server';
8
8
  import 'type-graphql';
9
9
  import 'graphql';
10
- import 'next/cache';
@@ -7,4 +7,3 @@ import '@apollo/server';
7
7
  import 'next/server';
8
8
  import 'type-graphql';
9
9
  import 'graphql';
10
- import 'next/cache';
@@ -650,7 +650,6 @@ async function initGraphQLServer({
650
650
  }
651
651
 
652
652
  // src/graphql/utils.ts
653
- import { cacheLife, cacheTag } from "next/cache";
654
653
  import { cookies as cookies2 } from "next/headers";
655
654
  import {
656
655
  Arg,
@@ -672,10 +671,10 @@ import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
672
671
  import { cookies } from "next/headers";
673
672
  import { redirect } from "next/navigation";
674
673
  import { NextResponse } from "next/server";
675
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
674
+ function getUserIdFromRefreshToken(refreshToken) {
676
675
  if (refreshToken)
677
676
  try {
678
- const decoded = verify(refreshToken, refreshKey);
677
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
679
678
  if (typeof decoded !== "string" && typeof decoded.id === "number")
680
679
  return decoded.id;
681
680
  } catch (e) {
@@ -687,30 +686,31 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
687
686
 
688
687
  // src/graphql/utils.ts
689
688
  function query(fn, options) {
690
- return { ...options, fn, call: getCaller(fn, options) };
689
+ return {
690
+ ...options,
691
+ fn,
692
+ authCall: getAuthCaller(fn),
693
+ call: getCaller(fn)
694
+ };
691
695
  }
692
696
  var getUserId = async () => {
693
697
  const Cookie = await cookies2();
694
698
  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
695
699
  return refresh ? getUserIdFromRefreshToken(refresh) : null;
696
700
  };
697
- function getCaller(fn, options) {
698
- return async (data, config) => {
699
- if (config?.revalidate) {
700
- const cachedFn = (data2, config2) => {
701
- "use cache";
702
- if (config2?.revalidate) cacheLife(config2.revalidate);
703
- if (config2?.tags) cacheTag(...config2.tags);
704
- const ctx2 = {
705
- userId: null,
706
- isRefreshID: true
707
- };
708
- return fn(ctx2, data2);
709
- };
710
- return cachedFn(data, config);
711
- }
701
+ function getAuthCaller(fn) {
702
+ return async (data) => {
703
+ const ctx = {
704
+ userId: await getUserId(),
705
+ isRefreshID: true
706
+ };
707
+ return fn(ctx, data);
708
+ };
709
+ }
710
+ function getCaller(fn) {
711
+ return async (data) => {
712
712
  const ctx = {
713
- userId: options.authorized ? await getUserId() : null,
713
+ userId: null,
714
714
  isRefreshID: true
715
715
  };
716
716
  return fn(ctx, data);
@@ -34,7 +34,6 @@ __export(utils_exports, {
34
34
  query: () => query
35
35
  });
36
36
  module.exports = __toCommonJS(utils_exports);
37
- var import_cache = require("next/cache");
38
37
  var import_headers2 = require("next/headers");
39
38
  var import_type_graphql = require("type-graphql");
40
39
 
@@ -47,10 +46,61 @@ var import_jsonwebtoken = require("jsonwebtoken");
47
46
  var import_headers = require("next/headers");
48
47
  var import_navigation = require("next/navigation");
49
48
  var import_server = require("next/server");
50
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
49
+
50
+ // src/env.ts
51
+ var getEnvValue = (key) => {
52
+ switch (key) {
53
+ case "NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */:
54
+ return process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT;
55
+ case "NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */:
56
+ return process.env.NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT;
57
+ case "NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */:
58
+ return process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT;
59
+ case "NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT" /* NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT */:
60
+ return process.env.NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT;
61
+ case "NEXT_PUBLIC_FILE_ENDPOINT" /* NEXT_PUBLIC_FILE_ENDPOINT */:
62
+ return process.env.NEXT_PUBLIC_FILE_ENDPOINT;
63
+ case "NEXT_PUBLIC_BASE_URL" /* NEXT_PUBLIC_BASE_URL */:
64
+ return process.env.NEXT_PUBLIC_BASE_URL;
65
+ case "REFRESH_KEY" /* REFRESH_KEY */:
66
+ return process.env.REFRESH_KEY;
67
+ case "SIGNING_KEY" /* SIGNING_KEY */:
68
+ return process.env.SIGNING_KEY;
69
+ case "INSTAGRAM_CLIENT_SECRET" /* INSTAGRAM_CLIENT_SECRET */:
70
+ return process.env.INSTAGRAM_CLIENT_SECRET;
71
+ case "INSTAGRAM_CLIENT_ID" /* INSTAGRAM_CLIENT_ID */:
72
+ return process.env.INSTAGRAM_CLIENT_ID;
73
+ case "GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */:
74
+ return process.env.GOOGLE_CLIENT_SECRET;
75
+ case "GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */:
76
+ return process.env.GOOGLE_CLIENT_ID;
77
+ case "TURNSTILE_KEY" /* TURNSTILE_KEY */:
78
+ return process.env.TURNSTILE_KEY;
79
+ case "AWS_ACCESS_KEY_ID" /* AWS_ACCESS_KEY_ID */:
80
+ return process.env.AWS_ACCESS_KEY_ID;
81
+ case "AWS_ACCESS_KEY_SECRET" /* AWS_ACCESS_KEY_SECRET */:
82
+ return process.env.AWS_ACCESS_KEY_SECRET;
83
+ case "AWS_REGION" /* AWS_REGION */:
84
+ return process.env.AWS_REGION;
85
+ case "AWS_BUCKET" /* AWS_BUCKET */:
86
+ return process.env.AWS_BUCKET;
87
+ case "NODE_ENV" /* NODE_ENV */:
88
+ return process.env.NODE_ENV;
89
+ default:
90
+ return process.env[key];
91
+ }
92
+ };
93
+ function getEnv(key, skipCheck) {
94
+ const value = getEnvValue(key);
95
+ if (!skipCheck && !value) throw new Error(`${key} is not defined`);
96
+ return value;
97
+ }
98
+
99
+ // src/auth/email/token.ts
100
+ function getUserIdFromRefreshToken(refreshToken) {
51
101
  if (refreshToken)
52
102
  try {
53
- const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
103
+ const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
54
104
  if (typeof decoded !== "string" && typeof decoded.id === "number")
55
105
  return decoded.id;
56
106
  } catch (e) {
@@ -62,30 +112,31 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
62
112
 
63
113
  // src/graphql/utils.ts
64
114
  function query(fn, options) {
65
- return { ...options, fn, call: getCaller(fn, options) };
115
+ return {
116
+ ...options,
117
+ fn,
118
+ authCall: getAuthCaller(fn),
119
+ call: getCaller(fn)
120
+ };
66
121
  }
67
122
  var getUserId = async () => {
68
123
  const Cookie = await (0, import_headers2.cookies)();
69
124
  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
70
125
  return refresh ? getUserIdFromRefreshToken(refresh) : null;
71
126
  };
72
- function getCaller(fn, options) {
73
- return async (data, config) => {
74
- if (config?.revalidate) {
75
- const cachedFn = (data2, config2) => {
76
- "use cache";
77
- if (config2?.revalidate) (0, import_cache.cacheLife)(config2.revalidate);
78
- if (config2?.tags) (0, import_cache.cacheTag)(...config2.tags);
79
- const ctx2 = {
80
- userId: null,
81
- isRefreshID: true
82
- };
83
- return fn(ctx2, data2);
84
- };
85
- return cachedFn(data, config);
86
- }
127
+ function getAuthCaller(fn) {
128
+ return async (data) => {
129
+ const ctx = {
130
+ userId: await getUserId(),
131
+ isRefreshID: true
132
+ };
133
+ return fn(ctx, data);
134
+ };
135
+ }
136
+ function getCaller(fn) {
137
+ return async (data) => {
87
138
  const ctx = {
88
- userId: options.authorized ? await getUserId() : null,
139
+ userId: null,
89
140
  isRefreshID: true
90
141
  };
91
142
  return fn(ctx, data);
@@ -1,5 +1,4 @@
1
1
  import { GraphQLScalarType } from 'graphql';
2
- import { cacheLife } from 'next/cache';
3
2
  import { Query, Arg, ClassType } from 'type-graphql';
4
3
  import { AuthorizedContext, Context } from './types.mjs';
5
4
 
@@ -26,14 +25,11 @@ interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable ex
26
25
  }
27
26
  interface QueryDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
28
27
  fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
29
- call: (data: ParsedGQLTypeWithNullability<U, InputNullable, false>, config?: CallerConfig<IsAuth>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
28
+ call: IsAuth extends true ? never : (data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
29
+ authCall: (data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
30
30
  mutation?: boolean;
31
31
  }
32
- type CallerConfig<IsAuth extends boolean> = {
33
- revalidate?: IsAuth extends true ? never : Parameters<typeof cacheLife>[0];
34
- tags?: IsAuth extends true ? never : string[];
35
- };
36
- declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn" | "call">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
32
+ declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn" | "authCall" | "call">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
37
33
  interface FieldResolverDefinition<T, U, Root, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
38
34
  fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
39
35
  }
@@ -1,5 +1,4 @@
1
1
  import { GraphQLScalarType } from 'graphql';
2
- import { cacheLife } from 'next/cache';
3
2
  import { Query, Arg, ClassType } from 'type-graphql';
4
3
  import { AuthorizedContext, Context } from './types.js';
5
4
 
@@ -26,14 +25,11 @@ interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable ex
26
25
  }
27
26
  interface QueryDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
28
27
  fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
29
- call: (data: ParsedGQLTypeWithNullability<U, InputNullable, false>, config?: CallerConfig<IsAuth>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
28
+ call: IsAuth extends true ? never : (data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
29
+ authCall: (data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
30
30
  mutation?: boolean;
31
31
  }
32
- type CallerConfig<IsAuth extends boolean> = {
33
- revalidate?: IsAuth extends true ? never : Parameters<typeof cacheLife>[0];
34
- tags?: IsAuth extends true ? never : string[];
35
- };
36
- declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn" | "call">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
32
+ declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn" | "authCall" | "call">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
37
33
  interface FieldResolverDefinition<T, U, Root, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
38
34
  fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
39
35
  }
@@ -10,7 +10,6 @@ var __decorateClass = (decorators, target, key, kind) => {
10
10
  };
11
11
 
12
12
  // src/graphql/utils.ts
13
- import { cacheLife, cacheTag } from "next/cache";
14
13
  import { cookies as cookies2 } from "next/headers";
15
14
  import {
16
15
  Arg,
@@ -32,10 +31,61 @@ import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
32
31
  import { cookies } from "next/headers";
33
32
  import { redirect } from "next/navigation";
34
33
  import { NextResponse } from "next/server";
35
- function getUserIdFromRefreshToken(refreshKey, refreshToken) {
34
+
35
+ // src/env.ts
36
+ var getEnvValue = (key) => {
37
+ switch (key) {
38
+ case "NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */:
39
+ return process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT;
40
+ case "NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */:
41
+ return process.env.NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT;
42
+ case "NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */:
43
+ return process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT;
44
+ case "NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT" /* NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT */:
45
+ return process.env.NEXT_PUBLIC_INSTAGRAM_AUTH_ENDPOINT;
46
+ case "NEXT_PUBLIC_FILE_ENDPOINT" /* NEXT_PUBLIC_FILE_ENDPOINT */:
47
+ return process.env.NEXT_PUBLIC_FILE_ENDPOINT;
48
+ case "NEXT_PUBLIC_BASE_URL" /* NEXT_PUBLIC_BASE_URL */:
49
+ return process.env.NEXT_PUBLIC_BASE_URL;
50
+ case "REFRESH_KEY" /* REFRESH_KEY */:
51
+ return process.env.REFRESH_KEY;
52
+ case "SIGNING_KEY" /* SIGNING_KEY */:
53
+ return process.env.SIGNING_KEY;
54
+ case "INSTAGRAM_CLIENT_SECRET" /* INSTAGRAM_CLIENT_SECRET */:
55
+ return process.env.INSTAGRAM_CLIENT_SECRET;
56
+ case "INSTAGRAM_CLIENT_ID" /* INSTAGRAM_CLIENT_ID */:
57
+ return process.env.INSTAGRAM_CLIENT_ID;
58
+ case "GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */:
59
+ return process.env.GOOGLE_CLIENT_SECRET;
60
+ case "GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */:
61
+ return process.env.GOOGLE_CLIENT_ID;
62
+ case "TURNSTILE_KEY" /* TURNSTILE_KEY */:
63
+ return process.env.TURNSTILE_KEY;
64
+ case "AWS_ACCESS_KEY_ID" /* AWS_ACCESS_KEY_ID */:
65
+ return process.env.AWS_ACCESS_KEY_ID;
66
+ case "AWS_ACCESS_KEY_SECRET" /* AWS_ACCESS_KEY_SECRET */:
67
+ return process.env.AWS_ACCESS_KEY_SECRET;
68
+ case "AWS_REGION" /* AWS_REGION */:
69
+ return process.env.AWS_REGION;
70
+ case "AWS_BUCKET" /* AWS_BUCKET */:
71
+ return process.env.AWS_BUCKET;
72
+ case "NODE_ENV" /* NODE_ENV */:
73
+ return process.env.NODE_ENV;
74
+ default:
75
+ return process.env[key];
76
+ }
77
+ };
78
+ function getEnv(key, skipCheck) {
79
+ const value = getEnvValue(key);
80
+ if (!skipCheck && !value) throw new Error(`${key} is not defined`);
81
+ return value;
82
+ }
83
+
84
+ // src/auth/email/token.ts
85
+ function getUserIdFromRefreshToken(refreshToken) {
36
86
  if (refreshToken)
37
87
  try {
38
- const decoded = verify(refreshToken, refreshKey);
88
+ const decoded = verify(refreshToken, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
39
89
  if (typeof decoded !== "string" && typeof decoded.id === "number")
40
90
  return decoded.id;
41
91
  } catch (e) {
@@ -47,30 +97,31 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
47
97
 
48
98
  // src/graphql/utils.ts
49
99
  function query(fn, options) {
50
- return { ...options, fn, call: getCaller(fn, options) };
100
+ return {
101
+ ...options,
102
+ fn,
103
+ authCall: getAuthCaller(fn),
104
+ call: getCaller(fn)
105
+ };
51
106
  }
52
107
  var getUserId = async () => {
53
108
  const Cookie = await cookies2();
54
109
  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
55
110
  return refresh ? getUserIdFromRefreshToken(refresh) : null;
56
111
  };
57
- function getCaller(fn, options) {
58
- return async (data, config) => {
59
- if (config?.revalidate) {
60
- const cachedFn = (data2, config2) => {
61
- "use cache";
62
- if (config2?.revalidate) cacheLife(config2.revalidate);
63
- if (config2?.tags) cacheTag(...config2.tags);
64
- const ctx2 = {
65
- userId: null,
66
- isRefreshID: true
67
- };
68
- return fn(ctx2, data2);
69
- };
70
- return cachedFn(data, config);
71
- }
112
+ function getAuthCaller(fn) {
113
+ return async (data) => {
114
+ const ctx = {
115
+ userId: await getUserId(),
116
+ isRefreshID: true
117
+ };
118
+ return fn(ctx, data);
119
+ };
120
+ }
121
+ function getCaller(fn) {
122
+ return async (data) => {
72
123
  const ctx = {
73
- userId: options.authorized ? await getUserId() : null,
124
+ userId: null,
74
125
  isRefreshID: true
75
126
  };
76
127
  return fn(ctx, data);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "naystack",
3
- "version": "1.4.21",
3
+ "version": "1.4.26",
4
4
  "description": "A stack built with Next + GraphQL + S3 + Auth",
5
5
  "main": "dist/index.cjs.js",
6
6
  "module": "dist/index.esm.js",