Make spaces an edition instead of setting

src/routes/accesscontrol.js

@@ -18,10 +18,10 @@ var accesscontrol = require('../accesscontrol.js'),
     clients = require('../clients.js'),
     ClientPasswordStrategy = require('passport-oauth2-client-password').Strategy,
     ClientsError = clients.ClientsError,
+    config = require('../config.js'),
     HttpError = require('connect-lastmile').HttpError,
     LocalStrategy = require('passport-local').Strategy,
     passport = require('passport'),
-    settings = require('../settings.js'),
     users = require('../users.js'),
     UsersError = users.UsersError;
 
@@ -146,21 +146,18 @@ function websocketAuth(requiredScopes, req, res, next) {
 function verifyAppOwnership(req, res, next) {
     if (req.user.admin) return next();
 
+    if (!config.isSpacesEnabled) return next();
+
     const appCreate = !('id' in req.params);
 
-    settings.getSpacesConfig(function (error, spaces) {
+    if (appCreate) return next(); // ok to install app
+
+    apps.get(req.params.id, function (error, app) {
+        if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
         if (error) return next(new HttpError(500, error));
-        if (!spaces.enabled) return next();
 
-        if (appCreate) return next(); // ok to install app
+        if (app.ownerId !== req.user.id) return next(new HttpError(401, 'Unauthorized'));
 
-        apps.get(req.params.id, function (error, app) {
-            if (error && error.reason === AppsError.NOT_FOUND) return next(new HttpError(404, 'No such app'));
-            if (error) return next(new HttpError(500, error));
-
-            if (app.ownerId !== req.user.id) return next(new HttpError(401, 'Unauthorized'));
-
-            next();
-        });
+        next();
     });
 }

src/routes/settings.js

@@ -23,10 +23,7 @@ exports = module.exports = {
     setAppstoreConfig: setAppstoreConfig,
 
     getPlatformConfig: getPlatformConfig,
-    setPlatformConfig: setPlatformConfig,
-
-    setSpacesConfig: setSpacesConfig,
-    getSpacesConfig: getSpacesConfig
+    setPlatformConfig: setPlatformConfig
 };
 
 var assert = require('assert'),
@@ -207,26 +204,6 @@ function setPlatformConfig(req, res, next) {
     });
 }
 
-function getSpacesConfig(req, res, next) {
-    settings.getSpacesConfig(function (error, config) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, config));
-    });
-}
-
-function setSpacesConfig(req, res, next) {
-    assert.strictEqual(typeof req.body, 'object');
-
-    settings.setSpacesConfig(req.body, function (error) {
-        if (error && error.reason === SettingsError.BAD_FIELD) return next(new HttpError(400, error.message));
-        if (error && error.reason === SettingsError.EXTERNAL_ERROR) return next(new HttpError(402, error.message));
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, {}));
-    });
-}
-
 function getAppstoreConfig(req, res, next) {
     settings.getAppstoreConfig(function (error, result) {
         if (error) return next(new HttpError(500, error));