diff --git a/src/developer.js b/src/developer.js index b974946c2..66ccca3d5 100644 --- a/src/developer.js +++ b/src/developer.js @@ -7,19 +7,15 @@ exports = module.exports = { isEnabled: isEnabled, setEnabled: setEnabled, - issueDeveloperToken: issueDeveloperToken, - getNonApprovedApps: getNonApprovedApps + issueDeveloperToken: issueDeveloperToken }; var assert = require('assert'), clients = require('./clients.js'), - config = require('./config.js'), constants = require('./constants.js'), - debug = require('debug')('box:developer'), eventlog = require('./eventlog.js'), tokendb = require('./tokendb.js'), settings = require('./settings.js'), - superagent = require('superagent'), util = require('util'); function DeveloperError(reason, errorOrMessage) { @@ -84,19 +80,3 @@ function issueDeveloperToken(user, auditSource, callback) { callback(null, { token: token, expiresAt: new Date(expiresAt).toISOString() }); }); } - -function getNonApprovedApps(callback) { - assert.strictEqual(typeof callback, 'function'); - - var url = config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/apps'; - superagent.get(url).query({ token: config.token(), boxVersion: config.version() }).timeout(30 * 1000).end(function (error, result) { - if (error && !error.response) return callback(new DeveloperError(DeveloperError.EXTERNAL_ERROR, error)); - if (result.statusCode === 401 || result.statusCode === 403) { - debug('Failed to list apps in development. Appstore token invalid or missing. Returning empty list.', result.body); - return callback(null, []); - } - if (result.statusCode !== 200) return callback(new DeveloperError(DeveloperError.EXTERNAL_ERROR, util.format('App listing failed. %s %j', result.status, result.body))); - - callback(null, result.body.apps || []); - }); -} diff --git a/src/routes/developer.js b/src/routes/developer.js index ac4b278a7..16dcca338 100644 --- a/src/routes/developer.js +++ b/src/routes/developer.js @@ -4,8 +4,7 @@ exports = module.exports = { enabled: enabled, setEnabled: setEnabled, status: status, - login: login, - apps: apps + login: login }; var developer = require('../developer.js'), @@ -52,9 +51,3 @@ function login(req, res, next) { })(req, res, next); } -function apps(req, res, next) { - developer.getNonApprovedApps(function (error, result) { - if (error) return next(new HttpError(500, error)); - next(new HttpSuccess(200, { apps: result })); - }); -} diff --git a/src/server.js b/src/server.js index fac1eff57..be2fcb53f 100644 --- a/src/server.js +++ b/src/server.js @@ -108,7 +108,6 @@ function initializeExpressSync() { router.post('/api/v1/developer', developerScope, routes.user.requireAdmin, routes.user.verifyPassword, routes.developer.setEnabled); router.get ('/api/v1/developer', developerScope, routes.developer.enabled, routes.developer.status); router.post('/api/v1/developer/login', routes.developer.enabled, routes.developer.login); - router.get ('/api/v1/developer/apps', developerScope, routes.developer.enabled, routes.developer.apps); // cloudron routes router.get ('/api/v1/cloudron/config', cloudronScope, routes.cloudron.getConfig); diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js index cd7025b7d..e27efd20d 100644 --- a/webadmin/src/js/client.js +++ b/webadmin/src/js/client.js @@ -697,13 +697,6 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification', }).error(defaultErrorHandler(callback)); }; - Client.prototype.getNonApprovedApps = function (callback) { - get('/api/v1/developer/apps').success(function (data, status) { - if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data)); - callback(null, data.apps || []); - }).error(defaultErrorHandler(callback)); - }; - Client.prototype.getApp = function (appId, callback) { var appFound = null; this._installedApps.some(function (app) { diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js index c8668e5dc..88bf02215 100644 --- a/webadmin/src/views/appstore.js +++ b/webadmin/src/views/appstore.js @@ -353,18 +353,6 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca }); return callback(null, apps); - - // Client.getNonApprovedApps(function (error, result) { - // if (error) return callback(error); - - // // add testing tag to the manifest for UI and search reasons - // result.forEach(function (app) { - // if (!app.manifest.tags) app.manifest.tags = []; - // app.manifest.tags.push('testing'); - // }); - - // callback(null, apps.concat(result)); - // }); }); }