fix: typo, trim api key (#207)

* fix: typo * chore: remove unnecessary then * fix: trim api key * fix: typo * chore: add api key salt to .env-example
opengovsg · May 11, 2020 · c094dcf · c094dcf
1 parent 1461357
commit c094dcf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/backend/.env-example b/backend/.env-example
@@ -11,7 +11,7 @@ SES_HOST=
 SES_PASS=
 SES_USER=
 SES_PORT=
-SECRET_MANAGER_SALT="$2b$10$iDQWc/ZxTnAOMdx8022VWe"
+SECRET_MANAGER_SALT=$2b$10$iDQWc/ZxTnAOMdx8022VWe
 TWILIO_API_SECRET=YOURSECRET
 TWILIO_MESSAGING_SERVICE_SID=MGXXX
 TWILIO_API_KEY=SKXXX
@@ -20,3 +20,4 @@ DEFAULT_COUNTRY_CODE=65
 FRONTEND_URL=http://localhost:3000
 COOKIE_DOMAIN=localhost
 AWS_LOG_GROUP_NAME='postmangovsg-beanstalk-test'
+API_KEY_SALT_V1=$2b$10$5CuueB/CRZq8/JgmkzAK1e
diff --git a/backend/bin/api-key/index.js b/backend/bin/api-key/index.js
@@ -40,7 +40,6 @@ const generateKey = () => {
 
 const generateHash = (value, salt) => {
     return bcrypt.hash(value, salt)
-    .then(hashed => hashed)
     .catch(err=>{
         console.error(`Could not generate hash. Exiting. ${err.stack}`)
         process.exit(1)

diff --git a/backend/src/core/loaders/cloudwatch.loader.ts b/backend/src/core/loaders/cloudwatch.loader.ts
@@ -8,7 +8,7 @@ const cloudwatchLoader = async (): Promise<void> => {
   const instanceId = await getInstanceId()
   try {
     if (instanceId) {
-      logger.info({ message: `Detetcted instanceId as ${instanceId}` })
+      logger.info({ message: `Detected instanceId as ${instanceId}` })
       logger.add(new WinstonCloudwatch({
         logGroupName: config.aws.logGroupName,
         logStreamName: instanceId,

diff --git a/backend/src/core/middlewares/is-authenticated.middleware.ts b/backend/src/core/middlewares/is-authenticated.middleware.ts
@@ -8,9 +8,10 @@ const getApiKey = (req: Request): string | null => {
   const authHeader = req.get('authorization')
   if(!authHeader) return null
 
-  const [header, apiKey] = authHeader.split(' ')
+  const [header, bearerToken] = authHeader.split(' ')
   if (headerKey !== header) return null
 
+  const apiKey = bearerToken.trim()
   const [name, version, key] = apiKey.split('_')
   if (!name || !version || !key) return null
 

diff --git a/backend/src/email/routes/email.routes.ts b/backend/src/email/routes/email.routes.ts
@@ -457,7 +457,7 @@ router.get('/upload/start', celebrate(uploadStartValidator), canEditCampaign, up
  *           application/json:
  *             schema:
  *               required:
- *                 - transcation_id
+ *                 - transaction_id
  *                 - filename
  *               properties:
  *                 transaction_id: