diff --git a/core/server/web/parent-app.js b/core/server/web/parent-app.js index e565adfc98..61e99d5650 100644 --- a/core/server/web/parent-app.js +++ b/core/server/web/parent-app.js @@ -61,19 +61,6 @@ module.exports = function setupParentApp(options = {}) { adminApp.use('/ghost/.well-known', require('./well-known')()); adminApp.use('/ghost', require('../services/auth/session').createSessionFromToken, require('./admin')()); - // TODO: remove {admin url}/content/* once we're sure the API is not returning relative asset URLs anywhere - // only register this route if the admin is separate so we're not overriding the {site}/content/* route - if (hasSeparateAdmin) { - adminApp.use( - STATIC_IMAGE_URL_PREFIX, - [ - shared.middlewares.image.handleImageSizes, - storage.getStorage().serve(), - shared.middlewares.errorHandler.handleThemeResponse - ] - ); - } - // ADMIN + API // with a separate admin url only serve on that host, otherwise serve on all hosts const adminVhostArg = hasSeparateAdmin && adminHost ? adminHost : /.*/; diff --git a/test/unit/web/parent-app_spec.js b/test/unit/web/parent-app_spec.js index 2d37281258..a282429ead 100644 --- a/test/unit/web/parent-app_spec.js +++ b/test/unit/web/parent-app_spec.js @@ -82,8 +82,6 @@ describe('parent app', function () { it('should mount and assign correct routes', function () { parentApp(); - use.calledWith('/content/images').should.be.true(); - vhostSpy.calledTwice.should.be.true(); vhostSpy.firstCall.calledWith('admin.ghost.blog').should.be.true(); vhostSpy.secondCall.calledWith(/^(?!admin\.ghost\.blog).*/).should.be.true();