Remove slack integration settings from public config pantsel#144

kartikay-nx · Jun 10, 2018 · 417c0fc · 417c0fc
1 parent c56999f
commit 417c0fc
Show file tree

Hide file tree

Showing 5 changed files with 209 additions and 163 deletions.
diff --git a/api/controllers/SettingsController.js b/api/controllers/SettingsController.js
@@ -10,15 +10,39 @@ var _ = require('lodash');
  */
 module.exports = _.merge(_.cloneDeep(require('../base/Controller')), {
 
-    find : function(req,res) {
+  find: function (req, res) {
 
-        sails.models.settings.find().limit(1)
-            .exec(function(err,settings){
+    sails.models.settings.find().limit(1)
+      .exec(function (err, settings) {
 
-                if(err) return res.negotiate(err)
-                // Store settings in memory
-                sails.KONGA_CONFIG = settings[0].data || {}
-                return res.json(settings[0] ? settings[0] : {})
-            })
-    }
+        if (err) return res.negotiate(err)
+
+        var _settings = settings[0];
+        if(!_settings) {
+          sails.KONGA_CONFIG = {}
+          return res.json({})
+        }
+
+        // Remove integrations from public json
+        delete _settings.data.integrations;
+
+        // Store settings in memory
+        sails.KONGA_CONFIG = settings[0].data || {}
+        return res.json(settings[0] ? settings[0] : {})
+      })
+  },
+
+  getIntegrations : function (req,res) {
+    sails.models.settings.find().limit(1)
+      .exec(function (err, settings) {
+
+        if (err) return res.negotiate(err)
+
+        if(!settings[0]) {
+          return res.json({})
+        }
+
+        return res.json(settings[0].data.integrations);
+      })
+  }
 });
diff --git a/assets/js/app/settings/01_settings.js b/assets/js/app/settings/01_settings.js
@@ -1,34 +1,38 @@
+(function () {
+  'use strict';
 
-(function() {
-    'use strict';
+  angular.module('frontend.settings', []);
 
-    angular.module('frontend.settings', [
-    ]);
-
-    // Module configuration
-    angular.module('frontend.settings')
-        .config([
-            '$stateProvider',
-            function config($stateProvider) {
-                $stateProvider
-                    .state('settings', {
-                        url: '/settings',
-                        parent: 'frontend',
-                        data: {
-                            access: 0,
-                            pageName: "Settings",
-                            displayName: "settings",
-                            prefix: '<i class="mdi mdi-settings"></i>'
-                        },
-                        views: {
-                            'content@': {
-                                templateUrl: 'js/app/settings/index.html',
-                                controller: 'SettingsController',
-                            }
-                        }
-                    })
+  // Module configuration
+  angular.module('frontend.settings')
+    .config([
+      '$stateProvider',
+      function config($stateProvider) {
+        $stateProvider
+          .state('settings', {
+            url: '/settings',
+            parent: 'frontend',
+            data: {
+              access: 0,
+              pageName: "Settings",
+              displayName: "settings",
+              prefix: '<i class="mdi mdi-settings"></i>'
+            },
+            views: {
+              'content@': {
+                templateUrl: 'js/app/settings/index.html',
+                controller: 'SettingsController',
+                resolve: {
+                  _integrations : ['$http', function ($http) {
+                    return $http.get('/api/settings/integrations');
+                  }]
+                }
 
+              }
             }
-        ])
-    ;
+          })
+
+      }
+    ])
+  ;
 }());
diff --git a/assets/js/app/settings/index.html b/assets/js/app/settings/index.html
@@ -157,7 +157,7 @@ <h5>Transports</h5>
                             </p>
                             <hr>
                             <div class="row">
-                                <div class="col-md-4" ng-repeat="item in KONGA_CONFIG.integrations">
+                                <div class="col-md-4" ng-repeat="item in integrations">
 
                                     <div
                                             ng-class="{'panel-primary' : item.config.enabled}"