From b4e4b11ab397fa7ee9cff1095644e3e18b28161a Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 6 Feb 2020 15:47:44 +0100
Subject: [PATCH] Remove now redundant developer login code

---
 src/routes/cloudron.js  |  9 ++++++---
 src/routes/developer.js | 24 ------------------------
 src/routes/index.js     |  1 -
 src/server.js           |  2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 src/routes/developer.js

diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js
index 97383541a..c584b34dd 100644
--- a/src/routes/cloudron.js
+++ b/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.issueDeveloperToken(req.user, auditSource, function (error, result) {
+    clients.addTokenByUserId(clients.ID_WEBADMIN, req.user.id, Date.now() + constants.DEFAULT_TOKEN_EXPIRATION, {}, 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));
     });
 }
diff --git a/src/routes/developer.js b/src/routes/developer.js
deleted file mode 100644
index f1ce8b517..000000000
--- a/src/routes/developer.js
+++ /dev/null
@@ -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));
-    });
-}
-
diff --git a/src/routes/index.js b/src/routes/index.js
index 55aa077ec..cc506f5bb 100644
--- a/src/routes/index.js
+++ b/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'),
diff --git a/src/server.js b/src/server.js
index 96df77459..7bb56acc7 100644
--- a/src/server.js
+++ b/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);