Merge pull request #179 from hackmcgill/develop

Bug fixes, new routes

Author: pierreTklein

.env.example

@@ -3,6 +3,10 @@ PORT=<Some Port such as 3000>
 #The address on which the server is being run:
 ADDRESS=<Some address such as 127.0.0.1>
 
+#front-end server
+FRONTEND_ADDRESS_DEV=localhost:1337
+FRONTEND_ADDRESS_DEPLOY=app.mchacks.ca
+
 #The info for the deployment database
 DB_ADDRESS_DEPLOY=<Deployment address>
 DB_USER_DEPLOY=<username for db connection>

.gitignore

@@ -61,5 +61,8 @@ node_modules
 #creds
 gcp_creds.json
 
+#certbot 
+certbot/
+
 #secrets
-secret.yaml
+secret.yaml

.vscode/settings.json

@@ -4,5 +4,6 @@
         "node":true,
         "this":false,
         "bad_property":false
-    }
+    },
+    "search.usePCRE2": true
 }

apidoc.json

@@ -4,6 +4,6 @@
     "defaultVersion": "0.0.8",
     "description": "Documentation for the API used for mchacks",
     "title": "hackerAPI documentation",
-    "url": "https://mchacks.ca/api",
-    "sampleUrl": "https://mchacks.ca/api"
+    "url": "https://api.mchacks.ca/api",
+    "sampleUrl": "https://api.mchacks.ca/api"
 }

app.js

@@ -36,13 +36,13 @@ let corsOptions = {};
 
 if (!Services.env.isProduction()) {
     corsOptions = {
-        origin: ["http://localhost:1337", "http://localhost:8989"],
+        origin: [process.env.FRONTEND_ADDRESS_DEV],
         credentials: true
     };
 } else {
     // TODO: change this when necessary
     corsOptions = {
-        origin: ["https://mchacks.ca/"],
+        origin: [process.env.FRONTEND_ADDRESS_DEPLOY],
         credentials: true
     };
 }

assets/email/AccountConfirmation.hbs

@@ -1,4 +1,4 @@
 <b>
     Confirm Account:
-    <a href="{{link}}">here</a>
+    <a href="{{{link}}}">here</a>
 </b>

assets/email/AccountInvitation.hbs

@@ -1,4 +1,4 @@
 <b>
     Create Your Account:
-    <a href="{{link}}">here</a>
+    <a href="{{{link}}}">here</a>
 </b>

assets/email/ResetPassword.hbs

@@ -1,4 +1,4 @@
 <b>
     Reset password:
-    <a href="{{link}}">here</a>
+    <a href="{{{link}}}">here</a>
 </b>

assets/email/test.hbs

@@ -1 +1 @@
-<div>This is used for testing email service. DO NOT REMOVE.{{TEST}}</div>
+<div>This is used for testing email service. DO NOT REMOVE.{{TEST}}. <a href="{{{NOT_ESCAPED}}}">link</a></div>

constants/error.constant.js

@@ -11,6 +11,7 @@ const SPONSOR_ID_409_MESSAGE = "Conflict with sponsor accountId link";
 const VOLUNTEER_ID_409_MESSAGE = "Conflict with volunteer accountId link";
 const HACKER_ID_409_MESSAGE = "Conflict with hacker accountId link";
 const TEAM_MEMBER_409_MESSAGE = "Conflict with team member being in another team";
+const HACKER_STATUS_409_MESSAGE = "Conflict with hacker status";
 
 const TEAM_MEMBER_422_MESSAGE = "Duplicate team member in input";
 const VALIDATION_422_MESSAGE = "Validation failed";
@@ -59,4 +60,5 @@ module.exports = {
     GENERIC_500_MESSAGE: GENERIC_500_MESSAGE,
     ACCOUNT_DUPLICATE_422_MESSAGE: ACCOUNT_DUPLICATE_422_MESSAGE,
     LOGIN_500_MESSAGE: LOGIN_500_MESSAGE,
+    HACKER_STATUS_409_MESSAGE: HACKER_STATUS_409_MESSAGE,
 };