naystack 1.5.34 → 1.5.36

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 (13) hide show
  1. package/dist/auth/email/index.cjs.js +5 -4
  2. package/dist/auth/email/index.esm.js +5 -4
  3. package/dist/auth/email/server.cjs.js +9 -8
  4. package/dist/auth/email/server.esm.js +13 -12
  5. package/dist/auth/index.cjs.js +5 -4
  6. package/dist/auth/index.esm.js +5 -4
  7. package/dist/graphql/index.cjs.js +3 -2
  8. package/dist/graphql/index.esm.js +3 -2
  9. package/dist/graphql/init.cjs.js +3 -2
  10. package/dist/graphql/init.esm.js +3 -2
  11. package/dist/utils/route.cjs.js +3 -2
  12. package/dist/utils/route.esm.js +3 -2
  13. package/package.json +1 -1
package/dist/auth/email/index.cjs.js CHANGED
@@ -59,8 +59,9 @@ function withCors(handler, allowedOrigins) {
59
59
  if (!allowedOrigins?.length) return handler;
60
60
  return (async (req) => {
61
61
  const origin = req.headers.get("origin");
62
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
63
- if (origin && !corsHeaders) {
62
+ const isSameOrigin = origin === req.nextUrl.origin;
63
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
64
+ if (origin && !isSameOrigin && !corsHeaders) {
64
65
  return new import_server.NextResponse(null, { status: 403 });
65
66
  }
66
67
  const response = await handler(req);
@@ -383,9 +384,9 @@ function AuthFetch() {
383
384
  {
384
385
  fetch: async () => {
385
386
  const cookie = await (0, import_headers3.cookies)();
386
- const token = cookie.get("refresh");
387
+ const token = cookie.get(REFRESH_COOKIE_NAME);
387
388
  if (!token) return null;
388
- return fetch(process.env.NEXT_PUBLIC_BACKEND_BASE_URL + `/email`, {
389
+ return fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
389
390
  credentials: "include",
390
391
  headers: {
391
392
  Cookie: cookie.toString()
package/dist/auth/email/index.esm.js CHANGED
@@ -22,8 +22,9 @@ function withCors(handler, allowedOrigins) {
22
22
  if (!allowedOrigins?.length) return handler;
23
23
  return (async (req) => {
24
24
  const origin = req.headers.get("origin");
25
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
26
- if (origin && !corsHeaders) {
25
+ const isSameOrigin = origin === req.nextUrl.origin;
26
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
27
+ if (origin && !isSameOrigin && !corsHeaders) {
27
28
  return new NextResponse(null, { status: 403 });
28
29
  }
29
30
  const response = await handler(req);
@@ -350,9 +351,9 @@ function AuthFetch() {
350
351
  {
351
352
  fetch: async () => {
352
353
  const cookie = await cookies3();
353
- const token = cookie.get("refresh");
354
+ const token = cookie.get(REFRESH_COOKIE_NAME);
354
355
  if (!token) return null;
355
- return fetch(process.env.NEXT_PUBLIC_BACKEND_BASE_URL + `/email`, {
356
+ return fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
356
357
  credentials: "include",
357
358
  headers: {
358
359
  Cookie: cookie.toString()
package/dist/auth/email/server.cjs.js CHANGED
@@ -37,12 +37,8 @@ var import_client2 = require("naystack/auth/email/client");
37
37
  var import_headers2 = require("next/headers");
38
38
  var import_react3 = __toESM(require("react"));
39
39
 
40
- // src/graphql/server.tsx
41
- var import_client = require("@apollo/client");
42
- var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
43
- var import_headers = require("next/headers");
44
- var import_react = __toESM(require("react"));
45
- var import_react2 = require("react");
40
+ // src/auth/constants.ts
41
+ var REFRESH_COOKIE_NAME = "refresh";
46
42
 
47
43
  // src/env.ts
48
44
  var getEnvValue = (key) => {
@@ -94,6 +90,11 @@ function getEnv(key, skipCheck) {
94
90
  }
95
91
 
96
92
  // src/graphql/server.tsx
93
+ var import_client = require("@apollo/client");
94
+ var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
95
+ var import_headers = require("next/headers");
96
+ var import_react = __toESM(require("react"));
97
+ var import_react2 = require("react");
97
98
  function Injector({
98
99
  fetch: fetch2,
99
100
  Component,
@@ -125,9 +126,9 @@ function AuthFetch() {
125
126
  {
126
127
  fetch: async () => {
127
128
  const cookie = await (0, import_headers2.cookies)();
128
- const token = cookie.get("refresh");
129
+ const token = cookie.get(REFRESH_COOKIE_NAME);
129
130
  if (!token) return null;
130
- return fetch(process.env.NEXT_PUBLIC_BACKEND_BASE_URL + `/email`, {
131
+ return fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
131
132
  credentials: "include",
132
133
  headers: {
133
134
  Cookie: cookie.toString()
package/dist/auth/email/server.esm.js CHANGED
@@ -3,16 +3,8 @@ import { AuthApply } from "naystack/auth/email/client";
3
3
  import { cookies as cookies2 } from "next/headers";
4
4
  import React2 from "react";
5
5
 
6
- // src/graphql/server.tsx
7
- import {
8
- ApolloClient,
9
- HttpLink,
10
- InMemoryCache
11
- } from "@apollo/client";
12
- import { registerApolloClient } from "@apollo/client-integration-nextjs";
13
- import { cookies } from "next/headers";
14
- import React from "react";
15
- import { Suspense } from "react";
6
+ // src/auth/constants.ts
7
+ var REFRESH_COOKIE_NAME = "refresh";
16
8
 
17
9
  // src/env.ts
18
10
  var getEnvValue = (key) => {
@@ -64,6 +56,15 @@ function getEnv(key, skipCheck) {
64
56
  }
65
57
 
66
58
  // src/graphql/server.tsx
59
+ import {
60
+ ApolloClient,
61
+ HttpLink,
62
+ InMemoryCache
63
+ } from "@apollo/client";
64
+ import { registerApolloClient } from "@apollo/client-integration-nextjs";
65
+ import { cookies } from "next/headers";
66
+ import React from "react";
67
+ import { Suspense } from "react";
67
68
  function Injector({
68
69
  fetch: fetch2,
69
70
  Component,
@@ -95,9 +96,9 @@ function AuthFetch() {
95
96
  {
96
97
  fetch: async () => {
97
98
  const cookie = await cookies2();
98
- const token = cookie.get("refresh");
99
+ const token = cookie.get(REFRESH_COOKIE_NAME);
99
100
  if (!token) return null;
100
- return fetch(process.env.NEXT_PUBLIC_BACKEND_BASE_URL + `/email`, {
101
+ return fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
101
102
  credentials: "include",
102
103
  headers: {
103
104
  Cookie: cookie.toString()
package/dist/auth/index.cjs.js CHANGED
@@ -65,8 +65,9 @@ function withCors(handler, allowedOrigins) {
65
65
  if (!allowedOrigins?.length) return handler;
66
66
  return (async (req) => {
67
67
  const origin = req.headers.get("origin");
68
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
69
- if (origin && !corsHeaders) {
68
+ const isSameOrigin = origin === req.nextUrl.origin;
69
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
70
+ if (origin && !isSameOrigin && !corsHeaders) {
70
71
  return new import_server.NextResponse(null, { status: 403 });
71
72
  }
72
73
  const response = await handler(req);
@@ -401,9 +402,9 @@ function AuthFetch() {
401
402
  {
402
403
  fetch: async () => {
403
404
  const cookie = await (0, import_headers3.cookies)();
404
- const token = cookie.get("refresh");
405
+ const token = cookie.get(REFRESH_COOKIE_NAME);
405
406
  if (!token) return null;
406
- return fetch(process.env.NEXT_PUBLIC_BACKEND_BASE_URL + `/email`, {
407
+ return fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
407
408
  credentials: "include",
408
409
  headers: {
409
410
  Cookie: cookie.toString()
package/dist/auth/index.esm.js CHANGED
@@ -22,8 +22,9 @@ function withCors(handler, allowedOrigins) {
22
22
  if (!allowedOrigins?.length) return handler;
23
23
  return (async (req) => {
24
24
  const origin = req.headers.get("origin");
25
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
26
- if (origin && !corsHeaders) {
25
+ const isSameOrigin = origin === req.nextUrl.origin;
26
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
27
+ if (origin && !isSameOrigin && !corsHeaders) {
27
28
  return new NextResponse(null, { status: 403 });
28
29
  }
29
30
  const response = await handler(req);
@@ -362,9 +363,9 @@ function AuthFetch() {
362
363
  {
363
364
  fetch: async () => {
364
365
  const cookie = await cookies3();
365
- const token = cookie.get("refresh");
366
+ const token = cookie.get(REFRESH_COOKIE_NAME);
366
367
  if (!token) return null;
367
- return fetch(process.env.NEXT_PUBLIC_BACKEND_BASE_URL + `/email`, {
368
+ return fetch(getEnv("NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT" /* NEXT_PUBLIC_EMAIL_AUTH_ENDPOINT */), {
368
369
  credentials: "include",
369
370
  headers: {
370
371
  Cookie: cookie.toString()
package/dist/graphql/index.cjs.js CHANGED
@@ -647,8 +647,9 @@ function withCors(handler, allowedOrigins) {
647
647
  if (!allowedOrigins?.length) return handler;
648
648
  return (async (req) => {
649
649
  const origin = req.headers.get("origin");
650
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
651
- if (origin && !corsHeaders) {
650
+ const isSameOrigin = origin === req.nextUrl.origin;
651
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
652
+ if (origin && !isSameOrigin && !corsHeaders) {
652
653
  return new import_server.NextResponse(null, { status: 403 });
653
654
  }
654
655
  const response = await handler(req);
package/dist/graphql/index.esm.js CHANGED
@@ -634,8 +634,9 @@ function withCors(handler, allowedOrigins) {
634
634
  if (!allowedOrigins?.length) return handler;
635
635
  return (async (req) => {
636
636
  const origin = req.headers.get("origin");
637
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
638
- if (origin && !corsHeaders) {
637
+ const isSameOrigin = origin === req.nextUrl.origin;
638
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
639
+ if (origin && !isSameOrigin && !corsHeaders) {
639
640
  return new NextResponse(null, { status: 403 });
640
641
  }
641
642
  const response = await handler(req);
package/dist/graphql/init.cjs.js CHANGED
@@ -100,8 +100,9 @@ function withCors(handler, allowedOrigins) {
100
100
  if (!allowedOrigins?.length) return handler;
101
101
  return (async (req) => {
102
102
  const origin = req.headers.get("origin");
103
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
104
- if (origin && !corsHeaders) {
103
+ const isSameOrigin = origin === req.nextUrl.origin;
104
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
105
+ if (origin && !isSameOrigin && !corsHeaders) {
105
106
  return new import_server.NextResponse(null, { status: 403 });
106
107
  }
107
108
  const response = await handler(req);
package/dist/graphql/init.esm.js CHANGED
@@ -81,8 +81,9 @@ function withCors(handler, allowedOrigins) {
81
81
  if (!allowedOrigins?.length) return handler;
82
82
  return (async (req) => {
83
83
  const origin = req.headers.get("origin");
84
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
85
- if (origin && !corsHeaders) {
84
+ const isSameOrigin = origin === req.nextUrl.origin;
85
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
86
+ if (origin && !isSameOrigin && !corsHeaders) {
86
87
  return new NextResponse(null, { status: 403 });
87
88
  }
88
89
  const response = await handler(req);
package/dist/utils/route.cjs.js CHANGED
@@ -43,8 +43,9 @@ function withCors(handler, allowedOrigins) {
43
43
  if (!allowedOrigins?.length) return handler;
44
44
  return (async (req) => {
45
45
  const origin = req.headers.get("origin");
46
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
47
- if (origin && !corsHeaders) {
46
+ const isSameOrigin = origin === req.nextUrl.origin;
47
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
48
+ if (origin && !isSameOrigin && !corsHeaders) {
48
49
  return new import_server.NextResponse(null, { status: 403 });
49
50
  }
50
51
  const response = await handler(req);
package/dist/utils/route.esm.js CHANGED
@@ -18,8 +18,9 @@ function withCors(handler, allowedOrigins) {
18
18
  if (!allowedOrigins?.length) return handler;
19
19
  return (async (req) => {
20
20
  const origin = req.headers.get("origin");
21
- const corsHeaders = getCorsHeaders(origin, allowedOrigins);
22
- if (origin && !corsHeaders) {
21
+ const isSameOrigin = origin === req.nextUrl.origin;
22
+ const corsHeaders = isSameOrigin ? null : getCorsHeaders(origin, allowedOrigins);
23
+ if (origin && !isSameOrigin && !corsHeaders) {
23
24
  return new NextResponse(null, { status: 403 });
24
25
  }
25
26
  const response = await handler(req);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "naystack",
3
- "version": "1.5.34",
3
+ "version": "1.5.36",
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",