diff --git a/client/src/Constants.ts b/client/src/Constants.ts index 0da23370..7528e584 100644 --- a/client/src/Constants.ts +++ b/client/src/Constants.ts @@ -36,8 +36,8 @@ export const MAX_DATE = '9999-12-31T09:29:26.050Z'; export const WRITING_FEED_CONTENT = 'writingFeedContent'; -export const HTTP_SERVER_URI = `http://${config.serverHost}/graphql`; +export const HTTP_SERVER_URI = `${config.serverHost}/graphql`; -export const UPLOAD_SERVER_URI = `http://${config.serverHost}/graphql`; +export const UPLOAD_SERVER_URI = `${config.serverHost}/graphql`; -export const WEB_SOCKET_URI = `ws://${config.serverHost}/subscriptions`; +export const WEB_SOCKET_URI = `${config.webSocket}/subscriptions`; diff --git a/client/src/pages/SignIn/SignInBtn.tsx b/client/src/pages/SignIn/SignInBtn.tsx index 918d0c66..356099aa 100644 --- a/client/src/pages/SignIn/SignInBtn.tsx +++ b/client/src/pages/SignIn/SignInBtn.tsx @@ -11,7 +11,7 @@ const Link = styled.a``; const LoginBtn = () => { return ( - + { diff --git a/server/src/utils/cors.ts b/server/src/utils/cors.ts new file mode 100644 index 00000000..3682b17f --- /dev/null +++ b/server/src/utils/cors.ts @@ -0,0 +1,8 @@ +import config from './config'; + +const cors = { + origin: config.clientHost, + credentials: true +}; + +export default cors; diff --git a/server/src/utils/https.ts b/server/src/utils/https.ts new file mode 100644 index 00000000..cd63d9ba --- /dev/null +++ b/server/src/utils/https.ts @@ -0,0 +1,13 @@ +import fs from 'fs'; + +const env = process.env.NODE_ENV || 'DEVELOPMENT'; + +const https = + env === 'PRODUCTION' + ? { + cert: fs.readFileSync(process.env.CERT || ''), + key: fs.readFileSync(process.env.KEY || '') + } + : undefined; + +export default https;