From c6a50ce791ab633a17654ce9b0090007d7152463 Mon Sep 17 00:00:00 2001 From: kingcody Date: Thu, 21 Aug 2014 04:54:22 -0400 Subject: [PATCH] fix(app-config): Use parentheses to fix string concat in config Changes: - wrap `process.env.DOMAIN || ''` in parentheses to correct the order of the OR operator and string concat Closes #466 --- app/templates/server/config/environment/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/server/config/environment/index.js b/app/templates/server/config/environment/index.js index 3b95a6203..cf873728d 100644 --- a/app/templates/server/config/environment/index.js +++ b/app/templates/server/config/environment/index.js @@ -44,19 +44,19 @@ var all = { facebook: { clientID: process.env.FACEBOOK_ID || 'id', clientSecret: process.env.FACEBOOK_SECRET || 'secret', - callbackURL: process.env.DOMAIN || '' + '/auth/facebook/callback' + callbackURL: (process.env.DOMAIN || '') + '/auth/facebook/callback' }, <% } if(filters.twitterAuth) { %> twitter: { consumerKey: process.env.TWITTER_ID || 'id', consumerSecret: process.env.TWITTER_SECRET || 'secret', - callbackURL: process.env.DOMAIN || '' + '/auth/twitter/callback' + callbackURL: (process.env.DOMAIN || '') + '/auth/twitter/callback' }, <% } if(filters.googleAuth) { %> google: { clientID: process.env.GOOGLE_ID || 'id', clientSecret: process.env.GOOGLE_SECRET || 'secret', - callbackURL: process.env.DOMAIN || '' + '/auth/google/callback' + callbackURL: (process.env.DOMAIN || '') + '/auth/google/callback' }<% } %> }; @@ -64,4 +64,4 @@ var all = { // ============================================== module.exports = _.merge( all, - require('./' + process.env.NODE_ENV + '.js') || {}); \ No newline at end of file + require('./' + process.env.NODE_ENV + '.js') || {});