naystack 1.5.28 → 1.5.29

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.
@@ -116,11 +116,13 @@ var AuthWrapper = ({
116
116
  function useAuthFetch(getRefreshToken) {
117
117
  const setToken = useSetToken();
118
118
  const fetchToken = async () => {
119
- fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
120
- credentials: "include",
121
- body: getRefreshToken ? JSON.stringify({
122
- [REFRESH_COOKIE_NAME]: await getRefreshToken()
123
- }) : void 0
119
+ const url = new URL(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */));
120
+ if (getRefreshToken) {
121
+ const token = await getRefreshToken();
122
+ if (token) url.searchParams.set(REFRESH_COOKIE_NAME, token);
123
+ }
124
+ fetch(url, {
125
+ credentials: "include"
124
126
  }).then((res) => res.json()).then((data) => setToken(data.accessToken));
125
127
  };
126
128
  (0, import_react.useEffect)(() => {
@@ -43,7 +43,7 @@ declare const AuthWrapper: ({ children, onTokenUpdate, }: {
43
43
  children: React__default.ReactNode;
44
44
  onTokenUpdate?: (token: string | null) => void;
45
45
  }) => React__default.JSX.Element;
46
- declare function useAuthFetch(getRefreshToken?: () => Promise<string>): void;
46
+ declare function useAuthFetch(getRefreshToken?: () => Promise<string | null>): void;
47
47
  declare function AuthApply({ data }: {
48
48
  data?: string | null;
49
49
  }): null;
@@ -43,7 +43,7 @@ declare const AuthWrapper: ({ children, onTokenUpdate, }: {
43
43
  children: React__default.ReactNode;
44
44
  onTokenUpdate?: (token: string | null) => void;
45
45
  }) => React__default.JSX.Element;
46
- declare function useAuthFetch(getRefreshToken?: () => Promise<string>): void;
46
+ declare function useAuthFetch(getRefreshToken?: () => Promise<string | null>): void;
47
47
  declare function AuthApply({ data }: {
48
48
  data?: string | null;
49
49
  }): null;
@@ -81,11 +81,13 @@ var AuthWrapper = ({
81
81
  function useAuthFetch(getRefreshToken) {
82
82
  const setToken = useSetToken();
83
83
  const fetchToken = async () => {
84
- fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
85
- credentials: "include",
86
- body: getRefreshToken ? JSON.stringify({
87
- [REFRESH_COOKIE_NAME]: await getRefreshToken()
88
- }) : void 0
84
+ const url = new URL(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */));
85
+ if (getRefreshToken) {
86
+ const token = await getRefreshToken();
87
+ if (token) url.searchParams.set(REFRESH_COOKIE_NAME, token);
88
+ }
89
+ fetch(url, {
90
+ credentials: "include"
89
91
  }).then((res) => res.json()).then((data) => setToken(data.accessToken));
90
92
  };
91
93
  useEffect(() => {
@@ -242,10 +242,8 @@ var getDeleteRoute = (options) => async (req) => {
242
242
 
243
243
  // src/auth/email/routes/get.ts
244
244
  var getGetRoute = (options) => async (req) => {
245
- const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
246
- const requestBody = refresh ? null : await req.json();
247
- const bodyRefresh = requestBody?.[REFRESH_COOKIE_NAME];
248
- const userID = getUserIdFromRefreshToken(refresh || bodyRefresh);
245
+ const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.nextUrl.searchParams.get(REFRESH_COOKIE_NAME) || void 0;
246
+ const userID = getUserIdFromRefreshToken(refresh);
249
247
  if (userID) {
250
248
  if (options.onRefresh) {
251
249
  const body = await req.json();
@@ -205,10 +205,8 @@ var getDeleteRoute = (options) => async (req) => {
205
205
 
206
206
  // src/auth/email/routes/get.ts
207
207
  var getGetRoute = (options) => async (req) => {
208
- const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
209
- const requestBody = refresh ? null : await req.json();
210
- const bodyRefresh = requestBody?.[REFRESH_COOKIE_NAME];
211
- const userID = getUserIdFromRefreshToken(refresh || bodyRefresh);
208
+ const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.nextUrl.searchParams.get(REFRESH_COOKIE_NAME) || void 0;
209
+ const userID = getUserIdFromRefreshToken(refresh);
212
210
  if (userID) {
213
211
  if (options.onRefresh) {
214
212
  const body = await req.json();
@@ -123,10 +123,8 @@ function getUserIdFromRefreshToken(refreshToken) {
123
123
 
124
124
  // src/auth/email/routes/get.ts
125
125
  var getGetRoute = (options) => async (req) => {
126
- const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
127
- const requestBody = refresh ? null : await req.json();
128
- const bodyRefresh = requestBody?.[REFRESH_COOKIE_NAME];
129
- const userID = getUserIdFromRefreshToken(refresh || bodyRefresh);
126
+ const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.nextUrl.searchParams.get(REFRESH_COOKIE_NAME) || void 0;
127
+ const userID = getUserIdFromRefreshToken(refresh);
130
128
  if (userID) {
131
129
  if (options.onRefresh) {
132
130
  const body = await req.json();
@@ -97,10 +97,8 @@ function getUserIdFromRefreshToken(refreshToken) {
97
97
 
98
98
  // src/auth/email/routes/get.ts
99
99
  var getGetRoute = (options) => async (req) => {
100
- const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
101
- const requestBody = refresh ? null : await req.json();
102
- const bodyRefresh = requestBody?.[REFRESH_COOKIE_NAME];
103
- const userID = getUserIdFromRefreshToken(refresh || bodyRefresh);
100
+ const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.nextUrl.searchParams.get(REFRESH_COOKIE_NAME) || void 0;
101
+ const userID = getUserIdFromRefreshToken(refresh);
104
102
  if (userID) {
105
103
  if (options.onRefresh) {
106
104
  const body = await req.json();
@@ -260,10 +260,8 @@ var getDeleteRoute = (options) => async (req) => {
260
260
 
261
261
  // src/auth/email/routes/get.ts
262
262
  var getGetRoute = (options) => async (req) => {
263
- const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
264
- const requestBody = refresh ? null : await req.json();
265
- const bodyRefresh = requestBody?.[REFRESH_COOKIE_NAME];
266
- const userID = getUserIdFromRefreshToken(refresh || bodyRefresh);
263
+ const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.nextUrl.searchParams.get(REFRESH_COOKIE_NAME) || void 0;
264
+ const userID = getUserIdFromRefreshToken(refresh);
267
265
  if (userID) {
268
266
  if (options.onRefresh) {
269
267
  const body = await req.json();
@@ -217,10 +217,8 @@ var getDeleteRoute = (options) => async (req) => {
217
217
 
218
218
  // src/auth/email/routes/get.ts
219
219
  var getGetRoute = (options) => async (req) => {
220
- const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
221
- const requestBody = refresh ? null : await req.json();
222
- const bodyRefresh = requestBody?.[REFRESH_COOKIE_NAME];
223
- const userID = getUserIdFromRefreshToken(refresh || bodyRefresh);
220
+ const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.nextUrl.searchParams.get(REFRESH_COOKIE_NAME) || void 0;
221
+ const userID = getUserIdFromRefreshToken(refresh);
224
222
  if (userID) {
225
223
  if (options.onRefresh) {
226
224
  const body = await req.json();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "naystack",
3
- "version": "1.5.28",
3
+ "version": "1.5.29",
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",