Remove now redundant developer login code

src/routes/cloudron.js

@@ -31,6 +31,7 @@ let assert = require('assert'),
     cloudron = require('../cloudron.js'),
     constants = require('../constants.js'),
     debug = require('debug')('box:routes/cloudron'),
+    eventlog = require('../eventlog.js'),
     externalLdap = require('../externalldap.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
@@ -44,12 +45,14 @@ let assert = require('assert'),
 function login(req, res, next) {
     assert.strictEqual(typeof req.user, 'object');
 
-    var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
+    const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
+    const auditSource = { authType: 'basic', ip: ip };
 
-    const auditSource = { authType: 'cli', ip: ip };
+    clients.addTokenByUserId(clients.ID_WEBADMIN, req.user.id, Date.now() + constants.DEFAULT_TOKEN_EXPIRATION, {}, function (error, result) {
-    clients.issueDeveloperToken(req.user, auditSource, function (error, result) {
         if (error) return next(new HttpError(500, error));
 
+        eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource, { userId: req.user.id, user: users.removePrivateFields(req.user) });
+
         next(new HttpSuccess(200, result));
     });
 }

src/routes/developer.js

@@ -1,24 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    login: login
-};
-
-let assert = require('assert'),
-    clients = require('../clients.js'),
-    HttpError = require('connect-lastmile').HttpError,
-    HttpSuccess = require('connect-lastmile').HttpSuccess;
-
-function login(req, res, next) {
-    assert.strictEqual(typeof req.user, 'object');
-
-    var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
-
-    const auditSource = { authType: 'cli', ip: ip };
-    clients.issueDeveloperToken(req.user, auditSource, function (error, result) {
-        if (error) return next(new HttpError(500, error));
-
-        next(new HttpSuccess(200, result));
-    });
-}
-

src/routes/index.js

@@ -8,7 +8,6 @@ exports = module.exports = {
     backups: require('./backups.js'),
     clients: require('./clients.js'),
     cloudron: require('./cloudron.js'),
-    developer: require('./developer.js'),
     domains: require('./domains.js'),
     eventlog: require('./eventlog.js'),
     graphs: require('./graphs.js'),

src/server.js

@@ -113,7 +113,7 @@ function initializeExpressSync() {
     router.post('/api/v1/cloudron/setup_account', routes.cloudron.setupAccount);
 
     // developer routes
-    router.post('/api/v1/developer/login', password, routes.developer.login);
+    router.post('/api/v1/developer/login', password, routes.cloudron.login); // DEPRECATED we should use the regular /api/v1/cloudron/login
 
     // cloudron routes
     router.get ('/api/v1/cloudron/update', cloudronScope, routes.cloudron.getUpdateInfo);