fix(sms): ditch the silly ad-hoc config file for sender ids

#1722 r=vbudhram
mozilla · Mar 14, 2017 · 4cd6f9e · 4cd6f9e
1 parent a9950ac
commit 4cd6f9e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/config/index.js b/config/index.js
@@ -606,6 +606,16 @@ var conf = convict({
       format: RegExp,
       env: 'SMS_REGIONS'
     },
+    senderIds: {
+      doc: 'Sender ids keyed by the region they apply to',
+      default: {
+        CA: '16474909977',
+        GB: 'Firefox',
+        US: '15036789977'
+      },
+      format: Object,
+      env: 'SMS_SENDER_IDS'
+    },
     installFirefoxLink: {
       doc: 'Link for the installFirefox SMS template',
       default: 'https://mzl.la/1HOd4ec',

diff --git a/config/sms-sender-ids.json b/config/sms-sender-ids.json
diff --git a/lib/routes/sms.js b/lib/routes/sms.js
@@ -9,7 +9,6 @@ const PhoneNumberUtil = require('google-libphonenumber').PhoneNumberUtil
 const validators = require('./validators')
 
 const METRICS_CONTEXT_SCHEMA = require('../metrics/context').schema
-const SENDER_IDS = new Map(require('../../config/sms-sender-ids.json'))
 
 module.exports = (log, isA, error, config, customs, sms) => {
   if (! config.sms.enabled) {
@@ -18,6 +17,7 @@ module.exports = (log, isA, error, config, customs, sms) => {
 
   const getGeoData = require('../geodb')(log)
   const REGIONS = config.sms.regions
+  const SENDER_IDS = config.sms.senderIds
 
   return [
     {
@@ -68,7 +68,7 @@ module.exports = (log, isA, error, config, customs, sms) => {
 
         function getRegionSpecificSenderId () {
           const region = phoneNumberUtil.getRegionCodeForNumber(parsedPhoneNumber)
-          const senderId = SENDER_IDS.get(region)
+          const senderId = SENDER_IDS[region]
 
           if (! senderId) {
             throw error.invalidRegion(region)

diff --git a/test/local/routes/sms.js b/test/local/routes/sms.js
@@ -42,7 +42,12 @@ describe('/sms', () => {
     log = mocks.spyLog()
     config = {
       sms: {
-        enabled: true
+        enabled: true,
+        senderIds: {
+          CA: '16474909977',
+          GB: 'Firefox',
+          US: '15036789977'
+        }
       }
     }
     routes = makeRoutes({ log, config })