Merge commit '0a13acc6ea3e1127864a1d2bcd9e1f6f82e7a8e4' into HEAD

Author: Jenkins Continuous Integration Server

app/services/api.service.js

@@ -74,8 +74,6 @@ import _ from 'lodash'
       case 'SUBMISSIONS':
       case 'USER':
         return _getRestangularV3(CONSTANTS.AUTH_API_URL)
-      case 'PREFERENCES':
-        return _getRestangularV3(CONSTANTS.INTERNAL_API_URL)
       default:
         return _getRestangularV3()
       }

app/services/userPreferences.service.js

@@ -8,7 +8,7 @@ import angular from 'angular'
   UserPreferencesService.$inject = ['$http', 'logger', 'Restangular', 'CONSTANTS', 'ApiService', '$q']
 
   function UserPreferencesService($http, logger, Restangular, CONSTANTS, ApiService, $q) {
-    var mailchimpApi = ApiService.getApiServiceProvider('PREFERENCES')
+    var preferencesApi = ApiService.getApiServiceProvider('PREFERENCES')
     var service = {
       getEmailPreferences: getEmailPreferences,
       saveEmailPreferences: saveEmailPreferences
@@ -17,7 +17,7 @@ import angular from 'angular'
 
     function getEmailPreferences(user) {
       return $q(function(resolve, reject) {
-        mailchimpApi.one('users', user.userId)
+        preferencesApi.one('users', user.userId)
         .one('preferences', 'email').get()
         .then(function(resp) {
           resolve(resp.subscriptions)
@@ -52,7 +52,7 @@ import angular from 'angular'
         settings.subscriptions = preferences
       }
       return $q(function(resolve, reject) {
-        mailchimpApi.one('users', user.userId)
+        preferencesApi.one('users', user.userId)
         .customPUT({ param: settings }, 'preferences/email')
         .then(function(resp) {
           resolve(resp.subscriptions)

app/topcoder.constants.js

@@ -20,14 +20,6 @@ angular.module('CONSTANTS', []).constant('CONSTANTS', {
   'PHOTO_LINK_LOCATION'     : process.env.PHOTO_LINK_LOCATION,
   'SWIFT_PROGRAM_URL'       : process.env.SWIFT_PROGRAM_URL,
   'TCO16_URL'               : process.env.TCO16_URL,
-  'MAILCHIMP_LIST_ID'       : process.env.MAILCHIMP_LIST_ID,
-  'MAILCHIMP_NL_CATEGORY_ID': process.env.MAILCHIMP_NL_CATEGORY_ID,
-  'MAILCHIMP_NL_GEN'        : process.env.MAILCHIMP_NL_GEN,
-  'MAILCHIMP_NL_TCO'        : process.env.MAILCHIMP_NL_TCO,
-  'MAILCHIMP_NL_IOS'        : process.env.MAILCHIMP_NL_IOS,
-  'MAILCHIMP_NL_DEV'        : process.env.MAILCHIMP_NL_DEV,
-  'MAILCHIMP_NL_DESIGN'     : process.env.MAILCHIMP_NL_DESIGN,
-  'MAILCHIMP_NL_DATA'       : process.env.MAILCHIMP_NL_DATA,
 
   'NEW_CHALLENGES_URL'     : 'https://www.topcoder.com/challenges/develop/upcoming/',
   'SWIFT_PROGRAM_ID'       : 3445,