Skip to content

Set cors to true #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nadnad wants to merge 7 commits into
base: shipyard-demo
Choose a base branch
from
Open

Set cors to true #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
632a7e9
Set cors to true
nadnad Oct 10, 2023
74fb234
Try setting custom CORS headers
nadnad Oct 10, 2023
99623fd
Cors should be on api service + disable api watch mode
nadnad Oct 10, 2023
9b30bd8
Update to the correct hardcoded url
nadnad Oct 10, 2023
b73282e
No /api basepath
nadnad Oct 10, 2023
c3c1e23
Disable cors
nadnad Oct 10, 2023
170cf5f
liveness+readiness testing
nadnad Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions backend/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ import { frontendPort, getBackendPort } from "../src/utils/portUtils";
require("dotenv").config();

const corsOption = {
origin: process.env.SHIPYARD_DOMAIN_FRONTEND ? `https://${process.env.SHIPYARD_DOMAIN_FRONTEND}` : `http://localhost:${frontendPort}`,
credentials: true,
origin: false,
};

const schema = loadSchemaSync(join(__dirname, "./graphql/schema.graphql"), {
Expand Down
9 changes: 8 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ services:
labels:
shipyard.route: '/'
shipyard.primary-route: 'true'
shipyard.liveness.http.path: '/health'
shipyard.liveness.initial_delay: '15'
shipyard.liveness.period: '15'
shipyard.readiness.http.path: '/health'
shipyard.readiness.initial_delay: '10'
shipyard.liveness.timeout_seconds: 15
shipyard.readiness.period: '15'
environment:
SHIPYARD_DOMAIN_BACKEND: ${SHIPYARD_DOMAIN_BACKEND-}
ports:
Expand All @@ -18,7 +25,7 @@ services:
build:
context: '.'
labels:
shipyard.route: '/api'
shipyard.route: '/'
environment:
SHIPYARD_DOMAIN_FRONTEND: ${SHIPYARD_DOMAIN_FRONTEND-}
ports:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"dev:coverage": "cross-env NODE_ENV=development CYPRESS_COVERAGE=true concurrently yarn:start:react yarn:start:api:watch",
"dev:google": "cross-env VITE_GOOGLE=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",
"dev:okta": "cross-env VITE_OKTA=true NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",
"dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api:watch",
"dev": "cross-env NODE_ENV=development concurrently yarn:start:react yarn:start:api",
"postdb:seed": "yarn db:seed:dev",
"postinstall": "husky install && patch-package",
"prebuild:ci": "yarn predev:cognito:ci",
Expand Down
3 changes: 0 additions & 3 deletions vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ export default defineConfig(({ command, mode }) => {
server: {
port: 3000,
host: "0.0.0.0",
cors: {
origin: false,
},
},
build: {
outDir: "build",
Expand Down