Merge pull request #236 from connect-foundation/feature/https

Feature/https
connect-foundation · Dec 20, 2019 · dc461c3 · dc461c3
2 parents 9ab1434 + fd30275
commit dc461c3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 12 deletions.
diff --git 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
@@ -11,7 +11,7 @@ const Link = styled.a``;
 
 const LoginBtn = () => {
   return (
-    <Link href={`http://${config.serverHost}/auth/google`}>
+    <Link href={`${config.serverHost}/auth/google`}>
       <LoginBtnImg
         alt="LOGIN"
         src={process.env.PUBLIC_URL + '/images/btn_google_signin_normal.png'}

diff --git a/client/src/utils/config.ts b/client/src/utils/config.ts
@@ -11,11 +11,13 @@ const configs = {
 };
 
 const devConfigs = {
-  serverHost: 'localhost:4000'
+  serverHost: 'http://localhost:4000',
+  webSocket: `ws://localhost:4000`
 };
 
 const prdConfigs = {
-  serverHost: process.env.REACT_APP_SERVER_HOST || ''
+  serverHost: `https://${process.env.REACT_APP_SERVER_HOST}`,
+  webSocket: `wss://${process.env.REACT_APP_SERVER_HOST}`
 };
 
 const config = Object.assign(

diff --git a/server/src/init.ts b/server/src/init.ts
@@ -1,18 +1,15 @@
 import { Options } from 'graphql-yoga';
 import config from './utils/config';
 import app from './app';
+import cors from './utils/cors';
+import https from './utils/https';
 import { onConnect, onDisconnect } from './middleware/subscription';
 
 const PORT: string | number = config.port;
 const ENDPOINT: string = '/graphql';
 const PLAYGROUND: string = '/playground';
 const SUBSCRIPTIONS: string = '/subscriptions';
 
-const corsOptions = {
-  origin: config.clientHost,
-  credentials: true
-};
-
 const appOptions: Options = {
   port: PORT,
   endpoint: ENDPOINT,
@@ -23,7 +20,8 @@ const appOptions: Options = {
     onDisconnect,
     keepAlive: 10000
   },
-  cors: corsOptions
+  cors,
+  https
 };
 
 const handleStart = () => {

diff --git a/server/src/utils/cors.ts 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
@@ -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;